move stuff around

G-Earth/src/main/java/gearth/extensions/Extension.java

@@ -1,11 +1,6 @@
 package gearth.extensions;
 
-import gearth.extensions.ExtensionBase;
-import gearth.extensions.ExtensionInfo;
-import gearth.extensions.IExtension;
-import gearth.extensions.OnConnectionListener;
-import gearth.misc.listenerpattern.Observable;
-import gearth.misc.packet_info.PacketInfoManager;
+import gearth.services.packet_info.PacketInfoManager;
 import gearth.protocol.HMessage;
 import gearth.protocol.HPacket;
 import gearth.protocol.connection.HClient;
@@ -15,9 +10,6 @@ import gearth.services.extensionhandler.extensions.implementations.network.Netwo
 import java.io.*;
 import java.net.Socket;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * Created by Jonas on 23/06/18.

G-Earth/src/main/java/gearth/extensions/InternalExtensionBuilder.java

@@ -1,7 +1,7 @@
 package gearth.extensions;
 
 
-import gearth.misc.packet_info.PacketInfoManager;
+import gearth.services.packet_info.PacketInfoManager;
 import gearth.protocol.HMessage;
 import gearth.protocol.HPacket;
 import gearth.protocol.connection.HClient;

G-Earth/src/main/java/gearth/extensions/OnConnectionListener.java

@@ -1,6 +1,6 @@
 package gearth.extensions;
 
