From b41ac108af3a22dcc6859748207fd7d0eb2f4d06 Mon Sep 17 00:00:00 2001 From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com> Date: Tue, 27 Apr 2021 04:16:53 +0200 Subject: [PATCH] move stuff around --- G-Earth/src/main/java/gearth/extensions/Extension.java | 10 +--------- .../gearth/extensions/InternalExtensionBuilder.java | 2 +- .../java/gearth/extensions/OnConnectionListener.java | 2 +- .../extensions/extra/tools/PacketInfoSupport.java | 4 ++-- G-Earth/src/main/java/gearth/protocol/HConnection.java | 2 +- G-Earth/src/main/java/gearth/protocol/HPacket.java | 8 ++++---- .../main/java/gearth/protocol/connection/HProxy.java | 2 +- .../extensionhandler/extensions/GEarthExtension.java | 4 +--- .../implementations/network/NetworkExtension.java | 2 +- .../implementations/simple/ExampleExtension.java | 2 +- .../blockreplacepackets/BlockAndReplacePackets.java | 6 ++---- .../blockreplacepackets/rules/RuleFactory.java | 2 +- .../packetinfoexplorer/PacketInfoExplorer.java | 7 ++----- .../internal_extensions/uilogger/UiLogger.java | 4 +--- .../uilogger/UiLoggerController.java | 6 ++---- .../{misc => services}/packet_info/PacketInfo.java | 2 +- .../packet_info/PacketInfoManager.java | 10 +++++----- .../packet_info/providers/PacketInfoProvider.java | 5 ++--- .../providers/RemotePacketInfoProvider.java | 2 +- .../implementations/HarblePacketInfoProvider.java | 6 +++--- .../implementations/SulekPacketInfoProvider.java | 6 +++--- .../implementations/UnityPacketInfoProvider.java | 6 +++--- .../packetrepresentation/InvalidPacketException.java | 2 +- .../packetrepresentation/PacketStringUtils.java | 6 +++--- .../prediction/StructurePredictor.java | 7 +++---- .../prediction/checkers/BooleanChecker.java | 2 +- .../prediction/checkers/ByteChecker.java | 2 +- .../prediction/checkers/IntegerChecker.java | 3 +-- .../prediction/checkers/LongChecker.java | 2 +- .../prediction/checkers/ShortChecker.java | 2 +- .../prediction/checkers/StringChecker.java | 2 +- .../prediction/checkers/TypeChecker.java | 2 +- .../prediction/checkers/TypeCheckerProducer.java | 2 +- .../src/main/java/gearth/ui/extra/ExtraController.java | 2 -- .../java/gearth/ui/injection/InjectionController.java | 6 +----- .../ui/logger/loggerdisplays/SimpleTerminalLogger.java | 2 +- .../src/main/java/gearth/ui/tools/ToolsController.java | 2 +- 37 files changed, 58 insertions(+), 86 deletions(-) rename G-Earth/src/main/java/gearth/{misc => services}/packet_info/PacketInfo.java (96%) rename G-Earth/src/main/java/gearth/{misc => services}/packet_info/PacketInfoManager.java (95%) rename G-Earth/src/main/java/gearth/{misc => services}/packet_info/providers/PacketInfoProvider.java (89%) rename G-Earth/src/main/java/gearth/{misc => services}/packet_info/providers/RemotePacketInfoProvider.java (96%) rename G-Earth/src/main/java/gearth/{misc => services}/packet_info/providers/implementations/HarblePacketInfoProvider.java (93%) rename G-Earth/src/main/java/gearth/{misc => services}/packet_info/providers/implementations/SulekPacketInfoProvider.java (91%) rename G-Earth/src/main/java/gearth/{misc => services}/packet_info/providers/implementations/UnityPacketInfoProvider.java (92%) rename G-Earth/src/main/java/gearth/{misc => services}/packetrepresentation/InvalidPacketException.java (56%) rename G-Earth/src/main/java/gearth/{misc => services}/packetrepresentation/PacketStringUtils.java (98%) rename G-Earth/src/main/java/gearth/{misc => services}/packetrepresentation/prediction/StructurePredictor.java (88%) rename G-Earth/src/main/java/gearth/{misc => services}/packetrepresentation/prediction/checkers/BooleanChecker.java (93%) rename G-Earth/src/main/java/gearth/{misc => services}/packetrepresentation/prediction/checkers/ByteChecker.java (90%) rename G-Earth/src/main/java/gearth/{misc => services}/packetrepresentation/prediction/checkers/IntegerChecker.java (97%) rename G-Earth/src/main/java/gearth/{misc => services}/packetrepresentation/prediction/checkers/LongChecker.java (94%) rename G-Earth/src/main/java/gearth/{misc => services}/packetrepresentation/prediction/checkers/ShortChecker.java (95%) rename G-Earth/src/main/java/gearth/{misc => services}/packetrepresentation/prediction/checkers/StringChecker.java (97%) rename G-Earth/src/main/java/gearth/{misc => services}/packetrepresentation/prediction/checkers/TypeChecker.java (91%) rename G-Earth/src/main/java/gearth/{misc => services}/packetrepresentation/prediction/checkers/TypeCheckerProducer.java (91%) diff --git a/G-Earth/src/main/java/gearth/extensions/Extension.java b/G-Earth/src/main/java/gearth/extensions/Extension.java index bd00f8d..4e49c0b 100644 --- a/G-Earth/src/main/java/gearth/extensions/Extension.java +++ b/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. diff --git a/G-Earth/src/main/java/gearth/extensions/InternalExtensionBuilder.java b/G-Earth/src/main/java/gearth/extensions/InternalExtensionBuilder.java index b7fe5d4..8f90d79 100644 --- a/G-Earth/src/main/java/gearth/extensions/InternalExtensionBuilder.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/extensions/OnConnectionListener.java b/G-Earth/src/main/java/gearth/extensions/OnConnectionListener.java index 9d10291..07b7f58 100644 --- a/G-Earth/src/main/java/gearth/extensions/OnConnectionListener.java +++ b/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 { diff --git a/G-Earth/src/main/java/gearth/extensions/extra/tools/PacketInfoSupport.java b/G-Earth/src/main/java/gearth/extensions/extra/tools/PacketInfoSupport.java index e0dedee..b0d256a 100644 --- a/G-Earth/src/main/java/gearth/extensions/extra/tools/PacketInfoSupport.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/protocol/HConnection.java b/G-Earth/src/main/java/gearth/protocol/HConnection.java index 85b0db4..aa917c9 100644 --- a/G-Earth/src/main/java/gearth/protocol/HConnection.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/protocol/HPacket.java b/G-Earth/src/main/java/gearth/protocol/HPacket.java index 6de7ed7..9a2e65d 100644 --- a/G-Earth/src/main/java/gearth/protocol/HPacket.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/protocol/connection/HProxy.java b/G-Earth/src/main/java/gearth/protocol/connection/HProxy.java index 4e1b4db..13548a3 100644 --- a/G-Earth/src/main/java/gearth/protocol/connection/HProxy.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/GEarthExtension.java b/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/GEarthExtension.java index a4dc25a..d84963a 100644 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/GEarthExtension.java +++ b/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 { diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/NetworkExtension.java b/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/NetworkExtension.java index bf0f3fd..6d6eaf4 100644 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/NetworkExtension.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/simple/ExampleExtension.java b/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/simple/ExampleExtension.java index 742cc4f..a33bf9b 100644 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/simple/ExampleExtension.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/blockreplacepackets/BlockAndReplacePackets.java b/G-Earth/src/main/java/gearth/services/internal_extensions/blockreplacepackets/BlockAndReplacePackets.java index 87c3ea5..6838aad 100644 --- a/G-Earth/src/main/java/gearth/services/internal_extensions/blockreplacepackets/BlockAndReplacePackets.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/blockreplacepackets/rules/RuleFactory.java b/G-Earth/src/main/java/gearth/services/internal_extensions/blockreplacepackets/rules/RuleFactory.java index 07171f3..a6dc50f 100644 --- a/G-Earth/src/main/java/gearth/services/internal_extensions/blockreplacepackets/rules/RuleFactory.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/packetinfoexplorer/PacketInfoExplorer.java b/G-Earth/src/main/java/gearth/services/internal_extensions/packetinfoexplorer/PacketInfoExplorer.java index 858ccbc..2795abe 100644 --- a/G-Earth/src/main/java/gearth/services/internal_extensions/packetinfoexplorer/PacketInfoExplorer.java +++ b/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( diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/uilogger/UiLogger.java b/G-Earth/src/main/java/gearth/services/internal_extensions/uilogger/UiLogger.java index ce976c6..fa594f7 100644 --- a/G-Earth/src/main/java/gearth/services/internal_extensions/uilogger/UiLogger.java +++ b/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 = "", diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/uilogger/UiLoggerController.java b/G-Earth/src/main/java/gearth/services/internal_extensions/uilogger/UiLoggerController.java index def8d74..14bf59d 100644 --- a/G-Earth/src/main/java/gearth/services/internal_extensions/uilogger/UiLoggerController.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/misc/packet_info/PacketInfo.java b/G-Earth/src/main/java/gearth/services/packet_info/PacketInfo.java similarity index 96% rename from G-Earth/src/main/java/gearth/misc/packet_info/PacketInfo.java rename to G-Earth/src/main/java/gearth/services/packet_info/PacketInfo.java index df0400f..4869fde 100644 --- a/G-Earth/src/main/java/gearth/misc/packet_info/PacketInfo.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/misc/packet_info/PacketInfoManager.java b/G-Earth/src/main/java/gearth/services/packet_info/PacketInfoManager.java similarity index 95% rename from G-Earth/src/main/java/gearth/misc/packet_info/PacketInfoManager.java rename to G-Earth/src/main/java/gearth/services/packet_info/PacketInfoManager.java index 530f5ce..d4b943f 100644 --- a/G-Earth/src/main/java/gearth/misc/packet_info/PacketInfoManager.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/misc/packet_info/providers/PacketInfoProvider.java b/G-Earth/src/main/java/gearth/services/packet_info/providers/PacketInfoProvider.java similarity index 89% rename from G-Earth/src/main/java/gearth/misc/packet_info/providers/PacketInfoProvider.java rename to G-Earth/src/main/java/gearth/services/packet_info/providers/PacketInfoProvider.java index ff14eeb..9b1aa44 100644 --- a/G-Earth/src/main/java/gearth/misc/packet_info/providers/PacketInfoProvider.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/misc/packet_info/providers/RemotePacketInfoProvider.java b/G-Earth/src/main/java/gearth/services/packet_info/providers/RemotePacketInfoProvider.java similarity index 96% rename from G-Earth/src/main/java/gearth/misc/packet_info/providers/RemotePacketInfoProvider.java rename to G-Earth/src/main/java/gearth/services/packet_info/providers/RemotePacketInfoProvider.java index bd8a2f4..5ffc589 100644 --- a/G-Earth/src/main/java/gearth/misc/packet_info/providers/RemotePacketInfoProvider.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/misc/packet_info/providers/implementations/HarblePacketInfoProvider.java b/G-Earth/src/main/java/gearth/services/packet_info/providers/implementations/HarblePacketInfoProvider.java similarity index 93% rename from G-Earth/src/main/java/gearth/misc/packet_info/providers/implementations/HarblePacketInfoProvider.java rename to G-Earth/src/main/java/gearth/services/packet_info/providers/implementations/HarblePacketInfoProvider.java index 583e185..69d34c8 100644 --- a/G-Earth/src/main/java/gearth/misc/packet_info/providers/implementations/HarblePacketInfoProvider.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/misc/packet_info/providers/implementations/SulekPacketInfoProvider.java b/G-Earth/src/main/java/gearth/services/packet_info/providers/implementations/SulekPacketInfoProvider.java similarity index 91% rename from G-Earth/src/main/java/gearth/misc/packet_info/providers/implementations/SulekPacketInfoProvider.java rename to G-Earth/src/main/java/gearth/services/packet_info/providers/implementations/SulekPacketInfoProvider.java index 972c0cc..f28427c 100644 --- a/G-Earth/src/main/java/gearth/misc/packet_info/providers/implementations/SulekPacketInfoProvider.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/misc/packet_info/providers/implementations/UnityPacketInfoProvider.java b/G-Earth/src/main/java/gearth/services/packet_info/providers/implementations/UnityPacketInfoProvider.java similarity index 92% rename from G-Earth/src/main/java/gearth/misc/packet_info/providers/implementations/UnityPacketInfoProvider.java rename to G-Earth/src/main/java/gearth/services/packet_info/providers/implementations/UnityPacketInfoProvider.java index 517a102..569d837 100644 --- a/G-Earth/src/main/java/gearth/misc/packet_info/providers/implementations/UnityPacketInfoProvider.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/misc/packetrepresentation/InvalidPacketException.java b/G-Earth/src/main/java/gearth/services/packetrepresentation/InvalidPacketException.java similarity index 56% rename from G-Earth/src/main/java/gearth/misc/packetrepresentation/InvalidPacketException.java rename to G-Earth/src/main/java/gearth/services/packetrepresentation/InvalidPacketException.java index e360c58..16f144f 100644 --- a/G-Earth/src/main/java/gearth/misc/packetrepresentation/InvalidPacketException.java +++ b/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 { } diff --git a/G-Earth/src/main/java/gearth/misc/packetrepresentation/PacketStringUtils.java b/G-Earth/src/main/java/gearth/services/packetrepresentation/PacketStringUtils.java similarity index 98% rename from G-Earth/src/main/java/gearth/misc/packetrepresentation/PacketStringUtils.java rename to G-Earth/src/main/java/gearth/services/packetrepresentation/PacketStringUtils.java index 3c54834..d83f8e8 100644 --- a/G-Earth/src/main/java/gearth/misc/packetrepresentation/PacketStringUtils.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/StructurePredictor.java b/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/StructurePredictor.java similarity index 88% rename from G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/StructurePredictor.java rename to G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/StructurePredictor.java index 865e16d..4a40d0a 100644 --- a/G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/StructurePredictor.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/checkers/BooleanChecker.java b/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/BooleanChecker.java similarity index 93% rename from G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/checkers/BooleanChecker.java rename to G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/BooleanChecker.java index 9536316..cc94df5 100644 --- a/G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/checkers/BooleanChecker.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/checkers/ByteChecker.java b/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/ByteChecker.java similarity index 90% rename from G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/checkers/ByteChecker.java rename to G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/ByteChecker.java index f3e957d..2aa1cc9 100644 --- a/G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/checkers/ByteChecker.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/checkers/IntegerChecker.java b/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/IntegerChecker.java similarity index 97% rename from G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/checkers/IntegerChecker.java rename to G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/IntegerChecker.java index d34c0a3..0e772be 100644 --- a/G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/checkers/IntegerChecker.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/checkers/LongChecker.java b/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/LongChecker.java similarity index 94% rename from G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/checkers/LongChecker.java rename to G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/LongChecker.java index 7cc3591..052f892 100644 --- a/G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/checkers/LongChecker.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/checkers/ShortChecker.java b/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/ShortChecker.java similarity index 95% rename from G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/checkers/ShortChecker.java rename to G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/ShortChecker.java index d125e3b..96fd860 100644 --- a/G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/checkers/ShortChecker.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/checkers/StringChecker.java b/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/StringChecker.java similarity index 97% rename from G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/checkers/StringChecker.java rename to G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/StringChecker.java index 4815e32..589df8f 100644 --- a/G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/checkers/StringChecker.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/checkers/TypeChecker.java b/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/TypeChecker.java similarity index 91% rename from G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/checkers/TypeChecker.java rename to G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/TypeChecker.java index f467bfb..6348a47 100644 --- a/G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/checkers/TypeChecker.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/checkers/TypeCheckerProducer.java b/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/TypeCheckerProducer.java similarity index 91% rename from G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/checkers/TypeCheckerProducer.java rename to G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/TypeCheckerProducer.java index 11255a7..33d7d43 100644 --- a/G-Earth/src/main/java/gearth/misc/packetrepresentation/prediction/checkers/TypeCheckerProducer.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/ui/extra/ExtraController.java b/G-Earth/src/main/java/gearth/ui/extra/ExtraController.java index f21abc3..ee0ca80 100644 --- a/G-Earth/src/main/java/gearth/ui/extra/ExtraController.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/ui/injection/InjectionController.java b/G-Earth/src/main/java/gearth/ui/injection/InjectionController.java index e4ca766..3cd74bc 100644 --- a/G-Earth/src/main/java/gearth/ui/injection/InjectionController.java +++ b/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 { diff --git a/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/SimpleTerminalLogger.java b/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/SimpleTerminalLogger.java index 0850e59..b8aaf4e 100644 --- a/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/SimpleTerminalLogger.java +++ b/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; diff --git a/G-Earth/src/main/java/gearth/ui/tools/ToolsController.java b/G-Earth/src/main/java/gearth/ui/tools/ToolsController.java index ed80e4b..f6aeab4 100644 --- a/G-Earth/src/main/java/gearth/ui/tools/ToolsController.java +++ b/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;