From f14cb7384a78c9625c7093fad762c338e543887e Mon Sep 17 00:00:00 2001 From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com> Date: Sat, 13 Oct 2018 17:55:30 +0200 Subject: [PATCH] rename main to g_earth --- src/META-INF/MANIFEST.MF | 2 +- src/{main => g_earth}/Main.java | 8 ++---- .../extensions/Extension.java | 8 +++--- .../extensions/ExtensionForm.java | 6 ++--- .../extensions/ExtensionInfo.java | 2 +- .../adminonconnect/AdminOnConnect.java | 10 ++++---- .../BlockAndReplacePackets.java | 10 +++----- .../blockreplacepackets/blockreplace.fxml | 2 +- .../speechcolorizer/SpeechColorizer.java | 10 ++++---- .../extensions/extra/Inspector.java | 2 +- src/{main => g_earth}/misc/Cacher.java | 7 ++---- .../misc/ConfirmationDialog.java | 2 +- src/{main => g_earth}/misc/OSValidator.java | 2 +- src/{main => g_earth}/misc/StringifyAble.java | 2 +- .../protocol/HConnection.java | 16 ++++++------ src/{main => g_earth}/protocol/HMessage.java | 4 +-- src/{main => g_earth}/protocol/HPacket.java | 6 ++--- .../protocol/StateChangeListener.java | 2 +- .../protocol/TrafficListener.java | 2 +- .../protocol/crypto/RC4.java | 6 +---- .../protocol/hostreplacer/HostReplacer.java | 2 +- .../hostreplacer/HostReplacerFactory.java | 4 +-- .../hostreplacer/UnixHostReplacer.java | 2 +- .../hostreplacer/WindowsHostReplacer.java | 2 +- .../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 | 10 +++----- .../packethandler/BufferListener.java | 2 +- .../protocol/packethandler/Handler.java | 10 ++++---- .../packethandler/IncomingHandler.java | 8 +++--- .../packethandler/OutgoingHandler.java | 7 +++--- .../protocol/packethandler/PayloadBuffer.java | 4 +-- src/{main => g_earth}/ui/G-Earth.fxml | 2 +- .../ui/GEarthController.java | 20 +++++++-------- src/{main => g_earth}/ui/SubForm.java | 8 ++---- src/{main => g_earth}/ui/bootstrap3.css | 0 .../ui/buttons/BoxButton.java | 2 +- .../ui/buttons/DeleteButton.java | 6 +---- .../ui/buttons/EditButton.java | 2 +- .../ui/buttons/ExitButton.java | 2 +- .../ui/buttons/FireButton.java | 2 +- .../ui/buttons/PauseResumeButton.java | 2 +- .../ui/buttons/ReloadButton.java | 2 +- .../ui/buttons/SimpleClickButton.java | 2 +- .../ui/buttons/files/ButtonDelete.png | Bin .../ui/buttons/files/ButtonDeleteHover.png | Bin .../ui/buttons/files/ButtonEdit.png | Bin .../ui/buttons/files/ButtonEditHover.png | Bin .../ui/buttons/files/ButtonExit.png | Bin .../ui/buttons/files/ButtonExitHover.png | Bin .../ui/buttons/files/ButtonFire.png | Bin .../ui/buttons/files/ButtonFireHover.png | Bin .../ui/buttons/files/ButtonPause.png | Bin .../ui/buttons/files/ButtonPauseHover.png | Bin .../ui/buttons/files/ButtonReload.png | Bin .../ui/buttons/files/ButtonReloadHover.png | Bin .../ui/buttons/files/ButtonResume.png | Bin .../ui/buttons/files/ButtonResumeHover.png | Bin .../ui/connection/Connection.fxml | 2 +- .../ui/connection/Connection.java | 13 +++------- .../ui/extensions/ExtensionItemContainer.java | 18 ++++++-------- .../ExtensionItemContainerProducer.java | 2 +- .../ui/extensions/Extensions.fxml | 2 +- .../ui/extensions/Extensions.java | 22 ++++++----------- .../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 => g_earth}/ui/info/Info.fxml | 2 +- src/{main => g_earth}/ui/info/Info.java | 4 +-- .../ui/injection/Injection.fxml | 2 +- .../ui/injection/Injection.java | 8 +++--- src/{main => g_earth}/ui/logger/Logger.fxml | 2 +- src/{main => g_earth}/ui/logger/Logger.java | 14 +++++------ .../loggerdisplays/LinuxTerminalLogger.java | 4 +-- .../logger/loggerdisplays/PacketLogger.java | 5 ++-- .../loggerdisplays/PacketLoggerFactory.java | 4 +-- .../loggerdisplays/SimpleTerminalLogger.java | 4 +-- .../ui/scheduler/Interval.java | 2 +- .../ui/scheduler/ScheduleItem.java | 8 +++--- .../ui/scheduler/ScheduleItemContainer.java | 8 +++--- .../ui/scheduler/Scheduler.fxml | 2 +- .../ui/scheduler/Scheduler.java | 10 +++----- .../ui/settings/Settings.fxml | 2 +- .../ui/settings/Settings.java | 4 +-- src/{main => g_earth}/ui/tools/Tools.fxml | 2 +- src/{main => g_earth}/ui/tools/Tools.java | 9 +++---- 92 files changed, 186 insertions(+), 246 deletions(-) rename src/{main => g_earth}/Main.java (90%) rename src/{main => g_earth}/extensions/Extension.java (98%) rename src/{main => g_earth}/extensions/ExtensionForm.java (97%) rename src/{main => g_earth}/extensions/ExtensionInfo.java (91%) rename src/{main => g_earth}/extensions/examples/adminonconnect/AdminOnConnect.java (84%) rename src/{main => g_earth}/extensions/examples/blockreplacepackets/BlockAndReplacePackets.java (88%) rename src/{main => g_earth}/extensions/examples/blockreplacepackets/blockreplace.fxml (97%) rename src/{main => g_earth}/extensions/examples/speechcolorizer/SpeechColorizer.java (88%) rename src/{main => g_earth}/extensions/extra/Inspector.java (66%) rename src/{main => g_earth}/misc/Cacher.java (94%) rename src/{main => g_earth}/misc/ConfirmationDialog.java (98%) rename src/{main => g_earth}/misc/OSValidator.java (98%) rename src/{main => g_earth}/misc/StringifyAble.java (95%) rename src/{main => g_earth}/protocol/HConnection.java (97%) rename src/{main => g_earth}/protocol/HMessage.java (97%) rename src/{main => g_earth}/protocol/HPacket.java (99%) rename src/{main => g_earth}/protocol/StateChangeListener.java (82%) rename src/{main => g_earth}/protocol/TrafficListener.java (75%) rename src/{main => g_earth}/protocol/crypto/RC4.java (98%) rename src/{main => g_earth}/protocol/hostreplacer/HostReplacer.java (75%) rename src/{main => g_earth}/protocol/hostreplacer/HostReplacerFactory.java (81%) rename src/{main => g_earth}/protocol/hostreplacer/UnixHostReplacer.java (98%) rename src/{main => g_earth}/protocol/hostreplacer/WindowsHostReplacer.java (85%) rename src/{main => g_earth}/protocol/memory/Rc4Obtainer.java (86%) rename src/{main => g_earth}/protocol/memory/habboclient/HabboClient.java (81%) rename src/{main => g_earth}/protocol/memory/habboclient/HabboClientFactory.java (56%) rename src/{main => g_earth}/protocol/memory/habboclient/linux/LinuxHabboClient.java (98%) rename src/{main => g_earth}/protocol/memory/habboclient/linux/LinuxMemorySnippet.java (85%) rename src/{main => g_earth}/protocol/memory/habboclient/windows/WindowsHabboClient.java (97%) rename src/{main => g_earth}/protocol/packethandler/BufferListener.java (63%) rename src/{main => g_earth}/protocol/packethandler/Handler.java (96%) rename src/{main => g_earth}/protocol/packethandler/IncomingHandler.java (90%) rename src/{main => g_earth}/protocol/packethandler/OutgoingHandler.java (90%) rename src/{main => g_earth}/protocol/packethandler/PayloadBuffer.java (95%) rename src/{main => g_earth}/ui/G-Earth.fxml (97%) rename src/{main => g_earth}/ui/GEarthController.java (88%) rename src/{main => g_earth}/ui/SubForm.java (79%) rename src/{main => g_earth}/ui/bootstrap3.css (100%) rename src/{main => g_earth}/ui/buttons/BoxButton.java (98%) rename src/{main => g_earth}/ui/buttons/DeleteButton.java (63%) rename src/{main => g_earth}/ui/buttons/EditButton.java (82%) rename src/{main => g_earth}/ui/buttons/ExitButton.java (86%) rename src/{main => g_earth}/ui/buttons/FireButton.java (86%) rename src/{main => g_earth}/ui/buttons/PauseResumeButton.java (99%) rename src/{main => g_earth}/ui/buttons/ReloadButton.java (86%) rename src/{main => g_earth}/ui/buttons/SimpleClickButton.java (87%) rename src/{main => g_earth}/ui/buttons/files/ButtonDelete.png (100%) rename src/{main => g_earth}/ui/buttons/files/ButtonDeleteHover.png (100%) rename src/{main => g_earth}/ui/buttons/files/ButtonEdit.png (100%) rename src/{main => g_earth}/ui/buttons/files/ButtonEditHover.png (100%) rename src/{main => g_earth}/ui/buttons/files/ButtonExit.png (100%) rename src/{main => g_earth}/ui/buttons/files/ButtonExitHover.png (100%) rename src/{main => g_earth}/ui/buttons/files/ButtonFire.png (100%) rename src/{main => g_earth}/ui/buttons/files/ButtonFireHover.png (100%) rename src/{main => g_earth}/ui/buttons/files/ButtonPause.png (100%) rename src/{main => g_earth}/ui/buttons/files/ButtonPauseHover.png (100%) rename src/{main => g_earth}/ui/buttons/files/ButtonReload.png (100%) rename src/{main => g_earth}/ui/buttons/files/ButtonReloadHover.png (100%) rename src/{main => g_earth}/ui/buttons/files/ButtonResume.png (100%) rename src/{main => g_earth}/ui/buttons/files/ButtonResumeHover.png (100%) rename src/{main => g_earth}/ui/connection/Connection.fxml (99%) rename src/{main => g_earth}/ui/connection/Connection.java (92%) rename src/{main => g_earth}/ui/extensions/ExtensionItemContainer.java (94%) rename src/{main => g_earth}/ui/extensions/ExtensionItemContainerProducer.java (97%) rename src/{main => g_earth}/ui/extensions/Extensions.fxml (99%) rename src/{main => g_earth}/ui/extensions/Extensions.java (97%) rename src/{main => g_earth}/ui/extensions/GEarthExtension.java (99%) rename src/{main => g_earth}/ui/extensions/GEarthExtensionsRegistrer.java (97%) rename src/{main => g_earth}/ui/extensions/executer/ExecutionInfo.java (96%) rename src/{main => g_earth}/ui/extensions/executer/ExtensionRunner.java (61%) rename src/{main => g_earth}/ui/extensions/executer/ExtensionRunnerFactory.java (88%) rename src/{main => g_earth}/ui/extensions/executer/NormalExtensionRunner.java (98%) rename src/{main => g_earth}/ui/info/Info.fxml (96%) rename src/{main => g_earth}/ui/info/Info.java (94%) rename src/{main => g_earth}/ui/injection/Injection.fxml (98%) rename src/{main => g_earth}/ui/injection/Injection.java (94%) rename src/{main => g_earth}/ui/logger/Logger.fxml (99%) rename src/{main => g_earth}/ui/logger/Logger.java (94%) rename src/{main => g_earth}/ui/logger/loggerdisplays/LinuxTerminalLogger.java (97%) rename src/{main => g_earth}/ui/logger/loggerdisplays/PacketLogger.java (86%) rename src/{main => g_earth}/ui/logger/loggerdisplays/PacketLoggerFactory.java (85%) rename src/{main => g_earth}/ui/logger/loggerdisplays/SimpleTerminalLogger.java (95%) rename src/{main => g_earth}/ui/scheduler/Interval.java (97%) rename src/{main => g_earth}/ui/scheduler/ScheduleItem.java (97%) rename src/{main => g_earth}/ui/scheduler/ScheduleItemContainer.java (96%) rename src/{main => g_earth}/ui/scheduler/Scheduler.fxml (99%) rename src/{main => g_earth}/ui/scheduler/Scheduler.java (97%) rename src/{main => g_earth}/ui/settings/Settings.fxml (94%) rename src/{main => g_earth}/ui/settings/Settings.java (60%) rename src/{main => g_earth}/ui/tools/Tools.fxml (99%) rename src/{main => g_earth}/ui/tools/Tools.java (96%) diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF index 6948c82..422fcc4 100644 --- a/src/META-INF/MANIFEST.MF +++ b/src/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ Manifest-Version: 1.0 -Main-Class: main.Main +Main-Class: g_earth.Main diff --git a/src/main/Main.java b/src/g_earth/Main.java similarity index 90% rename from src/main/Main.java rename to src/g_earth/Main.java index aff2565..484c434 100644 --- a/src/main/Main.java +++ b/src/g_earth/Main.java @@ -1,16 +1,12 @@ -package main; +package g_earth; 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 g_earth.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/src/g_earth/extensions/Extension.java similarity index 98% rename from src/main/extensions/Extension.java rename to src/g_earth/extensions/Extension.java index 525582c..f7a893d 100644 --- a/src/main/extensions/Extension.java +++ b/src/g_earth/extensions/Extension.java @@ -1,8 +1,8 @@ -package main.extensions; +package g_earth.extensions; -import main.protocol.HMessage; -import main.protocol.HPacket; -import main.ui.extensions.Extensions; +import g_earth.protocol.HMessage; +import g_earth.protocol.HPacket; +import g_earth.ui.extensions.Extensions; import java.io.*; import java.net.Socket; diff --git a/src/main/extensions/ExtensionForm.java b/src/g_earth/extensions/ExtensionForm.java similarity index 97% rename from src/main/extensions/ExtensionForm.java rename to src/g_earth/extensions/ExtensionForm.java index fe50b9a..6317f06 100644 --- a/src/main/extensions/ExtensionForm.java +++ b/src/g_earth/extensions/ExtensionForm.java @@ -1,10 +1,10 @@ -package main.extensions; +package g_earth.extensions; import javafx.application.Application; import javafx.application.Platform; import javafx.stage.Stage; -import main.protocol.HMessage; -import main.protocol.HPacket; +import g_earth.protocol.HMessage; +import g_earth.protocol.HPacket; /** * Created by Jonas on 22/09/18. diff --git a/src/main/extensions/ExtensionInfo.java b/src/g_earth/extensions/ExtensionInfo.java similarity index 91% rename from src/main/extensions/ExtensionInfo.java rename to src/g_earth/extensions/ExtensionInfo.java index a4f16d7..98425ab 100644 --- a/src/main/extensions/ExtensionInfo.java +++ b/src/g_earth/extensions/ExtensionInfo.java @@ -1,4 +1,4 @@ -package main.extensions; +package g_earth.extensions; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/extensions/examples/adminonconnect/AdminOnConnect.java b/src/g_earth/extensions/examples/adminonconnect/AdminOnConnect.java similarity index 84% rename from src/main/extensions/examples/adminonconnect/AdminOnConnect.java rename to src/g_earth/extensions/examples/adminonconnect/AdminOnConnect.java index 499f3e1..c45b141 100644 --- a/src/main/extensions/examples/adminonconnect/AdminOnConnect.java +++ b/src/g_earth/extensions/examples/adminonconnect/AdminOnConnect.java @@ -1,9 +1,9 @@ -package main.extensions.examples.adminonconnect; +package g_earth.extensions.examples.adminonconnect; -import main.extensions.Extension; -import main.extensions.ExtensionInfo; -import main.protocol.HMessage; -import main.protocol.HPacket; +import g_earth.extensions.Extension; +import g_earth.extensions.ExtensionInfo; +import g_earth.protocol.HMessage; +import g_earth.protocol.HPacket; /** * Created by Jonas on 26/06/18. diff --git a/src/main/extensions/examples/blockreplacepackets/BlockAndReplacePackets.java b/src/g_earth/extensions/examples/blockreplacepackets/BlockAndReplacePackets.java similarity index 88% rename from src/main/extensions/examples/blockreplacepackets/BlockAndReplacePackets.java rename to src/g_earth/extensions/examples/blockreplacepackets/BlockAndReplacePackets.java index 97114ef..f646c3e 100644 --- a/src/main/extensions/examples/blockreplacepackets/BlockAndReplacePackets.java +++ b/src/g_earth/extensions/examples/blockreplacepackets/BlockAndReplacePackets.java @@ -1,4 +1,4 @@ -package main.extensions.examples.blockreplacepackets; +package g_earth.extensions.examples.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 g_earth.extensions.ExtensionForm; +import g_earth.extensions.ExtensionInfo; +import g_earth.ui.GEarthController; /** * Created by Jonas on 22/09/18. diff --git a/src/main/extensions/examples/blockreplacepackets/blockreplace.fxml b/src/g_earth/extensions/examples/blockreplacepackets/blockreplace.fxml similarity index 97% rename from src/main/extensions/examples/blockreplacepackets/blockreplace.fxml rename to src/g_earth/extensions/examples/blockreplacepackets/blockreplace.fxml index 42748a1..70d73c2 100644 --- a/src/main/extensions/examples/blockreplacepackets/blockreplace.fxml +++ b/src/g_earth/extensions/examples/blockreplacepackets/blockreplace.fxml @@ -12,7 +12,7 @@ - + diff --git a/src/main/extensions/examples/speechcolorizer/SpeechColorizer.java b/src/g_earth/extensions/examples/speechcolorizer/SpeechColorizer.java similarity index 88% rename from src/main/extensions/examples/speechcolorizer/SpeechColorizer.java rename to src/g_earth/extensions/examples/speechcolorizer/SpeechColorizer.java index 919c76c..c1bef35 100644 --- a/src/main/extensions/examples/speechcolorizer/SpeechColorizer.java +++ b/src/g_earth/extensions/examples/speechcolorizer/SpeechColorizer.java @@ -1,9 +1,9 @@ -package main.extensions.examples.speechcolorizer; +package g_earth.extensions.examples.speechcolorizer; -import main.extensions.Extension; -import main.extensions.ExtensionInfo; -import main.protocol.HMessage; -import main.protocol.HPacket; +import g_earth.extensions.Extension; +import g_earth.extensions.ExtensionInfo; +import g_earth.protocol.HMessage; +import g_earth.protocol.HPacket; import java.util.Random; diff --git a/src/main/extensions/extra/Inspector.java b/src/g_earth/extensions/extra/Inspector.java similarity index 66% rename from src/main/extensions/extra/Inspector.java rename to src/g_earth/extensions/extra/Inspector.java index 6da0308..b8962ed 100644 --- a/src/main/extensions/extra/Inspector.java +++ b/src/g_earth/extensions/extra/Inspector.java @@ -1,4 +1,4 @@ -package main.extensions.extra; +package g_earth.extensions.extra; /** * Created by Jonas on 22/09/18. diff --git a/src/main/misc/Cacher.java b/src/g_earth/misc/Cacher.java similarity index 94% rename from src/main/misc/Cacher.java rename to src/g_earth/misc/Cacher.java index 4581f09..5c4d135 100644 --- a/src/main/misc/Cacher.java +++ b/src/g_earth/misc/Cacher.java @@ -1,6 +1,6 @@ -package main.misc; +package g_earth.misc; -import main.Main; +import g_earth.Main; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; @@ -9,9 +9,6 @@ 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. diff --git a/src/main/misc/ConfirmationDialog.java b/src/g_earth/misc/ConfirmationDialog.java similarity index 98% rename from src/main/misc/ConfirmationDialog.java rename to src/g_earth/misc/ConfirmationDialog.java index cc75890..aa1e915 100644 --- a/src/main/misc/ConfirmationDialog.java +++ b/src/g_earth/misc/ConfirmationDialog.java @@ -1,4 +1,4 @@ -package main.misc; +package g_earth.misc; import javafx.scene.Group; import javafx.scene.Node; diff --git a/src/main/misc/OSValidator.java b/src/g_earth/misc/OSValidator.java similarity index 98% rename from src/main/misc/OSValidator.java rename to src/g_earth/misc/OSValidator.java index 3fb1c7b..4857428 100644 --- a/src/main/misc/OSValidator.java +++ b/src/g_earth/misc/OSValidator.java @@ -1,4 +1,4 @@ -package main.misc; +package g_earth.misc; public class OSValidator { diff --git a/src/main/misc/StringifyAble.java b/src/g_earth/misc/StringifyAble.java similarity index 95% rename from src/main/misc/StringifyAble.java rename to src/g_earth/misc/StringifyAble.java index 61e9b9e..e3cf562 100644 --- a/src/main/misc/StringifyAble.java +++ b/src/g_earth/misc/StringifyAble.java @@ -1,4 +1,4 @@ -package main.misc; +package g_earth.misc; /** * Created by Jonas on 14/06/18. diff --git a/src/main/protocol/HConnection.java b/src/g_earth/protocol/HConnection.java similarity index 97% rename from src/main/protocol/HConnection.java rename to src/g_earth/protocol/HConnection.java index 038df41..a2d20fa 100644 --- a/src/main/protocol/HConnection.java +++ b/src/g_earth/protocol/HConnection.java @@ -1,12 +1,12 @@ -package main.protocol; +package g_earth.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 g_earth.misc.Cacher; +import g_earth.protocol.hostreplacer.HostReplacer; +import g_earth.protocol.hostreplacer.HostReplacerFactory; +import g_earth.protocol.memory.Rc4Obtainer; +import g_earth.protocol.packethandler.Handler; +import g_earth.protocol.packethandler.IncomingHandler; +import g_earth.protocol.packethandler.OutgoingHandler; import java.io.*; import java.net.InetAddress; diff --git a/src/main/protocol/HMessage.java b/src/g_earth/protocol/HMessage.java similarity index 97% rename from src/main/protocol/HMessage.java rename to src/g_earth/protocol/HMessage.java index 159fa4b..d284287 100644 --- a/src/main/protocol/HMessage.java +++ b/src/g_earth/protocol/HMessage.java @@ -1,6 +1,6 @@ -package main.protocol; +package g_earth.protocol; -import main.misc.StringifyAble; +import g_earth.misc.StringifyAble; public class HMessage implements StringifyAble { diff --git a/src/main/protocol/HPacket.java b/src/g_earth/protocol/HPacket.java similarity index 99% rename from src/main/protocol/HPacket.java rename to src/g_earth/protocol/HPacket.java index 4df5708..b294f68 100644 --- a/src/main/protocol/HPacket.java +++ b/src/g_earth/protocol/HPacket.java @@ -1,14 +1,12 @@ -package main.protocol; +package g_earth.protocol; -import main.misc.StringifyAble; +import g_earth.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/src/g_earth/protocol/StateChangeListener.java similarity index 82% rename from src/main/protocol/StateChangeListener.java rename to src/g_earth/protocol/StateChangeListener.java index 6c2fada..64e1887 100644 --- a/src/main/protocol/StateChangeListener.java +++ b/src/g_earth/protocol/StateChangeListener.java @@ -1,4 +1,4 @@ -package main.protocol; +package g_earth.protocol; public interface StateChangeListener { diff --git a/src/main/protocol/TrafficListener.java b/src/g_earth/protocol/TrafficListener.java similarity index 75% rename from src/main/protocol/TrafficListener.java rename to src/g_earth/protocol/TrafficListener.java index a369119..ab5b034 100644 --- a/src/main/protocol/TrafficListener.java +++ b/src/g_earth/protocol/TrafficListener.java @@ -1,4 +1,4 @@ -package main.protocol; +package g_earth.protocol; public interface TrafficListener { diff --git a/src/main/protocol/crypto/RC4.java b/src/g_earth/protocol/crypto/RC4.java similarity index 98% rename from src/main/protocol/crypto/RC4.java rename to src/g_earth/protocol/crypto/RC4.java index 66d0b7d..5288fd6 100644 --- a/src/main/protocol/crypto/RC4.java +++ b/src/g_earth/protocol/crypto/RC4.java @@ -1,4 +1,4 @@ -package main.protocol.crypto; +package g_earth.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/src/g_earth/protocol/hostreplacer/HostReplacer.java similarity index 75% rename from src/main/protocol/hostreplacer/HostReplacer.java rename to src/g_earth/protocol/hostreplacer/HostReplacer.java index f006266..7c83237 100644 --- a/src/main/protocol/hostreplacer/HostReplacer.java +++ b/src/g_earth/protocol/hostreplacer/HostReplacer.java @@ -1,4 +1,4 @@ -package main.protocol.hostreplacer; +package g_earth.protocol.hostreplacer; public interface HostReplacer { diff --git a/src/main/protocol/hostreplacer/HostReplacerFactory.java b/src/g_earth/protocol/hostreplacer/HostReplacerFactory.java similarity index 81% rename from src/main/protocol/hostreplacer/HostReplacerFactory.java rename to src/g_earth/protocol/hostreplacer/HostReplacerFactory.java index 8ac66f3..578380a 100644 --- a/src/main/protocol/hostreplacer/HostReplacerFactory.java +++ b/src/g_earth/protocol/hostreplacer/HostReplacerFactory.java @@ -1,6 +1,6 @@ -package main.protocol.hostreplacer; +package g_earth.protocol.hostreplacer; -import main.misc.OSValidator; +import g_earth.misc.OSValidator; /** * Created by Jonas on 04/04/18. diff --git a/src/main/protocol/hostreplacer/UnixHostReplacer.java b/src/g_earth/protocol/hostreplacer/UnixHostReplacer.java similarity index 98% rename from src/main/protocol/hostreplacer/UnixHostReplacer.java rename to src/g_earth/protocol/hostreplacer/UnixHostReplacer.java index 760da52..18f3ab1 100644 --- a/src/main/protocol/hostreplacer/UnixHostReplacer.java +++ b/src/g_earth/protocol/hostreplacer/UnixHostReplacer.java @@ -1,4 +1,4 @@ -package main.protocol.hostreplacer; +package g_earth.protocol.hostreplacer; import java.io.*; import java.util.ArrayList; diff --git a/src/main/protocol/hostreplacer/WindowsHostReplacer.java b/src/g_earth/protocol/hostreplacer/WindowsHostReplacer.java similarity index 85% rename from src/main/protocol/hostreplacer/WindowsHostReplacer.java rename to src/g_earth/protocol/hostreplacer/WindowsHostReplacer.java index c02d36c..deed8fa 100644 --- a/src/main/protocol/hostreplacer/WindowsHostReplacer.java +++ b/src/g_earth/protocol/hostreplacer/WindowsHostReplacer.java @@ -1,4 +1,4 @@ -package main.protocol.hostreplacer; +package g_earth.protocol.hostreplacer; /** * Created by Jonas on 04/04/18. diff --git a/src/main/protocol/memory/Rc4Obtainer.java b/src/g_earth/protocol/memory/Rc4Obtainer.java similarity index 86% rename from src/main/protocol/memory/Rc4Obtainer.java rename to src/g_earth/protocol/memory/Rc4Obtainer.java index f0aaf9e..a280bc5 100644 --- a/src/main/protocol/memory/Rc4Obtainer.java +++ b/src/g_earth/protocol/memory/Rc4Obtainer.java @@ -1,16 +1,15 @@ -package main.protocol.memory; +package g_earth.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 g_earth.protocol.HConnection; +import g_earth.protocol.HMessage; +import g_earth.protocol.HPacket; +import g_earth.protocol.crypto.RC4; +import g_earth.protocol.memory.habboclient.HabboClient; +import g_earth.protocol.memory.habboclient.HabboClientFactory; +import g_earth.protocol.packethandler.Handler; +import g_earth.protocol.packethandler.IncomingHandler; +import g_earth.protocol.packethandler.OutgoingHandler; +import g_earth.protocol.packethandler.PayloadBuffer; import java.util.Arrays; import java.util.List; diff --git a/src/main/protocol/memory/habboclient/HabboClient.java b/src/g_earth/protocol/memory/habboclient/HabboClient.java similarity index 81% rename from src/main/protocol/memory/habboclient/HabboClient.java rename to src/g_earth/protocol/memory/habboclient/HabboClient.java index 8ad3ad9..26f3fc7 100644 --- a/src/main/protocol/memory/habboclient/HabboClient.java +++ b/src/g_earth/protocol/memory/habboclient/HabboClient.java @@ -1,6 +1,6 @@ -package main.protocol.memory.habboclient; +package g_earth.protocol.memory.habboclient; -import main.protocol.HConnection; +import g_earth.protocol.HConnection; import java.util.List; diff --git a/src/main/protocol/memory/habboclient/HabboClientFactory.java b/src/g_earth/protocol/memory/habboclient/HabboClientFactory.java similarity index 56% rename from src/main/protocol/memory/habboclient/HabboClientFactory.java rename to src/g_earth/protocol/memory/habboclient/HabboClientFactory.java index b74a719..d8bef02 100644 --- a/src/main/protocol/memory/habboclient/HabboClientFactory.java +++ b/src/g_earth/protocol/memory/habboclient/HabboClientFactory.java @@ -1,9 +1,9 @@ -package main.protocol.memory.habboclient; +package g_earth.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 g_earth.misc.OSValidator; +import g_earth.protocol.HConnection; +import g_earth.protocol.memory.habboclient.linux.LinuxHabboClient; +import g_earth.protocol.memory.habboclient.windows.WindowsHabboClient; /** * Created by Jonas on 13/06/18. diff --git a/src/main/protocol/memory/habboclient/linux/LinuxHabboClient.java b/src/g_earth/protocol/memory/habboclient/linux/LinuxHabboClient.java similarity index 98% rename from src/main/protocol/memory/habboclient/linux/LinuxHabboClient.java rename to src/g_earth/protocol/memory/habboclient/linux/LinuxHabboClient.java index e1264c1..b5b6a14 100644 --- a/src/main/protocol/memory/habboclient/linux/LinuxHabboClient.java +++ b/src/g_earth/protocol/memory/habboclient/linux/LinuxHabboClient.java @@ -1,7 +1,7 @@ -package main.protocol.memory.habboclient.linux; +package g_earth.protocol.memory.habboclient.linux; -import main.protocol.HConnection; -import main.protocol.memory.habboclient.HabboClient; +import g_earth.protocol.HConnection; +import g_earth.protocol.memory.habboclient.HabboClient; import java.io.*; import java.nio.file.Files; diff --git a/src/main/protocol/memory/habboclient/linux/LinuxMemorySnippet.java b/src/g_earth/protocol/memory/habboclient/linux/LinuxMemorySnippet.java similarity index 85% rename from src/main/protocol/memory/habboclient/linux/LinuxMemorySnippet.java rename to src/g_earth/protocol/memory/habboclient/linux/LinuxMemorySnippet.java index 84b4b05..8e9537f 100644 --- a/src/main/protocol/memory/habboclient/linux/LinuxMemorySnippet.java +++ b/src/g_earth/protocol/memory/habboclient/linux/LinuxMemorySnippet.java @@ -1,4 +1,4 @@ -package main.protocol.memory.habboclient.linux; +package g_earth.protocol.memory.habboclient.linux; public class LinuxMemorySnippet { long offset; diff --git a/src/main/protocol/memory/habboclient/windows/WindowsHabboClient.java b/src/g_earth/protocol/memory/habboclient/windows/WindowsHabboClient.java similarity index 97% rename from src/main/protocol/memory/habboclient/windows/WindowsHabboClient.java rename to src/g_earth/protocol/memory/habboclient/windows/WindowsHabboClient.java index 59db181..6bc9148 100644 --- a/src/main/protocol/memory/habboclient/windows/WindowsHabboClient.java +++ b/src/g_earth/protocol/memory/habboclient/windows/WindowsHabboClient.java @@ -1,4 +1,4 @@ -package main.protocol.memory.habboclient.windows; +package g_earth.protocol.memory.habboclient.windows; //import com.sun.jna.Memory; //import com.sun.jna.Native; @@ -8,13 +8,9 @@ package main.protocol.memory.habboclient.windows; //import com.sun.jna.platform.win32.WinBase; //import com.sun.jna.platform.win32.WinNT; //import com.sun.jna.ptr.IntByReference; -import main.protocol.HConnection; -import main.protocol.memory.habboclient.HabboClient; +import g_earth.protocol.HConnection; +import g_earth.protocol.memory.habboclient.HabboClient; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.lang.reflect.Array; import java.util.*; /** diff --git a/src/main/protocol/packethandler/BufferListener.java b/src/g_earth/protocol/packethandler/BufferListener.java similarity index 63% rename from src/main/protocol/packethandler/BufferListener.java rename to src/g_earth/protocol/packethandler/BufferListener.java index 8e346f6..6f616b1 100644 --- a/src/main/protocol/packethandler/BufferListener.java +++ b/src/g_earth/protocol/packethandler/BufferListener.java @@ -1,4 +1,4 @@ -package main.protocol.packethandler; +package g_earth.protocol.packethandler; public interface BufferListener { diff --git a/src/main/protocol/packethandler/Handler.java b/src/g_earth/protocol/packethandler/Handler.java similarity index 96% rename from src/main/protocol/packethandler/Handler.java rename to src/g_earth/protocol/packethandler/Handler.java index 7a3513f..f894af4 100644 --- a/src/main/protocol/packethandler/Handler.java +++ b/src/g_earth/protocol/packethandler/Handler.java @@ -1,9 +1,9 @@ -package main.protocol.packethandler; +package g_earth.protocol.packethandler; -import main.protocol.HMessage; -import main.protocol.HPacket; -import main.protocol.TrafficListener; -import main.protocol.crypto.RC4; +import g_earth.protocol.HMessage; +import g_earth.protocol.HPacket; +import g_earth.protocol.TrafficListener; +import g_earth.protocol.crypto.RC4; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/protocol/packethandler/IncomingHandler.java b/src/g_earth/protocol/packethandler/IncomingHandler.java similarity index 90% rename from src/main/protocol/packethandler/IncomingHandler.java rename to src/g_earth/protocol/packethandler/IncomingHandler.java index f0d0bdc..fba7260 100644 --- a/src/main/protocol/packethandler/IncomingHandler.java +++ b/src/g_earth/protocol/packethandler/IncomingHandler.java @@ -1,8 +1,8 @@ -package main.protocol.packethandler; +package g_earth.protocol.packethandler; -import main.protocol.HMessage; -import main.protocol.HPacket; -import main.protocol.TrafficListener; +import g_earth.protocol.HMessage; +import g_earth.protocol.HPacket; +import g_earth.protocol.TrafficListener; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/protocol/packethandler/OutgoingHandler.java b/src/g_earth/protocol/packethandler/OutgoingHandler.java similarity index 90% rename from src/main/protocol/packethandler/OutgoingHandler.java rename to src/g_earth/protocol/packethandler/OutgoingHandler.java index 3a50a65..1ca36b4 100644 --- a/src/main/protocol/packethandler/OutgoingHandler.java +++ b/src/g_earth/protocol/packethandler/OutgoingHandler.java @@ -1,11 +1,10 @@ -package main.protocol.packethandler; +package g_earth.protocol.packethandler; -import main.protocol.HMessage; -import main.protocol.HPacket; +import g_earth.protocol.HMessage; +import g_earth.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/src/g_earth/protocol/packethandler/PayloadBuffer.java similarity index 95% rename from src/main/protocol/packethandler/PayloadBuffer.java rename to src/g_earth/protocol/packethandler/PayloadBuffer.java index 7fac4b6..06b6bf2 100644 --- a/src/main/protocol/packethandler/PayloadBuffer.java +++ b/src/g_earth/protocol/packethandler/PayloadBuffer.java @@ -1,6 +1,6 @@ -package main.protocol.packethandler; +package g_earth.protocol.packethandler; -import main.protocol.HPacket; +import g_earth.protocol.HPacket; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/ui/G-Earth.fxml b/src/g_earth/ui/G-Earth.fxml similarity index 97% rename from src/main/ui/G-Earth.fxml rename to src/g_earth/ui/G-Earth.fxml index 7c15480..6e30d2f 100644 --- a/src/main/ui/G-Earth.fxml +++ b/src/g_earth/ui/G-Earth.fxml @@ -7,7 +7,7 @@ - + diff --git a/src/main/ui/GEarthController.java b/src/g_earth/ui/GEarthController.java similarity index 88% rename from src/main/ui/GEarthController.java rename to src/g_earth/ui/GEarthController.java index 0126c2c..1c68535 100644 --- a/src/main/ui/GEarthController.java +++ b/src/g_earth/ui/GEarthController.java @@ -1,18 +1,18 @@ -package main.ui; +package g_earth.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 g_earth.protocol.HConnection; +import g_earth.ui.connection.Connection; +import g_earth.ui.extensions.Extensions; +import g_earth.ui.info.Info; +import g_earth.ui.injection.Injection; +import g_earth.ui.logger.Logger; +import g_earth.ui.scheduler.Scheduler; +import g_earth.ui.settings.Settings; +import g_earth.ui.tools.Tools; public class GEarthController { diff --git a/src/main/ui/SubForm.java b/src/g_earth/ui/SubForm.java similarity index 79% rename from src/main/ui/SubForm.java rename to src/g_earth/ui/SubForm.java index 9984bbe..cbb1788 100644 --- a/src/main/ui/SubForm.java +++ b/src/g_earth/ui/SubForm.java @@ -1,11 +1,7 @@ -package main.ui; +package g_earth.ui; -import main.protocol.HConnection; -import main.protocol.HMessage; -import main.protocol.HPacket; - -import java.awt.*; +import g_earth.protocol.HConnection; public class SubForm { diff --git a/src/main/ui/bootstrap3.css b/src/g_earth/ui/bootstrap3.css similarity index 100% rename from src/main/ui/bootstrap3.css rename to src/g_earth/ui/bootstrap3.css diff --git a/src/main/ui/buttons/BoxButton.java b/src/g_earth/ui/buttons/BoxButton.java similarity index 98% rename from src/main/ui/buttons/BoxButton.java rename to src/g_earth/ui/buttons/BoxButton.java index f0abd39..000ee1f 100644 --- a/src/main/ui/buttons/BoxButton.java +++ b/src/g_earth/ui/buttons/BoxButton.java @@ -1,4 +1,4 @@ -package main.ui.buttons; +package g_earth.ui.buttons; import javafx.event.EventHandler; import javafx.scene.Cursor; diff --git a/src/main/ui/buttons/DeleteButton.java b/src/g_earth/ui/buttons/DeleteButton.java similarity index 63% rename from src/main/ui/buttons/DeleteButton.java rename to src/g_earth/ui/buttons/DeleteButton.java index 2d91f52..a87ff37 100644 --- a/src/main/ui/buttons/DeleteButton.java +++ b/src/g_earth/ui/buttons/DeleteButton.java @@ -1,8 +1,4 @@ -package main.ui.buttons; - -import org.omg.CORBA.Environment; - -import java.io.File; +package g_earth.ui.buttons; public class DeleteButton extends BoxButton { diff --git a/src/main/ui/buttons/EditButton.java b/src/g_earth/ui/buttons/EditButton.java similarity index 82% rename from src/main/ui/buttons/EditButton.java rename to src/g_earth/ui/buttons/EditButton.java index 2f07b12..52af85e 100644 --- a/src/main/ui/buttons/EditButton.java +++ b/src/g_earth/ui/buttons/EditButton.java @@ -1,4 +1,4 @@ -package main.ui.buttons; +package g_earth.ui.buttons; public class EditButton extends BoxButton { diff --git a/src/main/ui/buttons/ExitButton.java b/src/g_earth/ui/buttons/ExitButton.java similarity index 86% rename from src/main/ui/buttons/ExitButton.java rename to src/g_earth/ui/buttons/ExitButton.java index faaccd8..6ee9a2d 100644 --- a/src/main/ui/buttons/ExitButton.java +++ b/src/g_earth/ui/buttons/ExitButton.java @@ -1,4 +1,4 @@ -package main.ui.buttons; +package g_earth.ui.buttons; /** * Created by Jonas on 26/09/18. diff --git a/src/main/ui/buttons/FireButton.java b/src/g_earth/ui/buttons/FireButton.java similarity index 86% rename from src/main/ui/buttons/FireButton.java rename to src/g_earth/ui/buttons/FireButton.java index 798dbb3..7e68624 100644 --- a/src/main/ui/buttons/FireButton.java +++ b/src/g_earth/ui/buttons/FireButton.java @@ -1,4 +1,4 @@ -package main.ui.buttons; +package g_earth.ui.buttons; /** * Created by Jonas on 26/09/18. diff --git a/src/main/ui/buttons/PauseResumeButton.java b/src/g_earth/ui/buttons/PauseResumeButton.java similarity index 99% rename from src/main/ui/buttons/PauseResumeButton.java rename to src/g_earth/ui/buttons/PauseResumeButton.java index d8ca648..9180a7e 100644 --- a/src/main/ui/buttons/PauseResumeButton.java +++ b/src/g_earth/ui/buttons/PauseResumeButton.java @@ -1,4 +1,4 @@ -package main.ui.buttons; +package g_earth.ui.buttons; import javafx.beans.InvalidationListener; import javafx.event.EventHandler; diff --git a/src/main/ui/buttons/ReloadButton.java b/src/g_earth/ui/buttons/ReloadButton.java similarity index 86% rename from src/main/ui/buttons/ReloadButton.java rename to src/g_earth/ui/buttons/ReloadButton.java index e294fba..2d3e725 100644 --- a/src/main/ui/buttons/ReloadButton.java +++ b/src/g_earth/ui/buttons/ReloadButton.java @@ -1,4 +1,4 @@ -package main.ui.buttons; +package g_earth.ui.buttons; /** * Created by Jonas on 26/09/18. diff --git a/src/main/ui/buttons/SimpleClickButton.java b/src/g_earth/ui/buttons/SimpleClickButton.java similarity index 87% rename from src/main/ui/buttons/SimpleClickButton.java rename to src/g_earth/ui/buttons/SimpleClickButton.java index 59585c4..1e7d54c 100644 --- a/src/main/ui/buttons/SimpleClickButton.java +++ b/src/g_earth/ui/buttons/SimpleClickButton.java @@ -1,4 +1,4 @@ -package main.ui.buttons; +package g_earth.ui.buttons; /** * Created by Jonas on 19/07/18. diff --git a/src/main/ui/buttons/files/ButtonDelete.png b/src/g_earth/ui/buttons/files/ButtonDelete.png similarity index 100% rename from src/main/ui/buttons/files/ButtonDelete.png rename to src/g_earth/ui/buttons/files/ButtonDelete.png diff --git a/src/main/ui/buttons/files/ButtonDeleteHover.png b/src/g_earth/ui/buttons/files/ButtonDeleteHover.png similarity index 100% rename from src/main/ui/buttons/files/ButtonDeleteHover.png rename to src/g_earth/ui/buttons/files/ButtonDeleteHover.png diff --git a/src/main/ui/buttons/files/ButtonEdit.png b/src/g_earth/ui/buttons/files/ButtonEdit.png similarity index 100% rename from src/main/ui/buttons/files/ButtonEdit.png rename to src/g_earth/ui/buttons/files/ButtonEdit.png diff --git a/src/main/ui/buttons/files/ButtonEditHover.png b/src/g_earth/ui/buttons/files/ButtonEditHover.png similarity index 100% rename from src/main/ui/buttons/files/ButtonEditHover.png rename to src/g_earth/ui/buttons/files/ButtonEditHover.png diff --git a/src/main/ui/buttons/files/ButtonExit.png b/src/g_earth/ui/buttons/files/ButtonExit.png similarity index 100% rename from src/main/ui/buttons/files/ButtonExit.png rename to src/g_earth/ui/buttons/files/ButtonExit.png diff --git a/src/main/ui/buttons/files/ButtonExitHover.png b/src/g_earth/ui/buttons/files/ButtonExitHover.png similarity index 100% rename from src/main/ui/buttons/files/ButtonExitHover.png rename to src/g_earth/ui/buttons/files/ButtonExitHover.png diff --git a/src/main/ui/buttons/files/ButtonFire.png b/src/g_earth/ui/buttons/files/ButtonFire.png similarity index 100% rename from src/main/ui/buttons/files/ButtonFire.png rename to src/g_earth/ui/buttons/files/ButtonFire.png diff --git a/src/main/ui/buttons/files/ButtonFireHover.png b/src/g_earth/ui/buttons/files/ButtonFireHover.png similarity index 100% rename from src/main/ui/buttons/files/ButtonFireHover.png rename to src/g_earth/ui/buttons/files/ButtonFireHover.png diff --git a/src/main/ui/buttons/files/ButtonPause.png b/src/g_earth/ui/buttons/files/ButtonPause.png similarity index 100% rename from src/main/ui/buttons/files/ButtonPause.png rename to src/g_earth/ui/buttons/files/ButtonPause.png diff --git a/src/main/ui/buttons/files/ButtonPauseHover.png b/src/g_earth/ui/buttons/files/ButtonPauseHover.png similarity index 100% rename from src/main/ui/buttons/files/ButtonPauseHover.png rename to src/g_earth/ui/buttons/files/ButtonPauseHover.png diff --git a/src/main/ui/buttons/files/ButtonReload.png b/src/g_earth/ui/buttons/files/ButtonReload.png similarity index 100% rename from src/main/ui/buttons/files/ButtonReload.png rename to src/g_earth/ui/buttons/files/ButtonReload.png diff --git a/src/main/ui/buttons/files/ButtonReloadHover.png b/src/g_earth/ui/buttons/files/ButtonReloadHover.png similarity index 100% rename from src/main/ui/buttons/files/ButtonReloadHover.png rename to src/g_earth/ui/buttons/files/ButtonReloadHover.png diff --git a/src/main/ui/buttons/files/ButtonResume.png b/src/g_earth/ui/buttons/files/ButtonResume.png similarity index 100% rename from src/main/ui/buttons/files/ButtonResume.png rename to src/g_earth/ui/buttons/files/ButtonResume.png diff --git a/src/main/ui/buttons/files/ButtonResumeHover.png b/src/g_earth/ui/buttons/files/ButtonResumeHover.png similarity index 100% rename from src/main/ui/buttons/files/ButtonResumeHover.png rename to src/g_earth/ui/buttons/files/ButtonResumeHover.png diff --git a/src/main/ui/connection/Connection.fxml b/src/g_earth/ui/connection/Connection.fxml similarity index 99% rename from src/main/ui/connection/Connection.fxml rename to src/g_earth/ui/connection/Connection.fxml index 319360e..1da38d2 100644 --- a/src/main/ui/connection/Connection.fxml +++ b/src/g_earth/ui/connection/Connection.fxml @@ -11,7 +11,7 @@ - + diff --git a/src/main/ui/connection/Connection.java b/src/g_earth/ui/connection/Connection.java similarity index 92% rename from src/main/ui/connection/Connection.java rename to src/g_earth/ui/connection/Connection.java index f7122c0..af96385 100644 --- a/src/main/ui/connection/Connection.java +++ b/src/g_earth/ui/connection/Connection.java @@ -1,17 +1,10 @@ -package main.ui.connection; +package g_earth.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 g_earth.protocol.HConnection; +import g_earth.ui.SubForm; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/ui/extensions/ExtensionItemContainer.java b/src/g_earth/ui/extensions/ExtensionItemContainer.java similarity index 94% rename from src/main/ui/extensions/ExtensionItemContainer.java rename to src/g_earth/ui/extensions/ExtensionItemContainer.java index 820ab7e..7b86b8c 100644 --- a/src/main/ui/extensions/ExtensionItemContainer.java +++ b/src/g_earth/ui/extensions/ExtensionItemContainer.java @@ -1,4 +1,4 @@ -package main.ui.extensions; +package g_earth.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 g_earth.misc.ConfirmationDialog; +import g_earth.ui.buttons.*; +import g_earth.ui.extensions.executer.ExecutionInfo; +import g_earth.ui.extensions.executer.ExtensionRunner; +import g_earth.ui.extensions.executer.ExtensionRunnerFactory; +import g_earth.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/src/g_earth/ui/extensions/ExtensionItemContainerProducer.java similarity index 97% rename from src/main/ui/extensions/ExtensionItemContainerProducer.java rename to src/g_earth/ui/extensions/ExtensionItemContainerProducer.java index ba3a9f4..fba8a9e 100644 --- a/src/main/ui/extensions/ExtensionItemContainerProducer.java +++ b/src/g_earth/ui/extensions/ExtensionItemContainerProducer.java @@ -1,4 +1,4 @@ -package main.ui.extensions; +package g_earth.ui.extensions; import javafx.scene.Node; import javafx.scene.control.ScrollPane; diff --git a/src/main/ui/extensions/Extensions.fxml b/src/g_earth/ui/extensions/Extensions.fxml similarity index 99% rename from src/main/ui/extensions/Extensions.fxml rename to src/g_earth/ui/extensions/Extensions.fxml index b07e03e..a149b3a 100644 --- a/src/main/ui/extensions/Extensions.fxml +++ b/src/g_earth/ui/extensions/Extensions.fxml @@ -10,7 +10,7 @@ - + diff --git a/src/main/ui/extensions/Extensions.java b/src/g_earth/ui/extensions/Extensions.java similarity index 97% rename from src/main/ui/extensions/Extensions.java rename to src/g_earth/ui/extensions/Extensions.java index c70ef01..ccd7dd2 100644 --- a/src/main/ui/extensions/Extensions.java +++ b/src/g_earth/ui/extensions/Extensions.java @@ -1,8 +1,6 @@ -package main.ui.extensions; +package g_earth.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 g_earth.Main; +import g_earth.protocol.*; +import g_earth.ui.SubForm; +import g_earth.ui.extensions.executer.ExecutionInfo; +import g_earth.ui.extensions.executer.ExtensionRunner; +import g_earth.ui.extensions.executer.ExtensionRunnerFactory; +import g_earth.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.*; /** diff --git a/src/main/ui/extensions/GEarthExtension.java b/src/g_earth/ui/extensions/GEarthExtension.java similarity index 99% rename from src/main/ui/extensions/GEarthExtension.java rename to src/g_earth/ui/extensions/GEarthExtension.java index c38a3b5..9b59142 100644 --- a/src/main/ui/extensions/GEarthExtension.java +++ b/src/g_earth/ui/extensions/GEarthExtension.java @@ -1,7 +1,7 @@ -package main.ui.extensions; +package g_earth.ui.extensions; import javafx.beans.InvalidationListener; -import main.protocol.HPacket; +import g_earth.protocol.HPacket; import java.io.DataInputStream; import java.io.IOException; diff --git a/src/main/ui/extensions/GEarthExtensionsRegistrer.java b/src/g_earth/ui/extensions/GEarthExtensionsRegistrer.java similarity index 97% rename from src/main/ui/extensions/GEarthExtensionsRegistrer.java rename to src/g_earth/ui/extensions/GEarthExtensionsRegistrer.java index 4787f1a..7d6b6c2 100644 --- a/src/main/ui/extensions/GEarthExtensionsRegistrer.java +++ b/src/g_earth/ui/extensions/GEarthExtensionsRegistrer.java @@ -1,4 +1,4 @@ -package main.ui.extensions; +package g_earth.ui.extensions; import java.io.IOException; import java.net.ServerSocket; diff --git a/src/main/ui/extensions/executer/ExecutionInfo.java b/src/g_earth/ui/extensions/executer/ExecutionInfo.java similarity index 96% rename from src/main/ui/extensions/executer/ExecutionInfo.java rename to src/g_earth/ui/extensions/executer/ExecutionInfo.java index e3b28da..0cc7d1b 100644 --- a/src/main/ui/extensions/executer/ExecutionInfo.java +++ b/src/g_earth/ui/extensions/executer/ExecutionInfo.java @@ -1,4 +1,4 @@ -package main.ui.extensions.executer; +package g_earth.ui.extensions.executer; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/ui/extensions/executer/ExtensionRunner.java b/src/g_earth/ui/extensions/executer/ExtensionRunner.java similarity index 61% rename from src/main/ui/extensions/executer/ExtensionRunner.java rename to src/g_earth/ui/extensions/executer/ExtensionRunner.java index 9489895..5ed28d4 100644 --- a/src/main/ui/extensions/executer/ExtensionRunner.java +++ b/src/g_earth/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 g_earth.ui.extensions.executer; /** * Created by Jonas on 21/09/18. diff --git a/src/main/ui/extensions/executer/ExtensionRunnerFactory.java b/src/g_earth/ui/extensions/executer/ExtensionRunnerFactory.java similarity index 88% rename from src/main/ui/extensions/executer/ExtensionRunnerFactory.java rename to src/g_earth/ui/extensions/executer/ExtensionRunnerFactory.java index ae18e63..034e2ec 100644 --- a/src/main/ui/extensions/executer/ExtensionRunnerFactory.java +++ b/src/g_earth/ui/extensions/executer/ExtensionRunnerFactory.java @@ -1,4 +1,4 @@ -package main.ui.extensions.executer; +package g_earth.ui.extensions.executer; /** * Created by Jonas on 22/09/18. diff --git a/src/main/ui/extensions/executer/NormalExtensionRunner.java b/src/g_earth/ui/extensions/executer/NormalExtensionRunner.java similarity index 98% rename from src/main/ui/extensions/executer/NormalExtensionRunner.java rename to src/g_earth/ui/extensions/executer/NormalExtensionRunner.java index dbec268..a47ad90 100644 --- a/src/main/ui/extensions/executer/NormalExtensionRunner.java +++ b/src/g_earth/ui/extensions/executer/NormalExtensionRunner.java @@ -1,6 +1,6 @@ -package main.ui.extensions.executer; +package g_earth.ui.extensions.executer; -import main.Main; +import g_earth.Main; import java.io.File; import java.io.IOException; diff --git a/src/main/ui/info/Info.fxml b/src/g_earth/ui/info/Info.fxml similarity index 96% rename from src/main/ui/info/Info.fxml rename to src/g_earth/ui/info/Info.fxml index 6de175c..43417f2 100644 --- a/src/main/ui/info/Info.fxml +++ b/src/g_earth/ui/info/Info.fxml @@ -6,7 +6,7 @@ - + diff --git a/src/main/ui/info/Info.java b/src/g_earth/ui/info/Info.java similarity index 94% rename from src/main/ui/info/Info.java rename to src/g_earth/ui/info/Info.java index 61601af..5932e84 100644 --- a/src/main/ui/info/Info.java +++ b/src/g_earth/ui/info/Info.java @@ -1,7 +1,7 @@ -package main.ui.info; +package g_earth.ui.info; import javafx.scene.control.TextArea; -import main.ui.SubForm; +import g_earth.ui.SubForm; /** * Created by Jonas on 06/04/18. diff --git a/src/main/ui/injection/Injection.fxml b/src/g_earth/ui/injection/Injection.fxml similarity index 98% rename from src/main/ui/injection/Injection.fxml rename to src/g_earth/ui/injection/Injection.fxml index 7828fd1..c78b620 100644 --- a/src/main/ui/injection/Injection.fxml +++ b/src/g_earth/ui/injection/Injection.fxml @@ -9,7 +9,7 @@ - + diff --git a/src/main/ui/injection/Injection.java b/src/g_earth/ui/injection/Injection.java similarity index 94% rename from src/main/ui/injection/Injection.java rename to src/g_earth/ui/injection/Injection.java index a15d79a..1fb29fa 100644 --- a/src/main/ui/injection/Injection.java +++ b/src/g_earth/ui/injection/Injection.java @@ -1,4 +1,4 @@ -package main.ui.injection; +package g_earth.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 g_earth.protocol.HConnection; +import g_earth.protocol.HPacket; +import g_earth.ui.SubForm; public class Injection extends SubForm { public TextArea inputPacket; diff --git a/src/main/ui/logger/Logger.fxml b/src/g_earth/ui/logger/Logger.fxml similarity index 99% rename from src/main/ui/logger/Logger.fxml rename to src/g_earth/ui/logger/Logger.fxml index 01fdd4b..d8f914f 100644 --- a/src/main/ui/logger/Logger.fxml +++ b/src/g_earth/ui/logger/Logger.fxml @@ -12,7 +12,7 @@ - + diff --git a/src/main/ui/logger/Logger.java b/src/g_earth/ui/logger/Logger.java similarity index 94% rename from src/main/ui/logger/Logger.java rename to src/g_earth/ui/logger/Logger.java index 6b16880..d1bda64 100644 --- a/src/main/ui/logger/Logger.java +++ b/src/g_earth/ui/logger/Logger.java @@ -1,4 +1,4 @@ -package main.ui.logger; +package g_earth.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 g_earth.protocol.HConnection; +import g_earth.protocol.HMessage; +import g_earth.ui.SubForm; +import g_earth.ui.logger.loggerdisplays.PacketLogger; +import g_earth.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/src/g_earth/ui/logger/loggerdisplays/LinuxTerminalLogger.java similarity index 97% rename from src/main/ui/logger/loggerdisplays/LinuxTerminalLogger.java rename to src/g_earth/ui/logger/loggerdisplays/LinuxTerminalLogger.java index 1279cd3..616c253 100644 --- a/src/main/ui/logger/loggerdisplays/LinuxTerminalLogger.java +++ b/src/g_earth/ui/logger/loggerdisplays/LinuxTerminalLogger.java @@ -1,6 +1,6 @@ -package main.ui.logger.loggerdisplays; +package g_earth.ui.logger.loggerdisplays; -import main.protocol.HPacket; +import g_earth.protocol.HPacket; import java.util.HashMap; import java.util.Map; diff --git a/src/main/ui/logger/loggerdisplays/PacketLogger.java b/src/g_earth/ui/logger/loggerdisplays/PacketLogger.java similarity index 86% rename from src/main/ui/logger/loggerdisplays/PacketLogger.java rename to src/g_earth/ui/logger/loggerdisplays/PacketLogger.java index 7f2c50e..6b5d18b 100644 --- a/src/main/ui/logger/loggerdisplays/PacketLogger.java +++ b/src/g_earth/ui/logger/loggerdisplays/PacketLogger.java @@ -1,7 +1,6 @@ -package main.ui.logger.loggerdisplays; +package g_earth.ui.logger.loggerdisplays; -import main.protocol.HMessage; -import main.protocol.HPacket; +import g_earth.protocol.HPacket; /** * Created by Jonas on 04/04/18. diff --git a/src/main/ui/logger/loggerdisplays/PacketLoggerFactory.java b/src/g_earth/ui/logger/loggerdisplays/PacketLoggerFactory.java similarity index 85% rename from src/main/ui/logger/loggerdisplays/PacketLoggerFactory.java rename to src/g_earth/ui/logger/loggerdisplays/PacketLoggerFactory.java index 6479d0c..1e42d68 100644 --- a/src/main/ui/logger/loggerdisplays/PacketLoggerFactory.java +++ b/src/g_earth/ui/logger/loggerdisplays/PacketLoggerFactory.java @@ -1,6 +1,6 @@ -package main.ui.logger.loggerdisplays; +package g_earth.ui.logger.loggerdisplays; -import main.misc.OSValidator; +import g_earth.misc.OSValidator; /** * Created by Jonas on 04/04/18. diff --git a/src/main/ui/logger/loggerdisplays/SimpleTerminalLogger.java b/src/g_earth/ui/logger/loggerdisplays/SimpleTerminalLogger.java similarity index 95% rename from src/main/ui/logger/loggerdisplays/SimpleTerminalLogger.java rename to src/g_earth/ui/logger/loggerdisplays/SimpleTerminalLogger.java index 2758071..b54e4a9 100644 --- a/src/main/ui/logger/loggerdisplays/SimpleTerminalLogger.java +++ b/src/g_earth/ui/logger/loggerdisplays/SimpleTerminalLogger.java @@ -1,6 +1,6 @@ -package main.ui.logger.loggerdisplays; +package g_earth.ui.logger.loggerdisplays; -import main.protocol.HPacket; +import g_earth.protocol.HPacket; /** * Created by Jonas on 04/04/18. diff --git a/src/main/ui/scheduler/Interval.java b/src/g_earth/ui/scheduler/Interval.java similarity index 97% rename from src/main/ui/scheduler/Interval.java rename to src/g_earth/ui/scheduler/Interval.java index 86ca020..2de7ee6 100644 --- a/src/main/ui/scheduler/Interval.java +++ b/src/g_earth/ui/scheduler/Interval.java @@ -1,4 +1,4 @@ -package main.ui.scheduler; +package g_earth.ui.scheduler; /** * Created by Jonas on 11/04/18. diff --git a/src/main/ui/scheduler/ScheduleItem.java b/src/g_earth/ui/scheduler/ScheduleItem.java similarity index 97% rename from src/main/ui/scheduler/ScheduleItem.java rename to src/g_earth/ui/scheduler/ScheduleItem.java index cbb87d0..33d0824 100644 --- a/src/main/ui/scheduler/ScheduleItem.java +++ b/src/g_earth/ui/scheduler/ScheduleItem.java @@ -1,12 +1,12 @@ -package main.ui.scheduler; +package g_earth.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 g_earth.misc.StringifyAble; +import g_earth.protocol.HMessage; +import g_earth.protocol.HPacket; import java.util.ArrayList; import java.util.List; diff --git a/src/main/ui/scheduler/ScheduleItemContainer.java b/src/g_earth/ui/scheduler/ScheduleItemContainer.java similarity index 96% rename from src/main/ui/scheduler/ScheduleItemContainer.java rename to src/g_earth/ui/scheduler/ScheduleItemContainer.java index 8409a52..706fd47 100644 --- a/src/main/ui/scheduler/ScheduleItemContainer.java +++ b/src/g_earth/ui/scheduler/ScheduleItemContainer.java @@ -1,4 +1,4 @@ -package main.ui.scheduler; +package g_earth.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 g_earth.ui.buttons.DeleteButton; +import g_earth.ui.buttons.EditButton; +import g_earth.ui.buttons.PauseResumeButton; /** * Created by Jonas on 07/04/18. diff --git a/src/main/ui/scheduler/Scheduler.fxml b/src/g_earth/ui/scheduler/Scheduler.fxml similarity index 99% rename from src/main/ui/scheduler/Scheduler.fxml rename to src/g_earth/ui/scheduler/Scheduler.fxml index 3042cdc..336389f 100644 --- a/src/main/ui/scheduler/Scheduler.fxml +++ b/src/g_earth/ui/scheduler/Scheduler.fxml @@ -12,7 +12,7 @@ - + diff --git a/src/main/ui/scheduler/Scheduler.java b/src/g_earth/ui/scheduler/Scheduler.java similarity index 97% rename from src/main/ui/scheduler/Scheduler.java rename to src/g_earth/ui/scheduler/Scheduler.java index 092ecbe..4145af7 100644 --- a/src/main/ui/scheduler/Scheduler.java +++ b/src/g_earth/ui/scheduler/Scheduler.java @@ -1,16 +1,14 @@ -package main.ui.scheduler; +package g_earth.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 g_earth.protocol.HMessage; +import g_earth.protocol.HPacket; +import g_earth.ui.SubForm; import java.io.*; import java.util.ArrayList; diff --git a/src/main/ui/settings/Settings.fxml b/src/g_earth/ui/settings/Settings.fxml similarity index 94% rename from src/main/ui/settings/Settings.fxml rename to src/g_earth/ui/settings/Settings.fxml index 848b826..b336648 100644 --- a/src/main/ui/settings/Settings.fxml +++ b/src/g_earth/ui/settings/Settings.fxml @@ -3,7 +3,7 @@ - + diff --git a/src/main/ui/settings/Settings.java b/src/g_earth/ui/settings/Settings.java similarity index 60% rename from src/main/ui/settings/Settings.java rename to src/g_earth/ui/settings/Settings.java index e4e5a65..491c43a 100644 --- a/src/main/ui/settings/Settings.java +++ b/src/g_earth/ui/settings/Settings.java @@ -1,6 +1,6 @@ -package main.ui.settings; +package g_earth.ui.settings; -import main.ui.SubForm; +import g_earth.ui.SubForm; /** * Created by Jonas on 06/04/18. diff --git a/src/main/ui/tools/Tools.fxml b/src/g_earth/ui/tools/Tools.fxml similarity index 99% rename from src/main/ui/tools/Tools.fxml rename to src/g_earth/ui/tools/Tools.fxml index ebde1ff..392ef26 100644 --- a/src/main/ui/tools/Tools.fxml +++ b/src/g_earth/ui/tools/Tools.fxml @@ -10,7 +10,7 @@ - + diff --git a/src/main/ui/tools/Tools.java b/src/g_earth/ui/tools/Tools.java similarity index 96% rename from src/main/ui/tools/Tools.java rename to src/g_earth/ui/tools/Tools.java index e52dbba..3282e6e 100644 --- a/src/main/ui/tools/Tools.java +++ b/src/g_earth/ui/tools/Tools.java @@ -1,17 +1,14 @@ -package main.ui.tools; +package g_earth.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 g_earth.protocol.HPacket; +import g_earth.ui.SubForm; import java.nio.ByteBuffer; -import java.nio.ByteOrder; public class Tools extends SubForm {