-import gearth.misc.packet_info.PacketInfoManager;
+import gearth.services.packet_info.PacketInfoManager;
 import gearth.protocol.connection.HClient;
 
 public interface OnConnectionListener {

G-Earth/src/main/java/gearth/extensions/extra/tools/PacketInfoSupport.java

@@ -2,8 +2,8 @@ package gearth.extensions.extra.tools;
 
 import gearth.extensions.Extension;
 import gearth.extensions.IExtension;
-import gearth.misc.packet_info.PacketInfo;
-import gearth.misc.packet_info.PacketInfoManager;
+import gearth.services.packet_info.PacketInfo;
+import gearth.services.packet_info.PacketInfoManager;
 import gearth.protocol.HMessage;
 import gearth.protocol.HPacket;
 

G-Earth/src/main/java/gearth/protocol/HConnection.java

@@ -1,7 +1,7 @@
 package gearth.protocol;
 
 import gearth.misc.listenerpattern.Observable;
-import gearth.misc.packet_info.PacketInfoManager;
+import gearth.services.packet_info.PacketInfoManager;
 import gearth.protocol.connection.HClient;
 import gearth.protocol.connection.HProxy;
 import gearth.protocol.connection.HState;

G-Earth/src/main/java/gearth/protocol/HPacket.java

@@ -1,10 +1,10 @@
 package gearth.protocol;
 
 import gearth.misc.StringifyAble;
-import gearth.misc.packet_info.PacketInfo;
-import gearth.misc.packet_info.PacketInfoManager;
-import gearth.misc.packetrepresentation.InvalidPacketException;
-import gearth.misc.packetrepresentation.PacketStringUtils;
+import gearth.services.packet_info.PacketInfo;
+import gearth.services.packet_info.PacketInfoManager;
+import gearth.services.packetrepresentation.InvalidPacketException;
+import gearth.services.packetrepresentation.PacketStringUtils;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;

G-Earth/src/main/java/gearth/protocol/connection/HProxy.java

@@ -1,6 +1,6 @@
 package gearth.protocol.connection;
 
-import gearth.misc.packet_info.PacketInfoManager;
+import gearth.services.packet_info.PacketInfoManager;
 import gearth.protocol.packethandler.PacketHandler;
 
 import java.net.ServerSocket;

G-Earth/src/main/java/gearth/services/extensionhandler/extensions/GEarthExtension.java

@@ -2,7 +2,7 @@ package gearth.services.extensionhandler.extensions;
 
 import gearth.misc.listenerpattern.Observable;
 import gearth.misc.listenerpattern.SynchronizedObservable;
-import gearth.misc.packet_info.PacketInfoManager;
+import gearth.services.packet_info.PacketInfoManager;
 import gearth.protocol.HMessage;
 import gearth.protocol.HPacket;
 import gearth.protocol.connection.HClient;
@@ -10,8 +10,6 @@ import gearth.services.extensionhandler.extensions.listeners.OmRemoveClickListen
 import gearth.services.extensionhandler.extensions.listeners.OnClickListener;
 import gearth.services.extensionhandler.extensions.listeners.OnDeleteListener;
 
-import java.util.function.Consumer;
-
 public abstract class GEarthExtension {
 
 

G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/NetworkExtension.java

@@ -1,6 +1,6 @@
 package gearth.services.extensionhandler.extensions.implementations.network;
 
-import gearth.misc.packet_info.PacketInfoManager;
+import gearth.services.packet_info.PacketInfoManager;
 import gearth.protocol.HMessage;
 import gearth.protocol.connection.HClient;
 import gearth.services.extensionhandler.extensions.ExtensionType;

G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/simple/ExampleExtension.java

@@ -1,6 +1,6 @@
 package gearth.services.extensionhandler.extensions.implementations.simple;
 
-import gearth.misc.packet_info.PacketInfoManager;
+import gearth.services.packet_info.PacketInfoManager;
 import gearth.protocol.HMessage;
 import gearth.protocol.HPacket;
 import gearth.protocol.connection.HClient;

G-Earth/src/main/java/gearth/services/internal_extensions/blockreplacepackets/BlockAndReplacePackets.java

@@ -3,12 +3,10 @@ package gearth.services.internal_extensions.blockreplacepackets;
 import gearth.Main;
 import gearth.extensions.ExtensionForm;
 import gearth.extensions.ExtensionInfo;
-import gearth.extensions.OnConnectionListener;
-import gearth.misc.packet_info.PacketInfo;
-import gearth.misc.packet_info.PacketInfoManager;
+import gearth.services.packet_info.PacketInfo;
+import gearth.services.packet_info.PacketInfoManager;
 import gearth.protocol.HMessage;
 import gearth.protocol.HPacket;
-import gearth.protocol.connection.HClient;
 import gearth.services.internal_extensions.blockreplacepackets.rules.BlockReplaceRule;
 import gearth.services.internal_extensions.blockreplacepackets.rules.RuleFactory;
 import gearth.ui.GEarthController;

G-Earth/src/main/java/gearth/services/internal_extensions/blockreplacepackets/rules/RuleFactory.java

@@ -1,6 +1,6 @@
 package gearth.services.internal_extensions.blockreplacepackets.rules;
 
-import gearth.misc.packet_info.PacketInfoManager;
+import gearth.services.packet_info.PacketInfoManager;
 import gearth.protocol.HMessage;
 import gearth.protocol.HPacket;
 

G-Earth/src/main/java/gearth/services/internal_extensions/packetinfoexplorer/PacketInfoExplorer.java

@@ -3,13 +3,12 @@ package gearth.services.internal_extensions.packetinfoexplorer;
 import gearth.Main;
 import gearth.extensions.ExtensionForm;
 import gearth.extensions.ExtensionInfo;
-import gearth.misc.packet_info.PacketInfo;
-import gearth.misc.packet_info.PacketInfoManager;
+import gearth.services.packet_info.PacketInfo;
+import gearth.services.packet_info.PacketInfoManager;
 import gearth.protocol.HMessage;
 import gearth.ui.GEarthController;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.fxml.FXMLLoader;
@@ -22,10 +21,8 @@ import javafx.scene.image.Image;
 import javafx.scene.layout.GridPane;
 import javafx.stage.Stage;
 
-import java.awt.*;
 import java.util.*;
 import java.util.List;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 @ExtensionInfo(

G-Earth/src/main/java/gearth/services/internal_extensions/uilogger/UiLogger.java

@@ -2,7 +2,7 @@ package gearth.services.internal_extensions.uilogger;
 
 import gearth.extensions.ExtensionForm;
 import gearth.extensions.ExtensionInfo;
-import gearth.misc.packet_info.PacketInfoManager;
+import gearth.services.packet_info.PacketInfoManager;
 import gearth.protocol.HConnection;
 import gearth.protocol.HMessage;
 import gearth.protocol.HPacket;
@@ -14,8 +14,6 @@ import javafx.scene.image.Image;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 
-import java.util.ArrayList;
-
 @ExtensionInfo(
         Title = "Packet Logger",
         Description = "",

G-Earth/src/main/java/gearth/services/internal_extensions/uilogger/UiLoggerController.java

@@ -1,15 +1,13 @@
 package gearth.services.internal_extensions.uilogger;
 
- import com.sun.org.apache.xpath.internal.operations.Bool;
  import gearth.misc.Cacher;
- import gearth.misc.packet_info.PacketInfo;
- import gearth.misc.packet_info.PacketInfoManager;
+ import gearth.services.packet_info.PacketInfo;
+ import gearth.services.packet_info.PacketInfoManager;
  import gearth.protocol.HMessage;
 import gearth.protocol.HPacket;
 import gearth.ui.logger.loggerdisplays.PacketLogger;
 import javafx.application.Platform;
 import javafx.event.ActionEvent;
- import javafx.event.EventHandler;
  import javafx.fxml.Initializable;
 import javafx.scene.control.CheckMenuItem;
 import javafx.scene.control.Label;

G-Earth/src/main/java/gearth/services/packet_info/PacketInfo.java

@@ -1,4 +1,4 @@
-package gearth.misc.packet_info;
+package gearth.services.packet_info;
 
 import gearth.protocol.HMessage;
 

G-Earth/src/main/java/gearth/services/packet_info/PacketInfoManager.java

@@ -1,9 +1,9 @@
-package gearth.misc.packet_info;
+package gearth.services.packet_info;
 
-import gearth.misc.packet_info.providers.RemotePacketInfoProvider;
-import gearth.misc.packet_info.providers.implementations.HarblePacketInfoProvider;
-import gearth.misc.packet_info.providers.implementations.SulekPacketInfoProvider;
-import gearth.misc.packet_info.providers.implementations.UnityPacketInfoProvider;
+import gearth.services.packet_info.providers.RemotePacketInfoProvider;
+import gearth.services.packet_info.providers.implementations.HarblePacketInfoProvider;
+import gearth.services.packet_info.providers.implementations.SulekPacketInfoProvider;
+import gearth.services.packet_info.providers.implementations.UnityPacketInfoProvider;
 import gearth.protocol.HMessage;
 import gearth.protocol.HPacket;
 import gearth.protocol.connection.HClient;

G-Earth/src/main/java/gearth/services/packet_info/providers/PacketInfoProvider.java

@@ -1,7 +1,6 @@
-package gearth.misc.packet_info.providers;
+package gearth.services.packet_info.providers;
 
-import gearth.misc.Cacher;
-import gearth.misc.packet_info.PacketInfo;
+import gearth.services.packet_info.PacketInfo;
 import org.json.JSONObject;
 
 import java.io.File;

G-Earth/src/main/java/gearth/services/packet_info/providers/RemotePacketInfoProvider.java

@@ -1,4 +1,4 @@
-package gearth.misc.packet_info.providers;
+package gearth.services.packet_info.providers;
 
 import gearth.misc.Cacher;
 import org.jsoup.Connection;

G-Earth/src/main/java/gearth/services/packet_info/providers/implementations/HarblePacketInfoProvider.java

@@ -1,7 +1,7 @@
-package gearth.misc.packet_info.providers.implementations;
+package gearth.services.packet_info.providers.implementations;
 
-import gearth.misc.packet_info.PacketInfo;
-import gearth.misc.packet_info.providers.RemotePacketInfoProvider;
+import gearth.services.packet_info.PacketInfo;
+import gearth.services.packet_info.providers.RemotePacketInfoProvider;
 import gearth.protocol.HMessage;
 import org.json.JSONArray;
 import org.json.JSONObject;

G-Earth/src/main/java/gearth/services/packet_info/providers/implementations/SulekPacketInfoProvider.java

@@ -1,7 +1,7 @@
-package gearth.misc.packet_info.providers.implementations;
+package gearth.services.packet_info.providers.implementations;
 
-import gearth.misc.packet_info.PacketInfo;
-import gearth.misc.packet_info.providers.RemotePacketInfoProvider;
+import gearth.services.packet_info.PacketInfo;
+import gearth.services.packet_info.providers.RemotePacketInfoProvider;
 import gearth.protocol.HMessage;
 import org.json.JSONArray;
 import org.json.JSONObject;

G-Earth/src/main/java/gearth/services/packet_info/providers/implementations/UnityPacketInfoProvider.java

@@ -1,8 +1,8 @@
-package gearth.misc.packet_info.providers.implementations;
+package gearth.services.packet_info.providers.implementations;
 
 import gearth.Main;
-import gearth.misc.packet_info.PacketInfo;
-import gearth.misc.packet_info.providers.PacketInfoProvider;
+import gearth.services.packet_info.PacketInfo;
+import gearth.services.packet_info.providers.PacketInfoProvider;
 import gearth.protocol.HMessage;
 import org.json.JSONArray;
 import org.json.JSONObject;

G-Earth/src/main/java/gearth/services/packetrepresentation/InvalidPacketException.java

@@ -1,4 +1,4 @@
-package gearth.misc.packetrepresentation;
+package gearth.services.packetrepresentation;
 
 public class InvalidPacketException extends Exception {
 }

G-Earth/src/main/java/gearth/services/packetrepresentation/PacketStringUtils.java

@@ -1,7 +1,7 @@
-package gearth.misc.packetrepresentation;
+package gearth.services.packetrepresentation;
 
-import gearth.misc.packet_info.PacketInfo;
-import gearth.misc.packetrepresentation.prediction.StructurePredictor;
+import gearth.services.packet_info.PacketInfo;
+import gearth.services.packetrepresentation.prediction.StructurePredictor;
 import gearth.protocol.HPacket;
 
 import java.nio.ByteBuffer;

G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/StructurePredictor.java

@@ -1,8 +1,7 @@
-package gearth.misc.packetrepresentation.prediction;
+package gearth.services.packetrepresentation.prediction;
 
-import gearth.misc.packetrepresentation.PacketStringUtils;
-import gearth.misc.packetrepresentation.prediction.checkers.TypeChecker;
-import gearth.misc.packetrepresentation.prediction.checkers.TypeCheckerProducer;
+import gearth.services.packetrepresentation.prediction.checkers.TypeChecker;
+import gearth.services.packetrepresentation.prediction.checkers.TypeCheckerProducer;
 import gearth.protocol.HPacket;
 
 import java.util.List;

G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/BooleanChecker.java

@@ -1,4 +1,4 @@
-package gearth.misc.packetrepresentation.prediction.checkers;
+package gearth.services.packetrepresentation.prediction.checkers;
 
 import gearth.protocol.HPacket;
 

G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/ByteChecker.java

@@ -1,4 +1,4 @@
-package gearth.misc.packetrepresentation.prediction.checkers;
+package gearth.services.packetrepresentation.prediction.checkers;
 
 import gearth.protocol.HPacket;
 

G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/IntegerChecker.java

@@ -1,7 +1,6 @@
-package gearth.misc.packetrepresentation.prediction.checkers;
+package gearth.services.packetrepresentation.prediction.checkers;
 
 import gearth.protocol.HPacket;
-import gearth.services.Constants;
 
 import java.nio.charset.StandardCharsets;
 

G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/LongChecker.java

@@ -1,4 +1,4 @@
-package gearth.misc.packetrepresentation.prediction.checkers;
+package gearth.services.packetrepresentation.prediction.checkers;
 
 import gearth.protocol.HPacket;
 

G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/ShortChecker.java

@@ -1,4 +1,4 @@
-package gearth.misc.packetrepresentation.prediction.checkers;
+package gearth.services.packetrepresentation.prediction.checkers;
 
 import gearth.protocol.HPacket;
 

G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/StringChecker.java

@@ -1,4 +1,4 @@
-package gearth.misc.packetrepresentation.prediction.checkers;
+package gearth.services.packetrepresentation.prediction.checkers;
 
 import gearth.protocol.HPacket;
 

G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/TypeChecker.java

@@ -1,4 +1,4 @@
-package gearth.misc.packetrepresentation.prediction.checkers;
+package gearth.services.packetrepresentation.prediction.checkers;
 
 import gearth.protocol.HPacket;
 

G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/TypeCheckerProducer.java

@@ -1,4 +1,4 @@
-package gearth.misc.packetrepresentation.prediction.checkers;
+package gearth.services.packetrepresentation.prediction.checkers;
 
 import gearth.protocol.HPacket;
 

G-Earth/src/main/java/gearth/ui/extra/ExtraController.java

@@ -2,12 +2,10 @@ package gearth.ui.extra;
 
 import gearth.Main;
 import gearth.misc.Cacher;
-import gearth.misc.packetrepresentation.prediction.checkers.TypeCheckerProducer;
 import gearth.protocol.HConnection;
 import gearth.protocol.connection.HState;
 import gearth.protocol.connection.proxy.ProxyProviderFactory;
 import gearth.protocol.connection.proxy.SocksConfiguration;
-import gearth.services.Constants;
 import gearth.services.gpython.GPythonVersionUtils;
 import gearth.ui.SubForm;
 import gearth.ui.info.InfoController;

G-Earth/src/main/java/gearth/ui/injection/InjectionController.java

@@ -1,6 +1,6 @@
 package gearth.ui.injection;
 
-import gearth.misc.packet_info.PacketInfoManager;
+import gearth.services.packet_info.PacketInfoManager;
 import gearth.protocol.HMessage;
 import gearth.protocol.connection.HState;
 import javafx.application.Platform;
@@ -10,16 +10,12 @@ import javafx.scene.control.TextArea;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.scene.text.Text;
-import gearth.protocol.HConnection;
 import gearth.protocol.HPacket;
 import gearth.ui.SubForm;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.function.Function;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 public class InjectionController extends SubForm {

G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/SimpleTerminalLogger.java

@@ -1,6 +1,6 @@
 package gearth.ui.logger.loggerdisplays;
 
-import gearth.misc.packet_info.PacketInfoManager;
+import gearth.services.packet_info.PacketInfoManager;
 import gearth.protocol.HConnection;
 import gearth.protocol.HMessage;
 import gearth.protocol.HPacket;

G-Earth/src/main/java/gearth/ui/tools/ToolsController.java

@@ -1,6 +1,6 @@
 package gearth.ui.tools;
 
-import gearth.misc.packet_info.PacketInfoManager;
+import gearth.services.packet_info.PacketInfoManager;
 import gearth.protocol.HMessage;
 import javafx.event.ActionEvent;
 import javafx.scene.control.Button;