From e02d07b063b3f370e72b18d519aa2e33fae372de Mon Sep 17 00:00:00 2001 From: Scott Stamp Date: Sat, 13 Oct 2018 17:50:36 -0230 Subject: [PATCH 1/8] Added *.iml to .gitignore Moving to Maven so we don't need these, ever. --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8e86036..d168462 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ G-Earth2.iml /G-WinMem/G-WinMem/x64 /Extensions/ G-Earth.iml -/G-EarthWindows.iml \ No newline at end of file +/G-EarthWindows.iml +*.iml From f18aed367b002dc306a1335fb698c91543388058 Mon Sep 17 00:00:00 2001 From: Scott Stamp Date: Sat, 13 Oct 2018 17:51:57 -0230 Subject: [PATCH 2/8] Removed json-simple-1.1.1.jar This is replaced by org.json, included as a Maven dependency. --- json-simple-1.1.1.jar | Bin 23737 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 json-simple-1.1.1.jar diff --git a/json-simple-1.1.1.jar b/json-simple-1.1.1.jar deleted file mode 100644 index 66347a6c86b7d6442358ca7643e4dc484fb01866..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23737 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 A{Qv*} From dcd90b17b57ae6b69ee332959a018a6016672566 Mon Sep 17 00:00:00 2001 From: Scott Stamp Date: Sat, 13 Oct 2018 17:52:16 -0230 Subject: [PATCH 3/8] Ignore *.iml Don't need these where we're going! --- .gitignore | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitignore b/.gitignore index d168462..dda4011 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,6 @@ .idea/ out/ -G-Earth2.iml /G-WinMem/.vs /G-WinMem/x64 /G-WinMem/G-WinMem/x64 -/Extensions/ -G-Earth.iml -/G-EarthWindows.iml *.iml From 9d8740c951847280c4e31febb3b3437c959e30d5 Mon Sep 17 00:00:00 2001 From: Scott Stamp Date: Sat, 13 Oct 2018 17:53:54 -0230 Subject: [PATCH 4/8] Added Maven and moved sample extensions to their own modules mvn install, mvn package, done! Extensions have been moved to a new folder --- Extensions/AdminOnConnect/pom.xml | 110 ++++++++++++++ .../adminonconnect/AdminOnConnect.java | 12 +- Extensions/BlockReplacePackets/pom.xml | 110 ++++++++++++++ .../BlockAndReplacePackets.java | 12 +- .../blockreplacepackets/blockreplace.fxml | 2 +- Extensions/SpeechColorizer/pom.xml | 110 ++++++++++++++ .../speechcolorizer/SpeechColorizer.java | 10 +- G-Earth-UI/pom.xml | 138 ++++++++++++++++++ G-Earth-UI/src/META-INF/MANIFEST.MF | 3 + .../src/main/java/gearth}/Main.java | 8 +- .../java/gearth}/extensions/Extension.java | 10 +- .../gearth}/extensions/ExtensionForm.java | 6 +- .../gearth}/extensions/ExtensionInfo.java | 2 +- .../gearth}/extensions/extra/Inspector.java | 2 +- .../src/main/java/gearth}/misc/Cacher.java | 40 ++--- .../java/gearth}/misc/ConfirmationDialog.java | 2 +- .../main/java/gearth}/misc/OSValidator.java | 2 +- .../main/java/gearth}/misc/StringifyAble.java | 2 +- .../java/gearth}/protocol/HConnection.java | 30 ++-- .../main/java/gearth}/protocol/HMessage.java | 6 +- .../main/java/gearth}/protocol/HPacket.java | 6 +- .../gearth}/protocol/StateChangeListener.java | 2 +- .../gearth}/protocol/TrafficListener.java | 2 +- .../java/gearth}/protocol/crypto/RC4.java | 6 +- .../protocol/hostreplacer/HostReplacer.java | 2 +- .../hostreplacer/HostReplacerFactory.java | 4 +- .../hostreplacer/UnixHostReplacer.java | 2 +- .../hostreplacer/WindowsHostReplacer.java | 2 +- .../gearth}/protocol/memory/Rc4Obtainer.java | 23 ++- .../memory/habboclient/HabboClient.java | 4 +- .../habboclient/HabboClientFactory.java | 10 +- .../habboclient/linux/LinuxHabboClient.java | 6 +- .../habboclient/linux/LinuxMemorySnippet.java | 2 +- .../windows/WindowsHabboClient.java | 47 +++--- .../packethandler/BufferListener.java | 2 +- .../protocol/packethandler/Handler.java | 10 +- .../packethandler/IncomingHandler.java | 8 +- .../packethandler/OutgoingHandler.java | 7 +- .../protocol/packethandler/PayloadBuffer.java | 4 +- .../src/main/java/gearth}/ui/G-Earth.fxml | 2 +- .../java/gearth}/ui/GEarthController.java | 20 +-- .../src/main/java/gearth}/ui/SubForm.java | 8 +- .../src/main/java/gearth}/ui/bootstrap3.css | 0 .../java/gearth}/ui/buttons/BoxButton.java | 2 +- .../java/gearth}/ui/buttons/DeleteButton.java | 6 +- .../java/gearth}/ui/buttons/EditButton.java | 2 +- .../java/gearth}/ui/buttons/ExitButton.java | 2 +- .../java/gearth}/ui/buttons/FireButton.java | 2 +- .../gearth}/ui/buttons/PauseResumeButton.java | 2 +- .../java/gearth}/ui/buttons/ReloadButton.java | 2 +- .../gearth}/ui/buttons/SimpleClickButton.java | 2 +- .../gearth}/ui/buttons/files/ButtonDelete.png | Bin .../ui/buttons/files/ButtonDeleteHover.png | Bin .../gearth}/ui/buttons/files/ButtonEdit.png | Bin .../ui/buttons/files/ButtonEditHover.png | Bin .../gearth}/ui/buttons/files/ButtonExit.png | Bin .../ui/buttons/files/ButtonExitHover.png | Bin .../gearth}/ui/buttons/files/ButtonFire.png | Bin .../ui/buttons/files/ButtonFireHover.png | Bin .../gearth}/ui/buttons/files/ButtonPause.png | Bin .../ui/buttons/files/ButtonPauseHover.png | Bin .../gearth}/ui/buttons/files/ButtonReload.png | Bin .../ui/buttons/files/ButtonReloadHover.png | Bin .../gearth}/ui/buttons/files/ButtonResume.png | Bin .../ui/buttons/files/ButtonResumeHover.png | Bin .../gearth}/ui/connection/Connection.fxml | 2 +- .../gearth}/ui/connection/Connection.java | 13 +- .../ui/extensions/ExtensionItemContainer.java | 18 +-- .../ExtensionItemContainerProducer.java | 2 +- .../gearth}/ui/extensions/Extensions.fxml | 2 +- .../gearth}/ui/extensions/Extensions.java | 24 ++- .../ui/extensions/GEarthExtension.java | 4 +- .../extensions/GEarthExtensionsRegistrer.java | 2 +- .../ui/extensions/executer/ExecutionInfo.java | 2 +- .../extensions/executer/ExtensionRunner.java | 8 +- .../executer/ExtensionRunnerFactory.java | 2 +- .../executer/NormalExtensionRunner.java | 4 +- .../src/main/java/gearth}/ui/info/Info.fxml | 2 +- .../src/main/java/gearth}/ui/info/Info.java | 4 +- .../java/gearth}/ui/injection/Injection.fxml | 2 +- .../java/gearth}/ui/injection/Injection.java | 8 +- .../main/java/gearth}/ui/logger/Logger.fxml | 2 +- .../main/java/gearth}/ui/logger/Logger.java | 14 +- .../loggerdisplays/LinuxTerminalLogger.java | 4 +- .../logger/loggerdisplays/PacketLogger.java | 5 +- .../loggerdisplays/PacketLoggerFactory.java | 4 +- .../loggerdisplays/SimpleTerminalLogger.java | 4 +- .../java/gearth}/ui/scheduler/Interval.java | 2 +- .../gearth}/ui/scheduler/ScheduleItem.java | 8 +- .../ui/scheduler/ScheduleItemContainer.java | 8 +- .../java/gearth}/ui/scheduler/Scheduler.fxml | 2 +- .../java/gearth}/ui/scheduler/Scheduler.java | 10 +- .../java/gearth}/ui/settings/Settings.fxml | 2 +- .../java/gearth}/ui/settings/Settings.java | 4 +- .../src/main/java/gearth}/ui/tools/Tools.fxml | 2 +- .../src/main/java/gearth}/ui/tools/Tools.java | 9 +- pom.xml | 29 ++++ src/META-INF/MANIFEST.MF | 3 - 98 files changed, 734 insertions(+), 293 deletions(-) create mode 100644 Extensions/AdminOnConnect/pom.xml rename {src/main/extensions/examples => Extensions/AdminOnConnect/src/main/java/extensions}/adminonconnect/AdminOnConnect.java (85%) create mode 100644 Extensions/BlockReplacePackets/pom.xml rename {src/main/extensions/examples => Extensions/BlockReplacePackets/src/main/java/extensions}/blockreplacepackets/BlockAndReplacePackets.java (85%) rename {src/main/extensions/examples => Extensions/BlockReplacePackets/src/main/java/extensions}/blockreplacepackets/blockreplace.fxml (97%) create mode 100644 Extensions/SpeechColorizer/pom.xml rename {src/main/extensions/examples => Extensions/SpeechColorizer/src/main/java/extensions}/speechcolorizer/SpeechColorizer.java (89%) create mode 100644 G-Earth-UI/pom.xml create mode 100644 G-Earth-UI/src/META-INF/MANIFEST.MF rename {src/main => G-Earth-UI/src/main/java/gearth}/Main.java (90%) rename {src/main => G-Earth-UI/src/main/java/gearth}/extensions/Extension.java (98%) rename {src/main => G-Earth-UI/src/main/java/gearth}/extensions/ExtensionForm.java (97%) rename {src/main => G-Earth-UI/src/main/java/gearth}/extensions/ExtensionInfo.java (91%) rename {src/main => G-Earth-UI/src/main/java/gearth}/extensions/extra/Inspector.java (67%) rename {src/main => G-Earth-UI/src/main/java/gearth}/misc/Cacher.java (63%) rename {src/main => G-Earth-UI/src/main/java/gearth}/misc/ConfirmationDialog.java (98%) rename {src/main => G-Earth-UI/src/main/java/gearth}/misc/OSValidator.java (98%) rename {src/main => G-Earth-UI/src/main/java/gearth}/misc/StringifyAble.java (96%) rename {src/main => G-Earth-UI/src/main/java/gearth}/protocol/HConnection.java (95%) rename {src/main => G-Earth-UI/src/main/java/gearth}/protocol/HMessage.java (95%) rename {src/main => G-Earth-UI/src/main/java/gearth}/protocol/HPacket.java (99%) rename {src/main => G-Earth-UI/src/main/java/gearth}/protocol/StateChangeListener.java (83%) rename {src/main => G-Earth-UI/src/main/java/gearth}/protocol/TrafficListener.java (75%) rename {src/main => G-Earth-UI/src/main/java/gearth}/protocol/crypto/RC4.java (98%) rename {src/main => G-Earth-UI/src/main/java/gearth}/protocol/hostreplacer/HostReplacer.java (75%) rename {src/main => G-Earth-UI/src/main/java/gearth}/protocol/hostreplacer/HostReplacerFactory.java (82%) rename {src/main => G-Earth-UI/src/main/java/gearth}/protocol/hostreplacer/UnixHostReplacer.java (98%) rename {src/main => G-Earth-UI/src/main/java/gearth}/protocol/hostreplacer/WindowsHostReplacer.java (86%) rename {src/main => G-Earth-UI/src/main/java/gearth}/protocol/memory/Rc4Obtainer.java (86%) rename {src/main => G-Earth-UI/src/main/java/gearth}/protocol/memory/habboclient/HabboClient.java (81%) rename {src/main => G-Earth-UI/src/main/java/gearth}/protocol/memory/habboclient/HabboClientFactory.java (56%) rename {src/main => G-Earth-UI/src/main/java/gearth}/protocol/memory/habboclient/linux/LinuxHabboClient.java (98%) rename {src/main => G-Earth-UI/src/main/java/gearth}/protocol/memory/habboclient/linux/LinuxMemorySnippet.java (86%) rename {src/main => G-Earth-UI/src/main/java/gearth}/protocol/memory/habboclient/windows/WindowsHabboClient.java (76%) rename {src/main => G-Earth-UI/src/main/java/gearth}/protocol/packethandler/BufferListener.java (64%) rename {src/main => G-Earth-UI/src/main/java/gearth}/protocol/packethandler/Handler.java (96%) rename {src/main => G-Earth-UI/src/main/java/gearth}/protocol/packethandler/IncomingHandler.java (90%) rename {src/main => G-Earth-UI/src/main/java/gearth}/protocol/packethandler/OutgoingHandler.java (90%) rename {src/main => G-Earth-UI/src/main/java/gearth}/protocol/packethandler/PayloadBuffer.java (96%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/G-Earth.fxml (97%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/GEarthController.java (88%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/SubForm.java (79%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/bootstrap3.css (100%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/buttons/BoxButton.java (98%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/buttons/DeleteButton.java (63%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/buttons/EditButton.java (83%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/buttons/ExitButton.java (86%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/buttons/FireButton.java (86%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/buttons/PauseResumeButton.java (99%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/buttons/ReloadButton.java (87%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/buttons/SimpleClickButton.java (87%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/buttons/files/ButtonDelete.png (100%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/buttons/files/ButtonDeleteHover.png (100%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/buttons/files/ButtonEdit.png (100%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/buttons/files/ButtonEditHover.png (100%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/buttons/files/ButtonExit.png (100%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/buttons/files/ButtonExitHover.png (100%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/buttons/files/ButtonFire.png (100%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/buttons/files/ButtonFireHover.png (100%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/buttons/files/ButtonPause.png (100%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/buttons/files/ButtonPauseHover.png (100%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/buttons/files/ButtonReload.png (100%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/buttons/files/ButtonReloadHover.png (100%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/buttons/files/ButtonResume.png (100%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/buttons/files/ButtonResumeHover.png (100%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/connection/Connection.fxml (99%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/connection/Connection.java (92%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/extensions/ExtensionItemContainer.java (94%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/extensions/ExtensionItemContainerProducer.java (97%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/extensions/Extensions.fxml (99%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/extensions/Extensions.java (97%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/extensions/GEarthExtension.java (99%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/extensions/GEarthExtensionsRegistrer.java (97%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/extensions/executer/ExecutionInfo.java (97%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/extensions/executer/ExtensionRunner.java (61%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/extensions/executer/ExtensionRunnerFactory.java (88%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/extensions/executer/NormalExtensionRunner.java (98%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/info/Info.fxml (96%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/info/Info.java (94%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/injection/Injection.fxml (98%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/injection/Injection.java (94%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/logger/Logger.fxml (99%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/logger/Logger.java (94%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/logger/loggerdisplays/LinuxTerminalLogger.java (97%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/logger/loggerdisplays/PacketLogger.java (86%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/logger/loggerdisplays/PacketLoggerFactory.java (86%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/logger/loggerdisplays/SimpleTerminalLogger.java (95%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/scheduler/Interval.java (97%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/scheduler/ScheduleItem.java (97%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/scheduler/ScheduleItemContainer.java (96%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/scheduler/Scheduler.fxml (99%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/scheduler/Scheduler.java (97%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/settings/Settings.fxml (94%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/settings/Settings.java (61%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/tools/Tools.fxml (99%) rename {src/main => G-Earth-UI/src/main/java/gearth}/ui/tools/Tools.java (96%) create mode 100644 pom.xml delete mode 100644 src/META-INF/MANIFEST.MF diff --git a/Extensions/AdminOnConnect/pom.xml b/Extensions/AdminOnConnect/pom.xml new file mode 100644 index 0000000..7a5eab6 --- /dev/null +++ b/Extensions/AdminOnConnect/pom.xml @@ -0,0 +1,110 @@ + + + 4.0.0 + + AdminOnConnect + + jar + + 0.0.1-beta + + + G-Earth + G-Earth-Parent + 0.0.1-beta + + + + + + + false + src/main/java + + **/*.fxml + **/*.css + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + + + + + maven-resources-plugin + 2.6 + + + copy-resources + validate + + copy-resources + + + ${project.build.directory} + + + src/main/resources + + + + + + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory}/bin/lib + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.5 + + ${project.build.directory}/bin + + + true + true + extensions.adminonconnect.AdminOnConnect + false + lib/ + true + + + ${artifactId} + + + + + + + + G-Earth + G-Earth-UI + 0.0.1-beta + + + + \ No newline at end of file diff --git a/src/main/extensions/examples/adminonconnect/AdminOnConnect.java b/Extensions/AdminOnConnect/src/main/java/extensions/adminonconnect/AdminOnConnect.java similarity index 85% rename from src/main/extensions/examples/adminonconnect/AdminOnConnect.java rename to Extensions/AdminOnConnect/src/main/java/extensions/adminonconnect/AdminOnConnect.java index 499f3e1..e7106c8 100644 --- a/src/main/extensions/examples/adminonconnect/AdminOnConnect.java +++ b/Extensions/AdminOnConnect/src/main/java/extensions/adminonconnect/AdminOnConnect.java @@ -1,16 +1,14 @@ -package main.extensions.examples.adminonconnect; +package extensions.adminonconnect; -import main.extensions.Extension; -import main.extensions.ExtensionInfo; -import main.protocol.HMessage; -import main.protocol.HPacket; +import gearth.extensions.Extension; +import gearth.extensions.ExtensionInfo; +import gearth.protocol.HMessage; +import gearth.protocol.HPacket; /** * Created by Jonas on 26/06/18. */ - - @ExtensionInfo( Title = "Always admin!", Description = "Gives you admin permission on connect", diff --git a/Extensions/BlockReplacePackets/pom.xml b/Extensions/BlockReplacePackets/pom.xml new file mode 100644 index 0000000..f44fd20 --- /dev/null +++ b/Extensions/BlockReplacePackets/pom.xml @@ -0,0 +1,110 @@ + + + 4.0.0 + + BlockReplacePackets + + jar + + 0.0.1-beta + + + G-Earth + G-Earth-Parent + 0.0.1-beta + + + + + + + false + src/main/java + + **/*.fxml + **/*.css + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + + + + + maven-resources-plugin + 2.6 + + + copy-resources + validate + + copy-resources + + + ${project.build.directory} + + + src/main/resources + + + + + + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory}/bin/lib + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.5 + + ${project.build.directory}/bin + + + true + true + extensions.blockreplacepackets.BlockAndReplacePackets + false + lib/ + true + + + ${artifactId} + + + + + + + + G-Earth + G-Earth-UI + 0.0.1-beta + + + + \ No newline at end of file diff --git a/src/main/extensions/examples/blockreplacepackets/BlockAndReplacePackets.java b/Extensions/BlockReplacePackets/src/main/java/extensions/blockreplacepackets/BlockAndReplacePackets.java similarity index 85% rename from src/main/extensions/examples/blockreplacepackets/BlockAndReplacePackets.java rename to Extensions/BlockReplacePackets/src/main/java/extensions/blockreplacepackets/BlockAndReplacePackets.java index 97114ef..dbb49ba 100644 --- a/src/main/extensions/examples/blockreplacepackets/BlockAndReplacePackets.java +++ b/Extensions/BlockReplacePackets/src/main/java/extensions/blockreplacepackets/BlockAndReplacePackets.java @@ -1,4 +1,4 @@ -package main.extensions.examples.blockreplacepackets; +package extensions.blockreplacepackets; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; @@ -7,11 +7,9 @@ import javafx.scene.control.Button; import javafx.scene.control.ComboBox; import javafx.scene.control.TextField; import javafx.stage.Stage; -import main.extensions.ExtensionForm; -import main.extensions.ExtensionInfo; -import main.ui.GEarthController; - -import java.net.URL; +import gearth.extensions.ExtensionForm; +import gearth.extensions.ExtensionInfo; +import gearth.ui.GEarthController; /** * Created by Jonas on 22/09/18. @@ -54,6 +52,6 @@ public class BlockAndReplacePackets extends ExtensionForm { primaryStage.setTitle("Packet blocker &/ replacer"); primaryStage.setScene(new Scene(root, 580, 262)); - primaryStage.getScene().getStylesheets().add(GEarthController.class.getResource("bootstrap3.css").toExternalForm()); + primaryStage.getScene().getStylesheets().add(GEarthController.class.getResource("/gearth/ui/bootstrap3.css").toExternalForm()); } } diff --git a/src/main/extensions/examples/blockreplacepackets/blockreplace.fxml b/Extensions/BlockReplacePackets/src/main/java/extensions/blockreplacepackets/blockreplace.fxml similarity index 97% rename from src/main/extensions/examples/blockreplacepackets/blockreplace.fxml rename to Extensions/BlockReplacePackets/src/main/java/extensions/blockreplacepackets/blockreplace.fxml index 42748a1..e490eea 100644 --- a/src/main/extensions/examples/blockreplacepackets/blockreplace.fxml +++ b/Extensions/BlockReplacePackets/src/main/java/extensions/blockreplacepackets/blockreplace.fxml @@ -12,7 +12,7 @@ - + diff --git a/Extensions/SpeechColorizer/pom.xml b/Extensions/SpeechColorizer/pom.xml new file mode 100644 index 0000000..a6a40e5 --- /dev/null +++ b/Extensions/SpeechColorizer/pom.xml @@ -0,0 +1,110 @@ + + + 4.0.0 + + SpeechColorizer + + jar + + 0.0.1-beta + + + G-Earth + G-Earth-Parent + 0.0.1-beta + + + + + + + false + src/main/java + + **/*.fxml + **/*.css + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + + + + + maven-resources-plugin + 2.6 + + + copy-resources + validate + + copy-resources + + + ${project.build.directory} + + + src/main/resources + + + + + + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory}/bin/lib + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.5 + + ${project.build.directory}/bin + + + true + true + extensions.speechcolorizer.SpeechColorizer + false + lib/ + true + + + ${artifactId} + + + + + + + + G-Earth + G-Earth-UI + 0.0.1-beta + + + + \ No newline at end of file diff --git a/src/main/extensions/examples/speechcolorizer/SpeechColorizer.java b/Extensions/SpeechColorizer/src/main/java/extensions/speechcolorizer/SpeechColorizer.java similarity index 89% rename from src/main/extensions/examples/speechcolorizer/SpeechColorizer.java rename to Extensions/SpeechColorizer/src/main/java/extensions/speechcolorizer/SpeechColorizer.java index 919c76c..f01feb7 100644 --- a/src/main/extensions/examples/speechcolorizer/SpeechColorizer.java +++ b/Extensions/SpeechColorizer/src/main/java/extensions/speechcolorizer/SpeechColorizer.java @@ -1,9 +1,9 @@ -package main.extensions.examples.speechcolorizer; +package extensions.speechcolorizer; -import main.extensions.Extension; -import main.extensions.ExtensionInfo; -import main.protocol.HMessage; -import main.protocol.HPacket; +import gearth.extensions.Extension; +import gearth.extensions.ExtensionInfo; +import gearth.protocol.HMessage; +import gearth.protocol.HPacket; import java.util.Random; diff --git a/G-Earth-UI/pom.xml b/G-Earth-UI/pom.xml new file mode 100644 index 0000000..65d1503 --- /dev/null +++ b/G-Earth-UI/pom.xml @@ -0,0 +1,138 @@ + + + 4.0.0 + + G-Earth-UI + + jar + + 0.0.1-beta + + + G-Earth + G-Earth-Parent + 0.0.1-beta + + + + + + + false + src/main/java + + **/*.fxml + **/*.css + **/*.png + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + + + + + + + + + + + + + + + + + + + + + maven-resources-plugin + 2.6 + + + copy-resources + validate + + copy-resources + + + ${project.build.directory} + + + src/main/resources + + + + + + + + + + + + + + + + + + + + + + + + + + + + + maven-assembly-plugin + + + package + + single + + + + + + + main.Main + + + + jar-with-dependencies + + + + + + + + + org.json + json + 20180813 + + + org.fxmisc.richtext + richtextfx + 0.9.1 + + + \ No newline at end of file diff --git a/G-Earth-UI/src/META-INF/MANIFEST.MF b/G-Earth-UI/src/META-INF/MANIFEST.MF new file mode 100644 index 0000000..c12866f --- /dev/null +++ b/G-Earth-UI/src/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: gearth.Main + diff --git a/src/main/Main.java b/G-Earth-UI/src/main/java/gearth/Main.java similarity index 90% rename from src/main/Main.java rename to G-Earth-UI/src/main/java/gearth/Main.java index aff2565..06c87c7 100644 --- a/src/main/Main.java +++ b/G-Earth-UI/src/main/java/gearth/Main.java @@ -1,16 +1,12 @@ -package main; +package gearth; import javafx.application.Application; import javafx.application.Platform; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.scene.Scene; -import javafx.stage.Modality; import javafx.stage.Stage; -import javafx.stage.StageStyle; -import main.ui.GEarthController; - -import java.util.Arrays; +import gearth.ui.GEarthController; // run as root issue Invalid MIT-MAGIC-COOKIE-1 key fix: https://stackoverflow.com/questions/48139447/invalid-mit-magic-cookie-1-key diff --git a/src/main/extensions/Extension.java b/G-Earth-UI/src/main/java/gearth/extensions/Extension.java similarity index 98% rename from src/main/extensions/Extension.java rename to G-Earth-UI/src/main/java/gearth/extensions/Extension.java index 525582c..b4dc3e0 100644 --- a/src/main/extensions/Extension.java +++ b/G-Earth-UI/src/main/java/gearth/extensions/Extension.java @@ -1,8 +1,8 @@ -package main.extensions; +package gearth.extensions; -import main.protocol.HMessage; -import main.protocol.HPacket; -import main.ui.extensions.Extensions; +import gearth.protocol.HMessage; +import gearth.protocol.HPacket; +import gearth.ui.extensions.Extensions; import java.io.*; import java.net.Socket; @@ -134,7 +134,7 @@ public abstract class Extension { onEndConnection(); } else if (packet.headerId() == Extensions.OUTGOING_MESSAGES_IDS.FLAGSCHECK) { - // body = an array of G-Earths main flags + // body = an array of G-Earths gearth flags if (flagRequestCallback != null) { int arraysize = packet.readInteger(); String[] gEarthArgs = new String[arraysize]; diff --git a/src/main/extensions/ExtensionForm.java b/G-Earth-UI/src/main/java/gearth/extensions/ExtensionForm.java similarity index 97% rename from src/main/extensions/ExtensionForm.java rename to G-Earth-UI/src/main/java/gearth/extensions/ExtensionForm.java index fe50b9a..75d04fd 100644 --- a/src/main/extensions/ExtensionForm.java +++ b/G-Earth-UI/src/main/java/gearth/extensions/ExtensionForm.java @@ -1,10 +1,10 @@ -package main.extensions; +package gearth.extensions; import javafx.application.Application; import javafx.application.Platform; import javafx.stage.Stage; -import main.protocol.HMessage; -import main.protocol.HPacket; +import gearth.protocol.HMessage; +import gearth.protocol.HPacket; /** * Created by Jonas on 22/09/18. diff --git a/src/main/extensions/ExtensionInfo.java b/G-Earth-UI/src/main/java/gearth/extensions/ExtensionInfo.java similarity index 91% rename from src/main/extensions/ExtensionInfo.java rename to G-Earth-UI/src/main/java/gearth/extensions/ExtensionInfo.java index a4f16d7..3e2a527 100644 --- a/src/main/extensions/ExtensionInfo.java +++ b/G-Earth-UI/src/main/java/gearth/extensions/ExtensionInfo.java @@ -1,4 +1,4 @@ -package main.extensions; +package gearth.extensions; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/extensions/extra/Inspector.java b/G-Earth-UI/src/main/java/gearth/extensions/extra/Inspector.java similarity index 67% rename from src/main/extensions/extra/Inspector.java rename to G-Earth-UI/src/main/java/gearth/extensions/extra/Inspector.java index 6da0308..89acbf5 100644 --- a/src/main/extensions/extra/Inspector.java +++ b/G-Earth-UI/src/main/java/gearth/extensions/extra/Inspector.java @@ -1,4 +1,4 @@ -package main.extensions.extra; +package gearth.extensions.extra; /** * Created by Jonas on 22/09/18. diff --git a/src/main/misc/Cacher.java b/G-Earth-UI/src/main/java/gearth/misc/Cacher.java similarity index 63% rename from src/main/misc/Cacher.java rename to G-Earth-UI/src/main/java/gearth/misc/Cacher.java index 4581f09..2866e0e 100644 --- a/src/main/misc/Cacher.java +++ b/G-Earth-UI/src/main/java/gearth/misc/Cacher.java @@ -1,52 +1,48 @@ -package main.misc; +package gearth.misc; -import main.Main; -import org.json.simple.JSONObject; -import org.json.simple.parser.JSONParser; -import org.json.simple.parser.ParseException; +import gearth.Main; +import org.json.JSONArray; +import org.json.JSONObject; import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.nio.file.Files; -import java.util.ArrayList; import java.util.List; -import java.util.Map; /** * Created by Jonas on 28/09/18. */ public class Cacher { - private static final String CACHEFILENAME = "cache.json"; + private static final String CACHE_FILENAME = "cache.json"; private static String getCacheDir() { return new File(Main.class.getProtectionDomain().getCodeSource().getLocation().getPath()).getParent(); } private static boolean cacheFileExists() { - File f = new File(getCacheDir(), CACHEFILENAME); + File f = new File(getCacheDir(), CACHE_FILENAME); return (f.exists() && !f.isDirectory()); } private static JSONObject getCacheContents() { if (cacheFileExists()) { try { - File f = new File(getCacheDir(), CACHEFILENAME); + File f = new File(getCacheDir(), CACHE_FILENAME); String contents = String.join("\n", Files.readAllLines(f.toPath())); - JSONParser parser = new JSONParser(); - return (JSONObject) parser.parse(contents); - } catch (IOException | ParseException e) { + return new JSONObject(contents); + } catch (IOException e) { e.printStackTrace(); } } return new JSONObject(); } private static void updateCache(JSONObject contents) { - try (FileWriter file = new FileWriter(new File(getCacheDir(), CACHEFILENAME))) { + try (FileWriter file = new FileWriter(new File(getCacheDir(), CACHE_FILENAME))) { - file.write(contents.toJSONString()); + file.write(contents.toString()); file.flush(); } catch (IOException e) { @@ -56,16 +52,24 @@ public class Cacher { public static void put(String key, Object val) { JSONObject object = getCacheContents(); - if (object.containsKey(key)) object.remove(key); + if (object.has(key)) object.remove(key); object.put(key, val); updateCache(object); } + public static Object get(String key) { JSONObject object = getCacheContents(); - - return object.get(key); + if (object.has(key)) return object.get(key); + else return null; } + + public static List getList(String key) { + JSONObject object = getCacheContents(); + if (object.has(key)) return ((JSONArray)object.get(key)).toList(); + else return null; + } + public static void clear() { updateCache(new JSONObject()); } diff --git a/src/main/misc/ConfirmationDialog.java b/G-Earth-UI/src/main/java/gearth/misc/ConfirmationDialog.java similarity index 98% rename from src/main/misc/ConfirmationDialog.java rename to G-Earth-UI/src/main/java/gearth/misc/ConfirmationDialog.java index cc75890..3f9e7c6 100644 --- a/src/main/misc/ConfirmationDialog.java +++ b/G-Earth-UI/src/main/java/gearth/misc/ConfirmationDialog.java @@ -1,4 +1,4 @@ -package main.misc; +package gearth.misc; import javafx.scene.Group; import javafx.scene.Node; diff --git a/src/main/misc/OSValidator.java b/G-Earth-UI/src/main/java/gearth/misc/OSValidator.java similarity index 98% rename from src/main/misc/OSValidator.java rename to G-Earth-UI/src/main/java/gearth/misc/OSValidator.java index 3fb1c7b..6e3264a 100644 --- a/src/main/misc/OSValidator.java +++ b/G-Earth-UI/src/main/java/gearth/misc/OSValidator.java @@ -1,4 +1,4 @@ -package main.misc; +package gearth.misc; public class OSValidator { diff --git a/src/main/misc/StringifyAble.java b/G-Earth-UI/src/main/java/gearth/misc/StringifyAble.java similarity index 96% rename from src/main/misc/StringifyAble.java rename to G-Earth-UI/src/main/java/gearth/misc/StringifyAble.java index 61e9b9e..5039c80 100644 --- a/src/main/misc/StringifyAble.java +++ b/G-Earth-UI/src/main/java/gearth/misc/StringifyAble.java @@ -1,4 +1,4 @@ -package main.misc; +package gearth.misc; /** * Created by Jonas on 14/06/18. diff --git a/src/main/protocol/HConnection.java b/G-Earth-UI/src/main/java/gearth/protocol/HConnection.java similarity index 95% rename from src/main/protocol/HConnection.java rename to G-Earth-UI/src/main/java/gearth/protocol/HConnection.java index 038df41..a3c9763 100644 --- a/src/main/protocol/HConnection.java +++ b/G-Earth-UI/src/main/java/gearth/protocol/HConnection.java @@ -1,12 +1,13 @@ -package main.protocol; +package gearth.protocol; -import main.misc.Cacher; -import main.protocol.hostreplacer.HostReplacer; -import main.protocol.hostreplacer.HostReplacerFactory; -import main.protocol.memory.Rc4Obtainer; -import main.protocol.packethandler.Handler; -import main.protocol.packethandler.IncomingHandler; -import main.protocol.packethandler.OutgoingHandler; +import gearth.misc.Cacher; +import gearth.protocol.hostreplacer.HostReplacer; +import gearth.protocol.hostreplacer.HostReplacerFactory; +import gearth.protocol.memory.Rc4Obtainer; +import gearth.protocol.packethandler.Handler; +import gearth.protocol.packethandler.IncomingHandler; +import gearth.protocol.packethandler.OutgoingHandler; +import org.json.JSONArray; import java.io.*; import java.net.InetAddress; @@ -78,11 +79,11 @@ public class HConnection { autoDetectHosts.add("game-tr.habbo.com:30000"); autoDetectHosts.add("game-us.habbo.com:38101"); - List additionalCachedHotels = (List) Cacher.get(HOTELS_CACHE_KEY); + List additionalCachedHotels = Cacher.getList(HOTELS_CACHE_KEY); if (additionalCachedHotels != null) { - for (String additionalHotel : additionalCachedHotels) { + for (Object additionalHotel : additionalCachedHotels) { if (!autoDetectHosts.contains(additionalHotel)) { - autoDetectHosts.add(additionalHotel); + autoDetectHosts.add((String)additionalHotel); } } } @@ -123,7 +124,7 @@ public class HConnection { // manual method public void prepare(String domain, int port) { - List additionalCachedHotels = (List) Cacher.get(HOTELS_CACHE_KEY); + List additionalCachedHotels = Cacher.getList(HOTELS_CACHE_KEY); if (additionalCachedHotels == null) { additionalCachedHotels = new ArrayList<>(); } @@ -132,7 +133,6 @@ public class HConnection { Cacher.put(HOTELS_CACHE_KEY, additionalCachedHotels); } - List potentialHost = new ArrayList<>(); potentialHost.add(domain+":"+port); prepare(potentialHost); @@ -171,9 +171,9 @@ public class HConnection { } } - List additionalCachedHotels = (List) Cacher.get(HOTELS_CACHE_KEY); + List additionalCachedHotels = Cacher.getList(HOTELS_CACHE_KEY); if (additionalCachedHotels != null) { - for (String host: willremove) { + for (String host : willremove) { additionalCachedHotels.remove(host); } Cacher.put(HOTELS_CACHE_KEY, additionalCachedHotels); diff --git a/src/main/protocol/HMessage.java b/G-Earth-UI/src/main/java/gearth/protocol/HMessage.java similarity index 95% rename from src/main/protocol/HMessage.java rename to G-Earth-UI/src/main/java/gearth/protocol/HMessage.java index 159fa4b..a64a8d1 100644 --- a/src/main/protocol/HMessage.java +++ b/G-Earth-UI/src/main/java/gearth/protocol/HMessage.java @@ -1,6 +1,6 @@ -package main.protocol; +package gearth.protocol; -import main.misc.StringifyAble; +import gearth.misc.StringifyAble; public class HMessage implements StringifyAble { @@ -75,7 +75,7 @@ public class HMessage implements StringifyAble { return message.hPacket.equals(hPacket) && (side == message.side) && (index == message.index); } -// public static void main(String[] args) { +// public static void gearth(String[] args) { // HPacket packet3 = new HPacket(81, new byte[]{0,0,0,1,0,0}); // // HPacket packet = new HPacket(82, new byte[]{0,0,0,1,0,0}); diff --git a/src/main/protocol/HPacket.java b/G-Earth-UI/src/main/java/gearth/protocol/HPacket.java similarity index 99% rename from src/main/protocol/HPacket.java rename to G-Earth-UI/src/main/java/gearth/protocol/HPacket.java index 4df5708..f87dc87 100644 --- a/src/main/protocol/HPacket.java +++ b/G-Earth-UI/src/main/java/gearth/protocol/HPacket.java @@ -1,14 +1,12 @@ -package main.protocol; +package gearth.protocol; -import main.misc.StringifyAble; +import gearth.misc.StringifyAble; import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; public class HPacket implements StringifyAble { // te komen: toExpressions (+impl. expressies) diff --git a/src/main/protocol/StateChangeListener.java b/G-Earth-UI/src/main/java/gearth/protocol/StateChangeListener.java similarity index 83% rename from src/main/protocol/StateChangeListener.java rename to G-Earth-UI/src/main/java/gearth/protocol/StateChangeListener.java index 6c2fada..3fed137 100644 --- a/src/main/protocol/StateChangeListener.java +++ b/G-Earth-UI/src/main/java/gearth/protocol/StateChangeListener.java @@ -1,4 +1,4 @@ -package main.protocol; +package gearth.protocol; public interface StateChangeListener { diff --git a/src/main/protocol/TrafficListener.java b/G-Earth-UI/src/main/java/gearth/protocol/TrafficListener.java similarity index 75% rename from src/main/protocol/TrafficListener.java rename to G-Earth-UI/src/main/java/gearth/protocol/TrafficListener.java index a369119..da5a11c 100644 --- a/src/main/protocol/TrafficListener.java +++ b/G-Earth-UI/src/main/java/gearth/protocol/TrafficListener.java @@ -1,4 +1,4 @@ -package main.protocol; +package gearth.protocol; public interface TrafficListener { diff --git a/src/main/protocol/crypto/RC4.java b/G-Earth-UI/src/main/java/gearth/protocol/crypto/RC4.java similarity index 98% rename from src/main/protocol/crypto/RC4.java rename to G-Earth-UI/src/main/java/gearth/protocol/crypto/RC4.java index 66d0b7d..4e51cbe 100644 --- a/src/main/protocol/crypto/RC4.java +++ b/G-Earth-UI/src/main/java/gearth/protocol/crypto/RC4.java @@ -1,4 +1,4 @@ -package main.protocol.crypto; +package gearth.protocol.crypto; /* * Copyright (C) 2003 Clarence Ho (clarence@clarenceho.net) * All rights reserved. @@ -33,11 +33,7 @@ package main.protocol.crypto; * THE POSSIBILITY OF SUCH DAMAGE. */ -import main.protocol.HPacket; - -import java.util.ArrayList; import java.util.Arrays; -import java.util.List; /** * This is a simple implementation of the RC4 (tm) encryption algorithm. The diff --git a/src/main/protocol/hostreplacer/HostReplacer.java b/G-Earth-UI/src/main/java/gearth/protocol/hostreplacer/HostReplacer.java similarity index 75% rename from src/main/protocol/hostreplacer/HostReplacer.java rename to G-Earth-UI/src/main/java/gearth/protocol/hostreplacer/HostReplacer.java index f006266..596fae7 100644 --- a/src/main/protocol/hostreplacer/HostReplacer.java +++ b/G-Earth-UI/src/main/java/gearth/protocol/hostreplacer/HostReplacer.java @@ -1,4 +1,4 @@ -package main.protocol.hostreplacer; +package gearth.protocol.hostreplacer; public interface HostReplacer { diff --git a/src/main/protocol/hostreplacer/HostReplacerFactory.java b/G-Earth-UI/src/main/java/gearth/protocol/hostreplacer/HostReplacerFactory.java similarity index 82% rename from src/main/protocol/hostreplacer/HostReplacerFactory.java rename to G-Earth-UI/src/main/java/gearth/protocol/hostreplacer/HostReplacerFactory.java index 8ac66f3..a895828 100644 --- a/src/main/protocol/hostreplacer/HostReplacerFactory.java +++ b/G-Earth-UI/src/main/java/gearth/protocol/hostreplacer/HostReplacerFactory.java @@ -1,6 +1,6 @@ -package main.protocol.hostreplacer; +package gearth.protocol.hostreplacer; -import main.misc.OSValidator; +import gearth.misc.OSValidator; /** * Created by Jonas on 04/04/18. diff --git a/src/main/protocol/hostreplacer/UnixHostReplacer.java b/G-Earth-UI/src/main/java/gearth/protocol/hostreplacer/UnixHostReplacer.java similarity index 98% rename from src/main/protocol/hostreplacer/UnixHostReplacer.java rename to G-Earth-UI/src/main/java/gearth/protocol/hostreplacer/UnixHostReplacer.java index 760da52..80ed3d6 100644 --- a/src/main/protocol/hostreplacer/UnixHostReplacer.java +++ b/G-Earth-UI/src/main/java/gearth/protocol/hostreplacer/UnixHostReplacer.java @@ -1,4 +1,4 @@ -package main.protocol.hostreplacer; +package gearth.protocol.hostreplacer; import java.io.*; import java.util.ArrayList; diff --git a/src/main/protocol/hostreplacer/WindowsHostReplacer.java b/G-Earth-UI/src/main/java/gearth/protocol/hostreplacer/WindowsHostReplacer.java similarity index 86% rename from src/main/protocol/hostreplacer/WindowsHostReplacer.java rename to G-Earth-UI/src/main/java/gearth/protocol/hostreplacer/WindowsHostReplacer.java index c02d36c..092c73f 100644 --- a/src/main/protocol/hostreplacer/WindowsHostReplacer.java +++ b/G-Earth-UI/src/main/java/gearth/protocol/hostreplacer/WindowsHostReplacer.java @@ -1,4 +1,4 @@ -package main.protocol.hostreplacer; +package gearth.protocol.hostreplacer; /** * Created by Jonas on 04/04/18. diff --git a/src/main/protocol/memory/Rc4Obtainer.java b/G-Earth-UI/src/main/java/gearth/protocol/memory/Rc4Obtainer.java similarity index 86% rename from src/main/protocol/memory/Rc4Obtainer.java rename to G-Earth-UI/src/main/java/gearth/protocol/memory/Rc4Obtainer.java index f0aaf9e..b1a3c8b 100644 --- a/src/main/protocol/memory/Rc4Obtainer.java +++ b/G-Earth-UI/src/main/java/gearth/protocol/memory/Rc4Obtainer.java @@ -1,16 +1,15 @@ -package main.protocol.memory; +package gearth.protocol.memory; -import main.protocol.HConnection; -import main.protocol.HMessage; -import main.protocol.HPacket; -import main.protocol.crypto.RC4; -import main.protocol.memory.habboclient.HabboClient; -import main.protocol.memory.habboclient.HabboClientFactory; -import main.protocol.memory.habboclient.linux.LinuxHabboClient; -import main.protocol.packethandler.Handler; -import main.protocol.packethandler.IncomingHandler; -import main.protocol.packethandler.OutgoingHandler; -import main.protocol.packethandler.PayloadBuffer; +import gearth.protocol.HConnection; +import gearth.protocol.HMessage; +import gearth.protocol.HPacket; +import gearth.protocol.crypto.RC4; +import gearth.protocol.memory.habboclient.HabboClient; +import gearth.protocol.memory.habboclient.HabboClientFactory; +import gearth.protocol.packethandler.Handler; +import gearth.protocol.packethandler.IncomingHandler; +import gearth.protocol.packethandler.OutgoingHandler; +import gearth.protocol.packethandler.PayloadBuffer; import java.util.Arrays; import java.util.List; diff --git a/src/main/protocol/memory/habboclient/HabboClient.java b/G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/HabboClient.java similarity index 81% rename from src/main/protocol/memory/habboclient/HabboClient.java rename to G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/HabboClient.java index 8ad3ad9..67817e4 100644 --- a/src/main/protocol/memory/habboclient/HabboClient.java +++ b/G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/HabboClient.java @@ -1,6 +1,6 @@ -package main.protocol.memory.habboclient; +package gearth.protocol.memory.habboclient; -import main.protocol.HConnection; +import gearth.protocol.HConnection; import java.util.List; diff --git a/src/main/protocol/memory/habboclient/HabboClientFactory.java b/G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/HabboClientFactory.java similarity index 56% rename from src/main/protocol/memory/habboclient/HabboClientFactory.java rename to G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/HabboClientFactory.java index b74a719..584f83c 100644 --- a/src/main/protocol/memory/habboclient/HabboClientFactory.java +++ b/G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/HabboClientFactory.java @@ -1,9 +1,9 @@ -package main.protocol.memory.habboclient; +package gearth.protocol.memory.habboclient; -import main.misc.OSValidator; -import main.protocol.HConnection; -import main.protocol.memory.habboclient.linux.LinuxHabboClient; -import main.protocol.memory.habboclient.windows.WindowsHabboClient; +import gearth.misc.OSValidator; +import gearth.protocol.HConnection; +import gearth.protocol.memory.habboclient.linux.LinuxHabboClient; +import gearth.protocol.memory.habboclient.windows.WindowsHabboClient; /** * Created by Jonas on 13/06/18. diff --git a/src/main/protocol/memory/habboclient/linux/LinuxHabboClient.java b/G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/linux/LinuxHabboClient.java similarity index 98% rename from src/main/protocol/memory/habboclient/linux/LinuxHabboClient.java rename to G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/linux/LinuxHabboClient.java index e1264c1..cb9f652 100644 --- a/src/main/protocol/memory/habboclient/linux/LinuxHabboClient.java +++ b/G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/linux/LinuxHabboClient.java @@ -1,7 +1,7 @@ -package main.protocol.memory.habboclient.linux; +package gearth.protocol.memory.habboclient.linux; -import main.protocol.HConnection; -import main.protocol.memory.habboclient.HabboClient; +import gearth.protocol.HConnection; +import gearth.protocol.memory.habboclient.HabboClient; import java.io.*; import java.nio.file.Files; diff --git a/src/main/protocol/memory/habboclient/linux/LinuxMemorySnippet.java b/G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/linux/LinuxMemorySnippet.java similarity index 86% rename from src/main/protocol/memory/habboclient/linux/LinuxMemorySnippet.java rename to G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/linux/LinuxMemorySnippet.java index 84b4b05..15b054c 100644 --- a/src/main/protocol/memory/habboclient/linux/LinuxMemorySnippet.java +++ b/G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/linux/LinuxMemorySnippet.java @@ -1,4 +1,4 @@ -package main.protocol.memory.habboclient.linux; +package gearth.protocol.memory.habboclient.linux; public class LinuxMemorySnippet { long offset; diff --git a/src/main/protocol/memory/habboclient/windows/WindowsHabboClient.java b/G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/windows/WindowsHabboClient.java similarity index 76% rename from src/main/protocol/memory/habboclient/windows/WindowsHabboClient.java rename to G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/windows/WindowsHabboClient.java index fa0ef39..4bb41bd 100644 --- a/src/main/protocol/memory/habboclient/windows/WindowsHabboClient.java +++ b/G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/windows/WindowsHabboClient.java @@ -1,11 +1,10 @@ -package main.protocol.memory.habboclient.windows; +package gearth.protocol.memory.habboclient.windows; -import main.misc.Cacher; -import main.protocol.HConnection; -import main.protocol.HMessage; -import main.protocol.TrafficListener; -import main.protocol.memory.habboclient.HabboClient; -import org.json.simple.JSONObject; +import gearth.misc.Cacher; +import gearth.protocol.HConnection; +import gearth.protocol.HMessage; +import gearth.protocol.memory.habboclient.HabboClient; +import org.json.JSONObject; import java.io.BufferedReader; import java.io.File; @@ -23,22 +22,16 @@ public class WindowsHabboClient extends HabboClient { super(connection); connection.addTrafficListener(0, message -> { - if (message.getDestination() == HMessage.Side.TOSERVER && message.getPacket().headerId() == PRODUCTIONID) { + if (message.getDestination() == HMessage.Side.TOSERVER && message.getPacket().headerId() == PRODUCTION_ID) { production = message.getPacket().readString(); } }); } - private static final int PRODUCTIONID = 4000; + private static final String OFFSETS_CACHE_KEY = "RC4Offsets"; + private static final int PRODUCTION_ID = 4000; private String production = ""; - private String getOffsetsCacheKey() { - return "RC4Offsets"; - } - - private String getOffsetsRevision() { - return production; - } @Override public List getRC4cached() { @@ -58,15 +51,16 @@ public class WindowsHabboClient extends HabboClient { } private ArrayList readPossibleBytes(boolean useCache) throws IOException, URISyntaxException { - ProcessBuilder pb = null; - JSONObject revisionList = (JSONObject) Cacher.get(getOffsetsCacheKey()); + ProcessBuilder pb; + JSONObject revisionList = (JSONObject) Cacher.get(OFFSETS_CACHE_KEY); if (revisionList == null) { - Cacher.put(getOffsetsCacheKey(), new JSONObject()); - revisionList = (JSONObject) Cacher.get(getOffsetsCacheKey()); // refresh + Cacher.put(OFFSETS_CACHE_KEY, new JSONObject()); + revisionList = (JSONObject) Cacher.get(OFFSETS_CACHE_KEY); } - List cachedOffsets = (List) revisionList.get(getOffsetsRevision()); + assert revisionList != null; + List cachedOffsets = revisionList.getJSONArray(production).toList(); StringJoiner joiner = new StringJoiner(" "); if (useCache) { @@ -74,8 +68,8 @@ public class WindowsHabboClient extends HabboClient { return null; } - for (String s : cachedOffsets) { - joiner.add(s); + for (Object s : cachedOffsets) { + joiner.add((String)s); } } @@ -108,8 +102,9 @@ public class WindowsHabboClient extends HabboClient { possibleData.add(line); } } - revisionList.put(getOffsetsRevision(), cachedOffsets); - Cacher.put(getOffsetsCacheKey(), revisionList); + + revisionList.put(production, cachedOffsets); + Cacher.put(OFFSETS_CACHE_KEY, revisionList); p.destroy(); return possibleData; } @@ -129,7 +124,7 @@ public class WindowsHabboClient extends HabboClient { return result; } - public static byte[] hexStringToByteArray(String s) { + private static byte[] hexStringToByteArray(String s) { int len = s.length(); byte[] data = new byte[len / 2]; for (int i = 0; i < len; i += 2) { diff --git a/src/main/protocol/packethandler/BufferListener.java b/G-Earth-UI/src/main/java/gearth/protocol/packethandler/BufferListener.java similarity index 64% rename from src/main/protocol/packethandler/BufferListener.java rename to G-Earth-UI/src/main/java/gearth/protocol/packethandler/BufferListener.java index 8e346f6..ce79c49 100644 --- a/src/main/protocol/packethandler/BufferListener.java +++ b/G-Earth-UI/src/main/java/gearth/protocol/packethandler/BufferListener.java @@ -1,4 +1,4 @@ -package main.protocol.packethandler; +package gearth.protocol.packethandler; public interface BufferListener { diff --git a/src/main/protocol/packethandler/Handler.java b/G-Earth-UI/src/main/java/gearth/protocol/packethandler/Handler.java similarity index 96% rename from src/main/protocol/packethandler/Handler.java rename to G-Earth-UI/src/main/java/gearth/protocol/packethandler/Handler.java index 7a3513f..7afa84f 100644 --- a/src/main/protocol/packethandler/Handler.java +++ b/G-Earth-UI/src/main/java/gearth/protocol/packethandler/Handler.java @@ -1,9 +1,9 @@ -package main.protocol.packethandler; +package gearth.protocol.packethandler; -import main.protocol.HMessage; -import main.protocol.HPacket; -import main.protocol.TrafficListener; -import main.protocol.crypto.RC4; +import gearth.protocol.HMessage; +import gearth.protocol.HPacket; +import gearth.protocol.TrafficListener; +import gearth.protocol.crypto.RC4; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/protocol/packethandler/IncomingHandler.java b/G-Earth-UI/src/main/java/gearth/protocol/packethandler/IncomingHandler.java similarity index 90% rename from src/main/protocol/packethandler/IncomingHandler.java rename to G-Earth-UI/src/main/java/gearth/protocol/packethandler/IncomingHandler.java index f0d0bdc..0ecbfa2 100644 --- a/src/main/protocol/packethandler/IncomingHandler.java +++ b/G-Earth-UI/src/main/java/gearth/protocol/packethandler/IncomingHandler.java @@ -1,8 +1,8 @@ -package main.protocol.packethandler; +package gearth.protocol.packethandler; -import main.protocol.HMessage; -import main.protocol.HPacket; -import main.protocol.TrafficListener; +import gearth.protocol.HMessage; +import gearth.protocol.HPacket; +import gearth.protocol.TrafficListener; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/protocol/packethandler/OutgoingHandler.java b/G-Earth-UI/src/main/java/gearth/protocol/packethandler/OutgoingHandler.java similarity index 90% rename from src/main/protocol/packethandler/OutgoingHandler.java rename to G-Earth-UI/src/main/java/gearth/protocol/packethandler/OutgoingHandler.java index 3a50a65..e98d314 100644 --- a/src/main/protocol/packethandler/OutgoingHandler.java +++ b/G-Earth-UI/src/main/java/gearth/protocol/packethandler/OutgoingHandler.java @@ -1,11 +1,10 @@ -package main.protocol.packethandler; +package gearth.protocol.packethandler; -import main.protocol.HMessage; -import main.protocol.HPacket; +import gearth.protocol.HMessage; +import gearth.protocol.HPacket; import java.io.IOException; import java.io.OutputStream; -import java.util.List; public class OutgoingHandler extends Handler { diff --git a/src/main/protocol/packethandler/PayloadBuffer.java b/G-Earth-UI/src/main/java/gearth/protocol/packethandler/PayloadBuffer.java similarity index 96% rename from src/main/protocol/packethandler/PayloadBuffer.java rename to G-Earth-UI/src/main/java/gearth/protocol/packethandler/PayloadBuffer.java index 7fac4b6..3593976 100644 --- a/src/main/protocol/packethandler/PayloadBuffer.java +++ b/G-Earth-UI/src/main/java/gearth/protocol/packethandler/PayloadBuffer.java @@ -1,6 +1,6 @@ -package main.protocol.packethandler; +package gearth.protocol.packethandler; -import main.protocol.HPacket; +import gearth.protocol.HPacket; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/ui/G-Earth.fxml b/G-Earth-UI/src/main/java/gearth/ui/G-Earth.fxml similarity index 97% rename from src/main/ui/G-Earth.fxml rename to G-Earth-UI/src/main/java/gearth/ui/G-Earth.fxml index 7c15480..0541f2f 100644 --- a/src/main/ui/G-Earth.fxml +++ b/G-Earth-UI/src/main/java/gearth/ui/G-Earth.fxml @@ -7,7 +7,7 @@ - + diff --git a/src/main/ui/GEarthController.java b/G-Earth-UI/src/main/java/gearth/ui/GEarthController.java similarity index 88% rename from src/main/ui/GEarthController.java rename to G-Earth-UI/src/main/java/gearth/ui/GEarthController.java index 0126c2c..00b9e7c 100644 --- a/src/main/ui/GEarthController.java +++ b/G-Earth-UI/src/main/java/gearth/ui/GEarthController.java @@ -1,18 +1,18 @@ -package main.ui; +package gearth.ui; import javafx.scene.control.Tab; import javafx.scene.control.TabPane; import javafx.scene.layout.Pane; import javafx.stage.Stage; -import main.protocol.HConnection; -import main.ui.connection.Connection; -import main.ui.extensions.Extensions; -import main.ui.info.Info; -import main.ui.injection.Injection; -import main.ui.logger.Logger; -import main.ui.scheduler.Scheduler; -import main.ui.settings.Settings; -import main.ui.tools.Tools; +import gearth.protocol.HConnection; +import gearth.ui.connection.Connection; +import gearth.ui.extensions.Extensions; +import gearth.ui.info.Info; +import gearth.ui.injection.Injection; +import gearth.ui.logger.Logger; +import gearth.ui.scheduler.Scheduler; +import gearth.ui.settings.Settings; +import gearth.ui.tools.Tools; public class GEarthController { diff --git a/src/main/ui/SubForm.java b/G-Earth-UI/src/main/java/gearth/ui/SubForm.java similarity index 79% rename from src/main/ui/SubForm.java rename to G-Earth-UI/src/main/java/gearth/ui/SubForm.java index 9984bbe..3fe1412 100644 --- a/src/main/ui/SubForm.java +++ b/G-Earth-UI/src/main/java/gearth/ui/SubForm.java @@ -1,11 +1,7 @@ -package main.ui; +package gearth.ui; -import main.protocol.HConnection; -import main.protocol.HMessage; -import main.protocol.HPacket; - -import java.awt.*; +import gearth.protocol.HConnection; public class SubForm { diff --git a/src/main/ui/bootstrap3.css b/G-Earth-UI/src/main/java/gearth/ui/bootstrap3.css similarity index 100% rename from src/main/ui/bootstrap3.css rename to G-Earth-UI/src/main/java/gearth/ui/bootstrap3.css diff --git a/src/main/ui/buttons/BoxButton.java b/G-Earth-UI/src/main/java/gearth/ui/buttons/BoxButton.java similarity index 98% rename from src/main/ui/buttons/BoxButton.java rename to G-Earth-UI/src/main/java/gearth/ui/buttons/BoxButton.java index f0abd39..17025c9 100644 --- a/src/main/ui/buttons/BoxButton.java +++ b/G-Earth-UI/src/main/java/gearth/ui/buttons/BoxButton.java @@ -1,4 +1,4 @@ -package main.ui.buttons; +package gearth.ui.buttons; import javafx.event.EventHandler; import javafx.scene.Cursor; diff --git a/src/main/ui/buttons/DeleteButton.java b/G-Earth-UI/src/main/java/gearth/ui/buttons/DeleteButton.java similarity index 63% rename from src/main/ui/buttons/DeleteButton.java rename to G-Earth-UI/src/main/java/gearth/ui/buttons/DeleteButton.java index 2d91f52..9b31a14 100644 --- a/src/main/ui/buttons/DeleteButton.java +++ b/G-Earth-UI/src/main/java/gearth/ui/buttons/DeleteButton.java @@ -1,8 +1,4 @@ -package main.ui.buttons; - -import org.omg.CORBA.Environment; - -import java.io.File; +package gearth.ui.buttons; public class DeleteButton extends BoxButton { diff --git a/src/main/ui/buttons/EditButton.java b/G-Earth-UI/src/main/java/gearth/ui/buttons/EditButton.java similarity index 83% rename from src/main/ui/buttons/EditButton.java rename to G-Earth-UI/src/main/java/gearth/ui/buttons/EditButton.java index 2f07b12..f0470e8 100644 --- a/src/main/ui/buttons/EditButton.java +++ b/G-Earth-UI/src/main/java/gearth/ui/buttons/EditButton.java @@ -1,4 +1,4 @@ -package main.ui.buttons; +package gearth.ui.buttons; public class EditButton extends BoxButton { diff --git a/src/main/ui/buttons/ExitButton.java b/G-Earth-UI/src/main/java/gearth/ui/buttons/ExitButton.java similarity index 86% rename from src/main/ui/buttons/ExitButton.java rename to G-Earth-UI/src/main/java/gearth/ui/buttons/ExitButton.java index faaccd8..fe5d28b 100644 --- a/src/main/ui/buttons/ExitButton.java +++ b/G-Earth-UI/src/main/java/gearth/ui/buttons/ExitButton.java @@ -1,4 +1,4 @@ -package main.ui.buttons; +package gearth.ui.buttons; /** * Created by Jonas on 26/09/18. diff --git a/src/main/ui/buttons/FireButton.java b/G-Earth-UI/src/main/java/gearth/ui/buttons/FireButton.java similarity index 86% rename from src/main/ui/buttons/FireButton.java rename to G-Earth-UI/src/main/java/gearth/ui/buttons/FireButton.java index 798dbb3..0018d95 100644 --- a/src/main/ui/buttons/FireButton.java +++ b/G-Earth-UI/src/main/java/gearth/ui/buttons/FireButton.java @@ -1,4 +1,4 @@ -package main.ui.buttons; +package gearth.ui.buttons; /** * Created by Jonas on 26/09/18. diff --git a/src/main/ui/buttons/PauseResumeButton.java b/G-Earth-UI/src/main/java/gearth/ui/buttons/PauseResumeButton.java similarity index 99% rename from src/main/ui/buttons/PauseResumeButton.java rename to G-Earth-UI/src/main/java/gearth/ui/buttons/PauseResumeButton.java index d8ca648..2e4b2cf 100644 --- a/src/main/ui/buttons/PauseResumeButton.java +++ b/G-Earth-UI/src/main/java/gearth/ui/buttons/PauseResumeButton.java @@ -1,4 +1,4 @@ -package main.ui.buttons; +package gearth.ui.buttons; import javafx.beans.InvalidationListener; import javafx.event.EventHandler; diff --git a/src/main/ui/buttons/ReloadButton.java b/G-Earth-UI/src/main/java/gearth/ui/buttons/ReloadButton.java similarity index 87% rename from src/main/ui/buttons/ReloadButton.java rename to G-Earth-UI/src/main/java/gearth/ui/buttons/ReloadButton.java index e294fba..bad2e99 100644 --- a/src/main/ui/buttons/ReloadButton.java +++ b/G-Earth-UI/src/main/java/gearth/ui/buttons/ReloadButton.java @@ -1,4 +1,4 @@ -package main.ui.buttons; +package gearth.ui.buttons; /** * Created by Jonas on 26/09/18. diff --git a/src/main/ui/buttons/SimpleClickButton.java b/G-Earth-UI/src/main/java/gearth/ui/buttons/SimpleClickButton.java similarity index 87% rename from src/main/ui/buttons/SimpleClickButton.java rename to G-Earth-UI/src/main/java/gearth/ui/buttons/SimpleClickButton.java index 59585c4..ad1d51d 100644 --- a/src/main/ui/buttons/SimpleClickButton.java +++ b/G-Earth-UI/src/main/java/gearth/ui/buttons/SimpleClickButton.java @@ -1,4 +1,4 @@ -package main.ui.buttons; +package gearth.ui.buttons; /** * Created by Jonas on 19/07/18. diff --git a/src/main/ui/buttons/files/ButtonDelete.png b/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonDelete.png similarity index 100% rename from src/main/ui/buttons/files/ButtonDelete.png rename to G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonDelete.png diff --git a/src/main/ui/buttons/files/ButtonDeleteHover.png b/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonDeleteHover.png similarity index 100% rename from src/main/ui/buttons/files/ButtonDeleteHover.png rename to G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonDeleteHover.png diff --git a/src/main/ui/buttons/files/ButtonEdit.png b/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonEdit.png similarity index 100% rename from src/main/ui/buttons/files/ButtonEdit.png rename to G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonEdit.png diff --git a/src/main/ui/buttons/files/ButtonEditHover.png b/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonEditHover.png similarity index 100% rename from src/main/ui/buttons/files/ButtonEditHover.png rename to G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonEditHover.png diff --git a/src/main/ui/buttons/files/ButtonExit.png b/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonExit.png similarity index 100% rename from src/main/ui/buttons/files/ButtonExit.png rename to G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonExit.png diff --git a/src/main/ui/buttons/files/ButtonExitHover.png b/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonExitHover.png similarity index 100% rename from src/main/ui/buttons/files/ButtonExitHover.png rename to G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonExitHover.png diff --git a/src/main/ui/buttons/files/ButtonFire.png b/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonFire.png similarity index 100% rename from src/main/ui/buttons/files/ButtonFire.png rename to G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonFire.png diff --git a/src/main/ui/buttons/files/ButtonFireHover.png b/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonFireHover.png similarity index 100% rename from src/main/ui/buttons/files/ButtonFireHover.png rename to G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonFireHover.png diff --git a/src/main/ui/buttons/files/ButtonPause.png b/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonPause.png similarity index 100% rename from src/main/ui/buttons/files/ButtonPause.png rename to G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonPause.png diff --git a/src/main/ui/buttons/files/ButtonPauseHover.png b/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonPauseHover.png similarity index 100% rename from src/main/ui/buttons/files/ButtonPauseHover.png rename to G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonPauseHover.png diff --git a/src/main/ui/buttons/files/ButtonReload.png b/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonReload.png similarity index 100% rename from src/main/ui/buttons/files/ButtonReload.png rename to G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonReload.png diff --git a/src/main/ui/buttons/files/ButtonReloadHover.png b/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonReloadHover.png similarity index 100% rename from src/main/ui/buttons/files/ButtonReloadHover.png rename to G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonReloadHover.png diff --git a/src/main/ui/buttons/files/ButtonResume.png b/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonResume.png similarity index 100% rename from src/main/ui/buttons/files/ButtonResume.png rename to G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonResume.png diff --git a/src/main/ui/buttons/files/ButtonResumeHover.png b/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonResumeHover.png similarity index 100% rename from src/main/ui/buttons/files/ButtonResumeHover.png rename to G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonResumeHover.png diff --git a/src/main/ui/connection/Connection.fxml b/G-Earth-UI/src/main/java/gearth/ui/connection/Connection.fxml similarity index 99% rename from src/main/ui/connection/Connection.fxml rename to G-Earth-UI/src/main/java/gearth/ui/connection/Connection.fxml index 319360e..8c15eb6 100644 --- a/src/main/ui/connection/Connection.fxml +++ b/G-Earth-UI/src/main/java/gearth/ui/connection/Connection.fxml @@ -11,7 +11,7 @@ - + diff --git a/src/main/ui/connection/Connection.java b/G-Earth-UI/src/main/java/gearth/ui/connection/Connection.java similarity index 92% rename from src/main/ui/connection/Connection.java rename to G-Earth-UI/src/main/java/gearth/ui/connection/Connection.java index f7122c0..254075b 100644 --- a/src/main/ui/connection/Connection.java +++ b/G-Earth-UI/src/main/java/gearth/ui/connection/Connection.java @@ -1,17 +1,10 @@ -package main.ui.connection; +package gearth.ui.connection; import javafx.application.Platform; -import javafx.beans.InvalidationListener; -import javafx.beans.Observable; import javafx.event.ActionEvent; -import javafx.event.Event; -import javafx.event.EventHandler; -import javafx.event.EventType; import javafx.scene.control.*; -import main.protocol.HConnection; -import main.protocol.HMessage; -import main.protocol.TrafficListener; -import main.ui.SubForm; +import gearth.protocol.HConnection; +import gearth.ui.SubForm; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/ui/extensions/ExtensionItemContainer.java b/G-Earth-UI/src/main/java/gearth/ui/extensions/ExtensionItemContainer.java similarity index 94% rename from src/main/ui/extensions/ExtensionItemContainer.java rename to G-Earth-UI/src/main/java/gearth/ui/extensions/ExtensionItemContainer.java index 820ab7e..f1dd7da 100644 --- a/src/main/ui/extensions/ExtensionItemContainer.java +++ b/G-Earth-UI/src/main/java/gearth/ui/extensions/ExtensionItemContainer.java @@ -1,4 +1,4 @@ -package main.ui.extensions; +package gearth.ui.extensions; import javafx.event.EventHandler; import javafx.geometry.Insets; @@ -8,17 +8,13 @@ import javafx.scene.input.MouseEvent; import javafx.scene.layout.*; import javafx.scene.paint.Paint; import javafx.scene.text.Font; -import main.extensions.Extension; -import main.misc.ConfirmationDialog; -import main.ui.buttons.*; -import main.ui.extensions.executer.ExecutionInfo; -import main.ui.extensions.executer.ExtensionRunner; -import main.ui.extensions.executer.ExtensionRunnerFactory; -import main.ui.extensions.executer.NormalExtensionRunner; -import main.ui.scheduler.ScheduleItem; +import gearth.misc.ConfirmationDialog; +import gearth.ui.buttons.*; +import gearth.ui.extensions.executer.ExecutionInfo; +import gearth.ui.extensions.executer.ExtensionRunner; +import gearth.ui.extensions.executer.ExtensionRunnerFactory; +import gearth.ui.extensions.executer.NormalExtensionRunner; -import javax.tools.Tool; -import java.nio.file.Path; import java.nio.file.Paths; /** diff --git a/src/main/ui/extensions/ExtensionItemContainerProducer.java b/G-Earth-UI/src/main/java/gearth/ui/extensions/ExtensionItemContainerProducer.java similarity index 97% rename from src/main/ui/extensions/ExtensionItemContainerProducer.java rename to G-Earth-UI/src/main/java/gearth/ui/extensions/ExtensionItemContainerProducer.java index ba3a9f4..e7cdde9 100644 --- a/src/main/ui/extensions/ExtensionItemContainerProducer.java +++ b/G-Earth-UI/src/main/java/gearth/ui/extensions/ExtensionItemContainerProducer.java @@ -1,4 +1,4 @@ -package main.ui.extensions; +package gearth.ui.extensions; import javafx.scene.Node; import javafx.scene.control.ScrollPane; diff --git a/src/main/ui/extensions/Extensions.fxml b/G-Earth-UI/src/main/java/gearth/ui/extensions/Extensions.fxml similarity index 99% rename from src/main/ui/extensions/Extensions.fxml rename to G-Earth-UI/src/main/java/gearth/ui/extensions/Extensions.fxml index b07e03e..6cba7b5 100644 --- a/src/main/ui/extensions/Extensions.fxml +++ b/G-Earth-UI/src/main/java/gearth/ui/extensions/Extensions.fxml @@ -10,7 +10,7 @@ - + diff --git a/src/main/ui/extensions/Extensions.java b/G-Earth-UI/src/main/java/gearth/ui/extensions/Extensions.java similarity index 97% rename from src/main/ui/extensions/Extensions.java rename to G-Earth-UI/src/main/java/gearth/ui/extensions/Extensions.java index c70ef01..4ae1b15 100644 --- a/src/main/ui/extensions/Extensions.java +++ b/G-Earth-UI/src/main/java/gearth/ui/extensions/Extensions.java @@ -1,8 +1,6 @@ -package main.ui.extensions; +package gearth.ui.extensions; import javafx.application.Platform; -import javafx.beans.*; -import javafx.beans.Observable; import javafx.event.ActionEvent; import javafx.scene.control.Button; import javafx.scene.control.ScrollPane; @@ -10,20 +8,16 @@ import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; import javafx.scene.layout.VBox; import javafx.stage.FileChooser; -import main.Main; -import main.protocol.*; -import main.ui.SubForm; -import main.ui.extensions.executer.ExecutionInfo; -import main.ui.extensions.executer.ExtensionRunner; -import main.ui.extensions.executer.ExtensionRunnerFactory; -import main.ui.scheduler.ScheduleItem; -import sun.misc.ExtensionInfo; +import gearth.Main; +import gearth.protocol.*; +import gearth.ui.SubForm; +import gearth.ui.extensions.executer.ExecutionInfo; +import gearth.ui.extensions.executer.ExtensionRunner; +import gearth.ui.extensions.executer.ExtensionRunnerFactory; +import gearth.ui.scheduler.ScheduleItem; -import java.io.BufferedReader; import java.io.File; -import java.io.FileReader; import java.io.IOException; -import java.net.ServerSocket; import java.util.*; /** @@ -73,7 +67,7 @@ import java.util.*; * | 3 | PACKET-INTERCEPT* | Includes the whole HMessage as body, needs response with the | * | | | manipulated HMessage (OUTGOING id: 2) | * ----------------------------------------------------------------------------------------------------- - * | 4 | FLAGS-CHECK** | Body: String with G-Earth's boot flags (args from static main method) | + * | 4 | FLAGS-CHECK** | Body: String with G-Earth's boot flags (args from static gearth method) | * ----------------------------------------------------------------------------------------------------- * | 5 | CONNECTION START | Empty body, just a note that a new connection has been made, | * | | | you could check this yourself as well (listen to out:4000 packet) | diff --git a/src/main/ui/extensions/GEarthExtension.java b/G-Earth-UI/src/main/java/gearth/ui/extensions/GEarthExtension.java similarity index 99% rename from src/main/ui/extensions/GEarthExtension.java rename to G-Earth-UI/src/main/java/gearth/ui/extensions/GEarthExtension.java index c38a3b5..5dd240f 100644 --- a/src/main/ui/extensions/GEarthExtension.java +++ b/G-Earth-UI/src/main/java/gearth/ui/extensions/GEarthExtension.java @@ -1,7 +1,7 @@ -package main.ui.extensions; +package gearth.ui.extensions; import javafx.beans.InvalidationListener; -import main.protocol.HPacket; +import gearth.protocol.HPacket; import java.io.DataInputStream; import java.io.IOException; diff --git a/src/main/ui/extensions/GEarthExtensionsRegistrer.java b/G-Earth-UI/src/main/java/gearth/ui/extensions/GEarthExtensionsRegistrer.java similarity index 97% rename from src/main/ui/extensions/GEarthExtensionsRegistrer.java rename to G-Earth-UI/src/main/java/gearth/ui/extensions/GEarthExtensionsRegistrer.java index 4787f1a..083c181 100644 --- a/src/main/ui/extensions/GEarthExtensionsRegistrer.java +++ b/G-Earth-UI/src/main/java/gearth/ui/extensions/GEarthExtensionsRegistrer.java @@ -1,4 +1,4 @@ -package main.ui.extensions; +package gearth.ui.extensions; import java.io.IOException; import java.net.ServerSocket; diff --git a/src/main/ui/extensions/executer/ExecutionInfo.java b/G-Earth-UI/src/main/java/gearth/ui/extensions/executer/ExecutionInfo.java similarity index 97% rename from src/main/ui/extensions/executer/ExecutionInfo.java rename to G-Earth-UI/src/main/java/gearth/ui/extensions/executer/ExecutionInfo.java index e3b28da..9d0f241 100644 --- a/src/main/ui/extensions/executer/ExecutionInfo.java +++ b/G-Earth-UI/src/main/java/gearth/ui/extensions/executer/ExecutionInfo.java @@ -1,4 +1,4 @@ -package main.ui.extensions.executer; +package gearth.ui.extensions.executer; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/ui/extensions/executer/ExtensionRunner.java b/G-Earth-UI/src/main/java/gearth/ui/extensions/executer/ExtensionRunner.java similarity index 61% rename from src/main/ui/extensions/executer/ExtensionRunner.java rename to G-Earth-UI/src/main/java/gearth/ui/extensions/executer/ExtensionRunner.java index 9489895..229cad4 100644 --- a/src/main/ui/extensions/executer/ExtensionRunner.java +++ b/G-Earth-UI/src/main/java/gearth/ui/extensions/executer/ExtensionRunner.java @@ -1,10 +1,4 @@ -package main.ui.extensions.executer; - -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +package gearth.ui.extensions.executer; /** * Created by Jonas on 21/09/18. diff --git a/src/main/ui/extensions/executer/ExtensionRunnerFactory.java b/G-Earth-UI/src/main/java/gearth/ui/extensions/executer/ExtensionRunnerFactory.java similarity index 88% rename from src/main/ui/extensions/executer/ExtensionRunnerFactory.java rename to G-Earth-UI/src/main/java/gearth/ui/extensions/executer/ExtensionRunnerFactory.java index ae18e63..5d4a5d8 100644 --- a/src/main/ui/extensions/executer/ExtensionRunnerFactory.java +++ b/G-Earth-UI/src/main/java/gearth/ui/extensions/executer/ExtensionRunnerFactory.java @@ -1,4 +1,4 @@ -package main.ui.extensions.executer; +package gearth.ui.extensions.executer; /** * Created by Jonas on 22/09/18. diff --git a/src/main/ui/extensions/executer/NormalExtensionRunner.java b/G-Earth-UI/src/main/java/gearth/ui/extensions/executer/NormalExtensionRunner.java similarity index 98% rename from src/main/ui/extensions/executer/NormalExtensionRunner.java rename to G-Earth-UI/src/main/java/gearth/ui/extensions/executer/NormalExtensionRunner.java index dbec268..4a5e91f 100644 --- a/src/main/ui/extensions/executer/NormalExtensionRunner.java +++ b/G-Earth-UI/src/main/java/gearth/ui/extensions/executer/NormalExtensionRunner.java @@ -1,6 +1,6 @@ -package main.ui.extensions.executer; +package gearth.ui.extensions.executer; -import main.Main; +import gearth.Main; import java.io.File; import java.io.IOException; diff --git a/src/main/ui/info/Info.fxml b/G-Earth-UI/src/main/java/gearth/ui/info/Info.fxml similarity index 96% rename from src/main/ui/info/Info.fxml rename to G-Earth-UI/src/main/java/gearth/ui/info/Info.fxml index 6de175c..9d38147 100644 --- a/src/main/ui/info/Info.fxml +++ b/G-Earth-UI/src/main/java/gearth/ui/info/Info.fxml @@ -6,7 +6,7 @@ - + diff --git a/src/main/ui/info/Info.java b/G-Earth-UI/src/main/java/gearth/ui/info/Info.java similarity index 94% rename from src/main/ui/info/Info.java rename to G-Earth-UI/src/main/java/gearth/ui/info/Info.java index 61601af..c3f491f 100644 --- a/src/main/ui/info/Info.java +++ b/G-Earth-UI/src/main/java/gearth/ui/info/Info.java @@ -1,7 +1,7 @@ -package main.ui.info; +package gearth.ui.info; import javafx.scene.control.TextArea; -import main.ui.SubForm; +import gearth.ui.SubForm; /** * Created by Jonas on 06/04/18. diff --git a/src/main/ui/injection/Injection.fxml b/G-Earth-UI/src/main/java/gearth/ui/injection/Injection.fxml similarity index 98% rename from src/main/ui/injection/Injection.fxml rename to G-Earth-UI/src/main/java/gearth/ui/injection/Injection.fxml index 7828fd1..42bfd50 100644 --- a/src/main/ui/injection/Injection.fxml +++ b/G-Earth-UI/src/main/java/gearth/ui/injection/Injection.fxml @@ -9,7 +9,7 @@ - + diff --git a/src/main/ui/injection/Injection.java b/G-Earth-UI/src/main/java/gearth/ui/injection/Injection.java similarity index 94% rename from src/main/ui/injection/Injection.java rename to G-Earth-UI/src/main/java/gearth/ui/injection/Injection.java index a15d79a..9dea343 100644 --- a/src/main/ui/injection/Injection.java +++ b/G-Earth-UI/src/main/java/gearth/ui/injection/Injection.java @@ -1,4 +1,4 @@ -package main.ui.injection; +package gearth.ui.injection; import javafx.application.Platform; import javafx.event.ActionEvent; @@ -7,9 +7,9 @@ import javafx.scene.control.TextArea; import javafx.scene.paint.Color; import javafx.scene.paint.Paint; import javafx.scene.text.Text; -import main.protocol.HConnection; -import main.protocol.HPacket; -import main.ui.SubForm; +import gearth.protocol.HConnection; +import gearth.protocol.HPacket; +import gearth.ui.SubForm; public class Injection extends SubForm { public TextArea inputPacket; diff --git a/src/main/ui/logger/Logger.fxml b/G-Earth-UI/src/main/java/gearth/ui/logger/Logger.fxml similarity index 99% rename from src/main/ui/logger/Logger.fxml rename to G-Earth-UI/src/main/java/gearth/ui/logger/Logger.fxml index 01fdd4b..d903d11 100644 --- a/src/main/ui/logger/Logger.fxml +++ b/G-Earth-UI/src/main/java/gearth/ui/logger/Logger.fxml @@ -12,7 +12,7 @@ - + diff --git a/src/main/ui/logger/Logger.java b/G-Earth-UI/src/main/java/gearth/ui/logger/Logger.java similarity index 94% rename from src/main/ui/logger/Logger.java rename to G-Earth-UI/src/main/java/gearth/ui/logger/Logger.java index 6b16880..30f4909 100644 --- a/src/main/ui/logger/Logger.java +++ b/G-Earth-UI/src/main/java/gearth/ui/logger/Logger.java @@ -1,4 +1,4 @@ -package main.ui.logger; +package gearth.ui.logger; import javafx.application.Platform; import javafx.event.ActionEvent; @@ -9,15 +9,13 @@ import javafx.scene.input.KeyCode; import javafx.scene.paint.Color; import javafx.scene.text.Text; import javafx.scene.text.TextFlow; -import main.protocol.HConnection; -import main.protocol.HMessage; -import main.ui.SubForm; -import main.ui.logger.loggerdisplays.PacketLogger; -import main.ui.logger.loggerdisplays.PacketLoggerFactory; +import gearth.protocol.HConnection; +import gearth.protocol.HMessage; +import gearth.ui.SubForm; +import gearth.ui.logger.loggerdisplays.PacketLogger; +import gearth.ui.logger.loggerdisplays.PacketLoggerFactory; import java.util.Calendar; -import java.util.HashMap; -import java.util.Map; public class Logger extends SubForm { diff --git a/src/main/ui/logger/loggerdisplays/LinuxTerminalLogger.java b/G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/LinuxTerminalLogger.java similarity index 97% rename from src/main/ui/logger/loggerdisplays/LinuxTerminalLogger.java rename to G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/LinuxTerminalLogger.java index 1279cd3..a39b950 100644 --- a/src/main/ui/logger/loggerdisplays/LinuxTerminalLogger.java +++ b/G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/LinuxTerminalLogger.java @@ -1,6 +1,6 @@ -package main.ui.logger.loggerdisplays; +package gearth.ui.logger.loggerdisplays; -import main.protocol.HPacket; +import gearth.protocol.HPacket; import java.util.HashMap; import java.util.Map; diff --git a/src/main/ui/logger/loggerdisplays/PacketLogger.java b/G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/PacketLogger.java similarity index 86% rename from src/main/ui/logger/loggerdisplays/PacketLogger.java rename to G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/PacketLogger.java index 7f2c50e..31dfc58 100644 --- a/src/main/ui/logger/loggerdisplays/PacketLogger.java +++ b/G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/PacketLogger.java @@ -1,7 +1,6 @@ -package main.ui.logger.loggerdisplays; +package gearth.ui.logger.loggerdisplays; -import main.protocol.HMessage; -import main.protocol.HPacket; +import gearth.protocol.HPacket; /** * Created by Jonas on 04/04/18. diff --git a/src/main/ui/logger/loggerdisplays/PacketLoggerFactory.java b/G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/PacketLoggerFactory.java similarity index 86% rename from src/main/ui/logger/loggerdisplays/PacketLoggerFactory.java rename to G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/PacketLoggerFactory.java index 6479d0c..0c810eb 100644 --- a/src/main/ui/logger/loggerdisplays/PacketLoggerFactory.java +++ b/G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/PacketLoggerFactory.java @@ -1,6 +1,6 @@ -package main.ui.logger.loggerdisplays; +package gearth.ui.logger.loggerdisplays; -import main.misc.OSValidator; +import gearth.misc.OSValidator; /** * Created by Jonas on 04/04/18. diff --git a/src/main/ui/logger/loggerdisplays/SimpleTerminalLogger.java b/G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/SimpleTerminalLogger.java similarity index 95% rename from src/main/ui/logger/loggerdisplays/SimpleTerminalLogger.java rename to G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/SimpleTerminalLogger.java index 2758071..70e5ccd 100644 --- a/src/main/ui/logger/loggerdisplays/SimpleTerminalLogger.java +++ b/G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/SimpleTerminalLogger.java @@ -1,6 +1,6 @@ -package main.ui.logger.loggerdisplays; +package gearth.ui.logger.loggerdisplays; -import main.protocol.HPacket; +import gearth.protocol.HPacket; /** * Created by Jonas on 04/04/18. diff --git a/src/main/ui/scheduler/Interval.java b/G-Earth-UI/src/main/java/gearth/ui/scheduler/Interval.java similarity index 97% rename from src/main/ui/scheduler/Interval.java rename to G-Earth-UI/src/main/java/gearth/ui/scheduler/Interval.java index 86ca020..436065f 100644 --- a/src/main/ui/scheduler/Interval.java +++ b/G-Earth-UI/src/main/java/gearth/ui/scheduler/Interval.java @@ -1,4 +1,4 @@ -package main.ui.scheduler; +package gearth.ui.scheduler; /** * Created by Jonas on 11/04/18. diff --git a/src/main/ui/scheduler/ScheduleItem.java b/G-Earth-UI/src/main/java/gearth/ui/scheduler/ScheduleItem.java similarity index 97% rename from src/main/ui/scheduler/ScheduleItem.java rename to G-Earth-UI/src/main/java/gearth/ui/scheduler/ScheduleItem.java index cbb87d0..4fd1321 100644 --- a/src/main/ui/scheduler/ScheduleItem.java +++ b/G-Earth-UI/src/main/java/gearth/ui/scheduler/ScheduleItem.java @@ -1,12 +1,12 @@ -package main.ui.scheduler; +package gearth.ui.scheduler; import javafx.beans.InvalidationListener; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleIntegerProperty; import javafx.beans.property.SimpleObjectProperty; -import main.misc.StringifyAble; -import main.protocol.HMessage; -import main.protocol.HPacket; +import gearth.misc.StringifyAble; +import gearth.protocol.HMessage; +import gearth.protocol.HPacket; import java.util.ArrayList; import java.util.List; diff --git a/src/main/ui/scheduler/ScheduleItemContainer.java b/G-Earth-UI/src/main/java/gearth/ui/scheduler/ScheduleItemContainer.java similarity index 96% rename from src/main/ui/scheduler/ScheduleItemContainer.java rename to G-Earth-UI/src/main/java/gearth/ui/scheduler/ScheduleItemContainer.java index 8409a52..9e8b5fa 100644 --- a/src/main/ui/scheduler/ScheduleItemContainer.java +++ b/G-Earth-UI/src/main/java/gearth/ui/scheduler/ScheduleItemContainer.java @@ -1,4 +1,4 @@ -package main.ui.scheduler; +package gearth.ui.scheduler; import javafx.geometry.Insets; import javafx.geometry.Pos; @@ -7,9 +7,9 @@ import javafx.scene.control.ScrollPane; import javafx.scene.input.MouseEvent; import javafx.scene.layout.*; import javafx.scene.text.Font; -import main.ui.buttons.DeleteButton; -import main.ui.buttons.EditButton; -import main.ui.buttons.PauseResumeButton; +import gearth.ui.buttons.DeleteButton; +import gearth.ui.buttons.EditButton; +import gearth.ui.buttons.PauseResumeButton; /** * Created by Jonas on 07/04/18. diff --git a/src/main/ui/scheduler/Scheduler.fxml b/G-Earth-UI/src/main/java/gearth/ui/scheduler/Scheduler.fxml similarity index 99% rename from src/main/ui/scheduler/Scheduler.fxml rename to G-Earth-UI/src/main/java/gearth/ui/scheduler/Scheduler.fxml index 3042cdc..447e01c 100644 --- a/src/main/ui/scheduler/Scheduler.fxml +++ b/G-Earth-UI/src/main/java/gearth/ui/scheduler/Scheduler.fxml @@ -12,7 +12,7 @@ - + diff --git a/src/main/ui/scheduler/Scheduler.java b/G-Earth-UI/src/main/java/gearth/ui/scheduler/Scheduler.java similarity index 97% rename from src/main/ui/scheduler/Scheduler.java rename to G-Earth-UI/src/main/java/gearth/ui/scheduler/Scheduler.java index 092ecbe..964542e 100644 --- a/src/main/ui/scheduler/Scheduler.java +++ b/G-Earth-UI/src/main/java/gearth/ui/scheduler/Scheduler.java @@ -1,16 +1,14 @@ -package main.ui.scheduler; +package gearth.ui.scheduler; import javafx.application.Platform; -import javafx.beans.InvalidationListener; -import javafx.beans.Observable; import javafx.event.ActionEvent; import javafx.scene.control.*; import javafx.scene.layout.GridPane; import javafx.scene.layout.VBox; import javafx.stage.FileChooser; -import main.protocol.HMessage; -import main.protocol.HPacket; -import main.ui.SubForm; +import gearth.protocol.HMessage; +import gearth.protocol.HPacket; +import gearth.ui.SubForm; import java.io.*; import java.util.ArrayList; diff --git a/src/main/ui/settings/Settings.fxml b/G-Earth-UI/src/main/java/gearth/ui/settings/Settings.fxml similarity index 94% rename from src/main/ui/settings/Settings.fxml rename to G-Earth-UI/src/main/java/gearth/ui/settings/Settings.fxml index 848b826..f55c5a5 100644 --- a/src/main/ui/settings/Settings.fxml +++ b/G-Earth-UI/src/main/java/gearth/ui/settings/Settings.fxml @@ -3,7 +3,7 @@ - + diff --git a/src/main/ui/settings/Settings.java b/G-Earth-UI/src/main/java/gearth/ui/settings/Settings.java similarity index 61% rename from src/main/ui/settings/Settings.java rename to G-Earth-UI/src/main/java/gearth/ui/settings/Settings.java index e4e5a65..2ae0c2a 100644 --- a/src/main/ui/settings/Settings.java +++ b/G-Earth-UI/src/main/java/gearth/ui/settings/Settings.java @@ -1,6 +1,6 @@ -package main.ui.settings; +package gearth.ui.settings; -import main.ui.SubForm; +import gearth.ui.SubForm; /** * Created by Jonas on 06/04/18. diff --git a/src/main/ui/tools/Tools.fxml b/G-Earth-UI/src/main/java/gearth/ui/tools/Tools.fxml similarity index 99% rename from src/main/ui/tools/Tools.fxml rename to G-Earth-UI/src/main/java/gearth/ui/tools/Tools.fxml index ebde1ff..98848fa 100644 --- a/src/main/ui/tools/Tools.fxml +++ b/G-Earth-UI/src/main/java/gearth/ui/tools/Tools.fxml @@ -10,7 +10,7 @@ - + diff --git a/src/main/ui/tools/Tools.java b/G-Earth-UI/src/main/java/gearth/ui/tools/Tools.java similarity index 96% rename from src/main/ui/tools/Tools.java rename to G-Earth-UI/src/main/java/gearth/ui/tools/Tools.java index e52dbba..d08543e 100644 --- a/src/main/ui/tools/Tools.java +++ b/G-Earth-UI/src/main/java/gearth/ui/tools/Tools.java @@ -1,17 +1,14 @@ -package main.ui.tools; +package gearth.ui.tools; import javafx.event.ActionEvent; -import javafx.event.EventHandler; import javafx.scene.control.Button; import javafx.scene.control.TextArea; import javafx.scene.control.TextField; import javafx.scene.input.KeyCode; -import javafx.scene.input.KeyEvent; -import main.protocol.HPacket; -import main.ui.SubForm; +import gearth.protocol.HPacket; +import gearth.ui.SubForm; import java.nio.ByteBuffer; -import java.nio.ByteOrder; public class Tools extends SubForm { diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..ff1cce7 --- /dev/null +++ b/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + G-Earth + G-Earth-Parent + pom + 0.0.1-beta + + + 1.8 + 1.8 + + + G-Earth + https://github.com/sirjonasxx/G-Earth + + + + G-Earth-UI + + + Extensions/AdminOnConnect + Extensions/BlockReplacePackets + Extensions/SpeechColorizer + + \ No newline at end of file diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF deleted file mode 100644 index 6948c82..0000000 --- a/src/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: main.Main - From 9749d8d3c8d4dc00e045e01e10bd110f5427feba Mon Sep 17 00:00:00 2001 From: Scott Stamp Date: Sat, 13 Oct 2018 19:48:01 -0230 Subject: [PATCH 5/8] Fixed some Maven stuff G-Earth build output is placed in /bin now --- Extensions/BlockReplacePackets/pom.xml | 25 ++++++++++ Extensions/SpeechColorizer/pom.xml | 23 +++++++++ G-Earth-UI/pom.xml | 68 +++++++++++++------------- 3 files changed, 83 insertions(+), 33 deletions(-) diff --git a/Extensions/BlockReplacePackets/pom.xml b/Extensions/BlockReplacePackets/pom.xml index f44fd20..1eb4c34 100644 --- a/Extensions/BlockReplacePackets/pom.xml +++ b/Extensions/BlockReplacePackets/pom.xml @@ -96,6 +96,31 @@ ${artifactId} + + + maven-assembly-plugin + + + package + + single + + + + + ${project.parent.basedir}/bin + + + extensions.blockreplacepackets.BlockAndReplacePackets + + + + jar-with-dependencies + + BlockAndReplacePackets + false + + diff --git a/Extensions/SpeechColorizer/pom.xml b/Extensions/SpeechColorizer/pom.xml index a6a40e5..54ae551 100644 --- a/Extensions/SpeechColorizer/pom.xml +++ b/Extensions/SpeechColorizer/pom.xml @@ -96,6 +96,29 @@ ${artifactId} + + + maven-assembly-plugin + + + package + + single + + + + + ${project.parent.basedir}/target/bin + + + extensions.speechcolorizer.SpeechColorizer + + + + jar-with-dependencies + + + diff --git a/G-Earth-UI/pom.xml b/G-Earth-UI/pom.xml index 65d1503..2643b90 100644 --- a/G-Earth-UI/pom.xml +++ b/G-Earth-UI/pom.xml @@ -42,20 +42,20 @@ - - - - - - - - - - - - - - + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory}/bin/lib + + + + maven-resources-plugin @@ -80,24 +80,23 @@ - - - - - - - - - - - - - - - - - - + + org.apache.maven.plugins + maven-jar-plugin + 2.5 + + ${project.build.directory}/bin + + + true + true + lib/ + gearth.Main + false + + + + maven-assembly-plugin @@ -110,14 +109,17 @@ + ${project.parent.basedir}/bin - main.Main + gearth.Main jar-with-dependencies + G-Earth-${project.version} + false From bf63a8bc9c848f77187506453031e8cc0b19ef25 Mon Sep 17 00:00:00 2001 From: Scott Stamp Date: Sat, 13 Oct 2018 19:48:39 -0230 Subject: [PATCH 6/8] Removed usage of File.separator() Don't use this for fetching files inside the JAR, it can cause issues on Windows --- G-Earth-UI/src/main/java/gearth/ui/buttons/BoxButton.java | 4 ++-- .../main/java/gearth/ui/buttons/PauseResumeButton.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/BoxButton.java b/G-Earth-UI/src/main/java/gearth/ui/buttons/BoxButton.java index 17025c9..0afd90c 100644 --- a/G-Earth-UI/src/main/java/gearth/ui/buttons/BoxButton.java +++ b/G-Earth-UI/src/main/java/gearth/ui/buttons/BoxButton.java @@ -18,8 +18,8 @@ public class BoxButton extends StackPane { //paths zijn relatief aan deze classpath public BoxButton(String imageName, String imageOnHoverName) { - this.image = new Image(getClass().getResourceAsStream("files" + File.separator + imageName)); - this.imageOnHover = new Image(getClass().getResourceAsStream("files" + File.separator + imageOnHoverName)); + this.image = new Image(getClass().getResourceAsStream("files/" + imageName)); + this.imageOnHover = new Image(getClass().getResourceAsStream("files/" + imageOnHoverName)); this.imageView = new ImageView(); setCursor(Cursor.DEFAULT); diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/PauseResumeButton.java b/G-Earth-UI/src/main/java/gearth/ui/buttons/PauseResumeButton.java index 2e4b2cf..9f50777 100644 --- a/G-Earth-UI/src/main/java/gearth/ui/buttons/PauseResumeButton.java +++ b/G-Earth-UI/src/main/java/gearth/ui/buttons/PauseResumeButton.java @@ -32,10 +32,10 @@ public class PauseResumeButton extends StackPane{ public PauseResumeButton(boolean isPaused) { this.isPaused[0] = isPaused; - this.imagePause = new Image(getClass().getResourceAsStream("files"+ File.separator+"ButtonPause.png")); - this.imagePauseOnHover = new Image(getClass().getResourceAsStream("files"+ File.separator+"ButtonPauseHover.png")); - this.imageResume = new Image(getClass().getResourceAsStream("files"+ File.separator+"ButtonResume.png")); - this.imageResumeOnHover = new Image(getClass().getResourceAsStream("files"+ File.separator+"ButtonResumeHover.png")); + this.imagePause = new Image(getClass().getResourceAsStream("files/ButtonPause.png")); + this.imagePauseOnHover = new Image(getClass().getResourceAsStream("files/ButtonPauseHover.png")); + this.imageResume = new Image(getClass().getResourceAsStream("files/ButtonResume.png")); + this.imageResumeOnHover = new Image(getClass().getResourceAsStream("files/ButtonResumeHover.png")); this.imageView = new ImageView(); setCursor(Cursor.DEFAULT); From 2cc0c6980596f55ae2c721e052b41dc4d138ee70 Mon Sep 17 00:00:00 2001 From: Scott Stamp Date: Sat, 13 Oct 2018 19:49:02 -0230 Subject: [PATCH 7/8] Fixed some stuff in BlockAndReplace extension Forgot I renamed the package, oops! --- .../blockreplacepackets/BlockAndReplacePackets.java | 4 ++-- .../java/extensions/blockreplacepackets/blockreplace.fxml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Extensions/BlockReplacePackets/src/main/java/extensions/blockreplacepackets/BlockAndReplacePackets.java b/Extensions/BlockReplacePackets/src/main/java/extensions/blockreplacepackets/BlockAndReplacePackets.java index dbb49ba..fb0361e 100644 --- a/Extensions/BlockReplacePackets/src/main/java/extensions/blockreplacepackets/BlockAndReplacePackets.java +++ b/Extensions/BlockReplacePackets/src/main/java/extensions/blockreplacepackets/BlockAndReplacePackets.java @@ -1,5 +1,6 @@ package extensions.blockreplacepackets; +import gearth.ui.GEarthController; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.scene.Scene; @@ -9,7 +10,6 @@ import javafx.scene.control.TextField; import javafx.stage.Stage; import gearth.extensions.ExtensionForm; import gearth.extensions.ExtensionInfo; -import gearth.ui.GEarthController; /** * Created by Jonas on 22/09/18. @@ -52,6 +52,6 @@ public class BlockAndReplacePackets extends ExtensionForm { primaryStage.setTitle("Packet blocker &/ replacer"); primaryStage.setScene(new Scene(root, 580, 262)); - primaryStage.getScene().getStylesheets().add(GEarthController.class.getResource("/gearth/ui/bootstrap3.css").toExternalForm()); + primaryStage.getScene().getStylesheets().add(GEarthController.class.getResource("bootstrap3.css").toExternalForm()); } } diff --git a/Extensions/BlockReplacePackets/src/main/java/extensions/blockreplacepackets/blockreplace.fxml b/Extensions/BlockReplacePackets/src/main/java/extensions/blockreplacepackets/blockreplace.fxml index e490eea..893f2a8 100644 --- a/Extensions/BlockReplacePackets/src/main/java/extensions/blockreplacepackets/blockreplace.fxml +++ b/Extensions/BlockReplacePackets/src/main/java/extensions/blockreplacepackets/blockreplace.fxml @@ -12,7 +12,7 @@ - + From 8844d596d12d675cc2a0119fd497f4d20e0cc770 Mon Sep 17 00:00:00 2001 From: Scott Stamp Date: Sat, 13 Oct 2018 19:49:20 -0230 Subject: [PATCH 8/8] Add /bin to .gitignore Ignore /bin, Maven will output G-Earth.jar here. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index dda4011..030d93a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ .idea/ out/ +bin/ +**/target/ /G-WinMem/.vs /G-WinMem/x64 /G-WinMem/G-WinMem/x64