diff --git a/.gitignore b/.gitignore index 5435a47..be63b5a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,7 @@ out/ bin/ **/target/ -*.iml +/G-WinMem/.vs +/G-WinMem/x64 +/G-WinMem/G-WinMem/x64 +*.iml \ No newline at end of file diff --git a/Extensions/AdminOnConnect/pom.xml b/Extensions/AdminOnConnect/pom.xml index 6374836..de4b361 100644 --- a/Extensions/AdminOnConnect/pom.xml +++ b/Extensions/AdminOnConnect/pom.xml @@ -72,7 +72,7 @@ jar-with-dependencies - ${project.artifactId}-Full + ${project.artifactId} false @@ -82,7 +82,7 @@ G-Earth - G-Earth-UI + G-Earth 0.1.2-beta diff --git a/Extensions/BlockReplacePackets/pom.xml b/Extensions/BlockReplacePackets/pom.xml index b5940c9..323beae 100644 --- a/Extensions/BlockReplacePackets/pom.xml +++ b/Extensions/BlockReplacePackets/pom.xml @@ -71,7 +71,7 @@ jar-with-dependencies - ${project.artifactId}-Full + ${project.artifactId} false @@ -81,7 +81,7 @@ G-Earth - G-Earth-UI + G-Earth 0.1.2-beta diff --git a/Extensions/SpeechColorizer/pom.xml b/Extensions/SpeechColorizer/pom.xml index f0a3f32..d514c04 100644 --- a/Extensions/SpeechColorizer/pom.xml +++ b/Extensions/SpeechColorizer/pom.xml @@ -71,7 +71,7 @@ jar-with-dependencies - ${project.artifactId}-Full + ${project.artifactId} false @@ -81,7 +81,7 @@ G-Earth - G-Earth-UI + G-Earth 0.1.2-beta diff --git a/G-Earth-UI/pom.xml b/G-Earth/pom.xml similarity index 98% rename from G-Earth-UI/pom.xml rename to G-Earth/pom.xml index d7f4077..befca5b 100644 --- a/G-Earth-UI/pom.xml +++ b/G-Earth/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - G-Earth-UI + G-Earth jar diff --git a/G-Earth-UI/src/META-INF/MANIFEST.MF b/G-Earth/src/META-INF/MANIFEST.MF similarity index 100% rename from G-Earth-UI/src/META-INF/MANIFEST.MF rename to G-Earth/src/META-INF/MANIFEST.MF diff --git a/G-Earth-UI/src/main/java/gearth/Main.java b/G-Earth/src/main/java/gearth/Main.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/Main.java rename to G-Earth/src/main/java/gearth/Main.java diff --git a/G-Earth-UI/src/main/java/gearth/extensions/Extension.java b/G-Earth/src/main/java/gearth/extensions/Extension.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/extensions/Extension.java rename to G-Earth/src/main/java/gearth/extensions/Extension.java diff --git a/G-Earth-UI/src/main/java/gearth/extensions/ExtensionForm.java b/G-Earth/src/main/java/gearth/extensions/ExtensionForm.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/extensions/ExtensionForm.java rename to G-Earth/src/main/java/gearth/extensions/ExtensionForm.java diff --git a/G-Earth-UI/src/main/java/gearth/extensions/ExtensionInfo.java b/G-Earth/src/main/java/gearth/extensions/ExtensionInfo.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/extensions/ExtensionInfo.java rename to G-Earth/src/main/java/gearth/extensions/ExtensionInfo.java diff --git a/G-Earth-UI/src/main/java/gearth/extensions/extra/Inspector.java b/G-Earth/src/main/java/gearth/extensions/extra/Inspector.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/extensions/extra/Inspector.java rename to G-Earth/src/main/java/gearth/extensions/extra/Inspector.java diff --git a/G-Earth-UI/src/main/java/gearth/misc/Cacher.java b/G-Earth/src/main/java/gearth/misc/Cacher.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/misc/Cacher.java rename to G-Earth/src/main/java/gearth/misc/Cacher.java diff --git a/G-Earth-UI/src/main/java/gearth/misc/ConfirmationDialog.java b/G-Earth/src/main/java/gearth/misc/ConfirmationDialog.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/misc/ConfirmationDialog.java rename to G-Earth/src/main/java/gearth/misc/ConfirmationDialog.java diff --git a/G-Earth-UI/src/main/java/gearth/misc/OSValidator.java b/G-Earth/src/main/java/gearth/misc/OSValidator.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/misc/OSValidator.java rename to G-Earth/src/main/java/gearth/misc/OSValidator.java diff --git a/G-Earth-UI/src/main/java/gearth/misc/StringifyAble.java b/G-Earth/src/main/java/gearth/misc/StringifyAble.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/misc/StringifyAble.java rename to G-Earth/src/main/java/gearth/misc/StringifyAble.java diff --git a/G-Earth-UI/src/main/java/gearth/protocol/HConnection.java b/G-Earth/src/main/java/gearth/protocol/HConnection.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/protocol/HConnection.java rename to G-Earth/src/main/java/gearth/protocol/HConnection.java diff --git a/G-Earth-UI/src/main/java/gearth/protocol/HMessage.java b/G-Earth/src/main/java/gearth/protocol/HMessage.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/protocol/HMessage.java rename to G-Earth/src/main/java/gearth/protocol/HMessage.java diff --git a/G-Earth-UI/src/main/java/gearth/protocol/HPacket.java b/G-Earth/src/main/java/gearth/protocol/HPacket.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/protocol/HPacket.java rename to G-Earth/src/main/java/gearth/protocol/HPacket.java diff --git a/G-Earth-UI/src/main/java/gearth/protocol/StateChangeListener.java b/G-Earth/src/main/java/gearth/protocol/StateChangeListener.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/protocol/StateChangeListener.java rename to G-Earth/src/main/java/gearth/protocol/StateChangeListener.java diff --git a/G-Earth-UI/src/main/java/gearth/protocol/TrafficListener.java b/G-Earth/src/main/java/gearth/protocol/TrafficListener.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/protocol/TrafficListener.java rename to G-Earth/src/main/java/gearth/protocol/TrafficListener.java diff --git a/G-Earth-UI/src/main/java/gearth/protocol/crypto/RC4.java b/G-Earth/src/main/java/gearth/protocol/crypto/RC4.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/protocol/crypto/RC4.java rename to G-Earth/src/main/java/gearth/protocol/crypto/RC4.java diff --git a/G-Earth-UI/src/main/java/gearth/protocol/hostreplacer/HostReplacer.java b/G-Earth/src/main/java/gearth/protocol/hostreplacer/HostReplacer.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/protocol/hostreplacer/HostReplacer.java rename to G-Earth/src/main/java/gearth/protocol/hostreplacer/HostReplacer.java diff --git a/G-Earth-UI/src/main/java/gearth/protocol/hostreplacer/HostReplacerFactory.java b/G-Earth/src/main/java/gearth/protocol/hostreplacer/HostReplacerFactory.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/protocol/hostreplacer/HostReplacerFactory.java rename to G-Earth/src/main/java/gearth/protocol/hostreplacer/HostReplacerFactory.java diff --git a/G-Earth-UI/src/main/java/gearth/protocol/hostreplacer/UnixHostReplacer.java b/G-Earth/src/main/java/gearth/protocol/hostreplacer/UnixHostReplacer.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/protocol/hostreplacer/UnixHostReplacer.java rename to G-Earth/src/main/java/gearth/protocol/hostreplacer/UnixHostReplacer.java diff --git a/G-Earth-UI/src/main/java/gearth/protocol/hostreplacer/WindowsHostReplacer.java b/G-Earth/src/main/java/gearth/protocol/hostreplacer/WindowsHostReplacer.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/protocol/hostreplacer/WindowsHostReplacer.java rename to G-Earth/src/main/java/gearth/protocol/hostreplacer/WindowsHostReplacer.java diff --git a/G-Earth-UI/src/main/java/gearth/protocol/memory/Rc4Obtainer.java b/G-Earth/src/main/java/gearth/protocol/memory/Rc4Obtainer.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/protocol/memory/Rc4Obtainer.java rename to G-Earth/src/main/java/gearth/protocol/memory/Rc4Obtainer.java diff --git a/G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/HabboClient.java b/G-Earth/src/main/java/gearth/protocol/memory/habboclient/HabboClient.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/HabboClient.java rename to G-Earth/src/main/java/gearth/protocol/memory/habboclient/HabboClient.java diff --git a/G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/HabboClientFactory.java b/G-Earth/src/main/java/gearth/protocol/memory/habboclient/HabboClientFactory.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/HabboClientFactory.java rename to G-Earth/src/main/java/gearth/protocol/memory/habboclient/HabboClientFactory.java diff --git a/G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/linux/LinuxHabboClient.java b/G-Earth/src/main/java/gearth/protocol/memory/habboclient/linux/LinuxHabboClient.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/linux/LinuxHabboClient.java rename to G-Earth/src/main/java/gearth/protocol/memory/habboclient/linux/LinuxHabboClient.java diff --git a/G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/linux/LinuxMemorySnippet.java b/G-Earth/src/main/java/gearth/protocol/memory/habboclient/linux/LinuxMemorySnippet.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/linux/LinuxMemorySnippet.java rename to G-Earth/src/main/java/gearth/protocol/memory/habboclient/linux/LinuxMemorySnippet.java diff --git a/G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/windows/WindowsHabboClient.java b/G-Earth/src/main/java/gearth/protocol/memory/habboclient/windows/WindowsHabboClient.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/protocol/memory/habboclient/windows/WindowsHabboClient.java rename to G-Earth/src/main/java/gearth/protocol/memory/habboclient/windows/WindowsHabboClient.java diff --git a/G-Earth-UI/src/main/java/gearth/protocol/packethandler/BufferListener.java b/G-Earth/src/main/java/gearth/protocol/packethandler/BufferListener.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/protocol/packethandler/BufferListener.java rename to G-Earth/src/main/java/gearth/protocol/packethandler/BufferListener.java diff --git a/G-Earth-UI/src/main/java/gearth/protocol/packethandler/Handler.java b/G-Earth/src/main/java/gearth/protocol/packethandler/Handler.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/protocol/packethandler/Handler.java rename to G-Earth/src/main/java/gearth/protocol/packethandler/Handler.java diff --git a/G-Earth-UI/src/main/java/gearth/protocol/packethandler/IncomingHandler.java b/G-Earth/src/main/java/gearth/protocol/packethandler/IncomingHandler.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/protocol/packethandler/IncomingHandler.java rename to G-Earth/src/main/java/gearth/protocol/packethandler/IncomingHandler.java diff --git a/G-Earth-UI/src/main/java/gearth/protocol/packethandler/OutgoingHandler.java b/G-Earth/src/main/java/gearth/protocol/packethandler/OutgoingHandler.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/protocol/packethandler/OutgoingHandler.java rename to G-Earth/src/main/java/gearth/protocol/packethandler/OutgoingHandler.java diff --git a/G-Earth-UI/src/main/java/gearth/protocol/packethandler/PayloadBuffer.java b/G-Earth/src/main/java/gearth/protocol/packethandler/PayloadBuffer.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/protocol/packethandler/PayloadBuffer.java rename to G-Earth/src/main/java/gearth/protocol/packethandler/PayloadBuffer.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/GEarthController.java b/G-Earth/src/main/java/gearth/ui/GEarthController.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/GEarthController.java rename to G-Earth/src/main/java/gearth/ui/GEarthController.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/SubForm.java b/G-Earth/src/main/java/gearth/ui/SubForm.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/SubForm.java rename to G-Earth/src/main/java/gearth/ui/SubForm.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/UiLoggerController.java b/G-Earth/src/main/java/gearth/ui/UiLoggerController.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/UiLoggerController.java rename to G-Earth/src/main/java/gearth/ui/UiLoggerController.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/BoxButton.java b/G-Earth/src/main/java/gearth/ui/buttons/BoxButton.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/buttons/BoxButton.java rename to G-Earth/src/main/java/gearth/ui/buttons/BoxButton.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/DeleteButton.java b/G-Earth/src/main/java/gearth/ui/buttons/DeleteButton.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/buttons/DeleteButton.java rename to G-Earth/src/main/java/gearth/ui/buttons/DeleteButton.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/EditButton.java b/G-Earth/src/main/java/gearth/ui/buttons/EditButton.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/buttons/EditButton.java rename to G-Earth/src/main/java/gearth/ui/buttons/EditButton.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/ExitButton.java b/G-Earth/src/main/java/gearth/ui/buttons/ExitButton.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/buttons/ExitButton.java rename to G-Earth/src/main/java/gearth/ui/buttons/ExitButton.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/FireButton.java b/G-Earth/src/main/java/gearth/ui/buttons/FireButton.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/buttons/FireButton.java rename to G-Earth/src/main/java/gearth/ui/buttons/FireButton.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/PauseResumeButton.java b/G-Earth/src/main/java/gearth/ui/buttons/PauseResumeButton.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/buttons/PauseResumeButton.java rename to G-Earth/src/main/java/gearth/ui/buttons/PauseResumeButton.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/ReloadButton.java b/G-Earth/src/main/java/gearth/ui/buttons/ReloadButton.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/buttons/ReloadButton.java rename to G-Earth/src/main/java/gearth/ui/buttons/ReloadButton.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/SimpleClickButton.java b/G-Earth/src/main/java/gearth/ui/buttons/SimpleClickButton.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/buttons/SimpleClickButton.java rename to G-Earth/src/main/java/gearth/ui/buttons/SimpleClickButton.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/connection/Connection.java b/G-Earth/src/main/java/gearth/ui/connection/Connection.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/connection/Connection.java rename to G-Earth/src/main/java/gearth/ui/connection/Connection.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/extensions/ExtensionItemContainer.java b/G-Earth/src/main/java/gearth/ui/extensions/ExtensionItemContainer.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/extensions/ExtensionItemContainer.java rename to G-Earth/src/main/java/gearth/ui/extensions/ExtensionItemContainer.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/extensions/ExtensionItemContainerProducer.java b/G-Earth/src/main/java/gearth/ui/extensions/ExtensionItemContainerProducer.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/extensions/ExtensionItemContainerProducer.java rename to G-Earth/src/main/java/gearth/ui/extensions/ExtensionItemContainerProducer.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/extensions/Extensions.java b/G-Earth/src/main/java/gearth/ui/extensions/Extensions.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/extensions/Extensions.java rename to G-Earth/src/main/java/gearth/ui/extensions/Extensions.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/extensions/GEarthExtension.java b/G-Earth/src/main/java/gearth/ui/extensions/GEarthExtension.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/extensions/GEarthExtension.java rename to G-Earth/src/main/java/gearth/ui/extensions/GEarthExtension.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/extensions/GEarthExtensionsRegistrer.java b/G-Earth/src/main/java/gearth/ui/extensions/GEarthExtensionsRegistrer.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/extensions/GEarthExtensionsRegistrer.java rename to G-Earth/src/main/java/gearth/ui/extensions/GEarthExtensionsRegistrer.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/extensions/authentication/Authenticator.java b/G-Earth/src/main/java/gearth/ui/extensions/authentication/Authenticator.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/extensions/authentication/Authenticator.java rename to G-Earth/src/main/java/gearth/ui/extensions/authentication/Authenticator.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/extensions/executer/ExecutionInfo.java b/G-Earth/src/main/java/gearth/ui/extensions/executer/ExecutionInfo.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/extensions/executer/ExecutionInfo.java rename to G-Earth/src/main/java/gearth/ui/extensions/executer/ExecutionInfo.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/extensions/executer/ExtensionRunner.java b/G-Earth/src/main/java/gearth/ui/extensions/executer/ExtensionRunner.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/extensions/executer/ExtensionRunner.java rename to G-Earth/src/main/java/gearth/ui/extensions/executer/ExtensionRunner.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/extensions/executer/ExtensionRunnerFactory.java b/G-Earth/src/main/java/gearth/ui/extensions/executer/ExtensionRunnerFactory.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/extensions/executer/ExtensionRunnerFactory.java rename to G-Earth/src/main/java/gearth/ui/extensions/executer/ExtensionRunnerFactory.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/extensions/executer/NormalExtensionRunner.java b/G-Earth/src/main/java/gearth/ui/extensions/executer/NormalExtensionRunner.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/extensions/executer/NormalExtensionRunner.java rename to G-Earth/src/main/java/gearth/ui/extensions/executer/NormalExtensionRunner.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/info/Info.java b/G-Earth/src/main/java/gearth/ui/info/Info.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/info/Info.java rename to G-Earth/src/main/java/gearth/ui/info/Info.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/injection/Injection.java b/G-Earth/src/main/java/gearth/ui/injection/Injection.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/injection/Injection.java rename to G-Earth/src/main/java/gearth/ui/injection/Injection.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/logger/Logger.java b/G-Earth/src/main/java/gearth/ui/logger/Logger.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/logger/Logger.java rename to G-Earth/src/main/java/gearth/ui/logger/Logger.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/LinuxTerminalLogger.java b/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/LinuxTerminalLogger.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/LinuxTerminalLogger.java rename to G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/LinuxTerminalLogger.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/PacketLogger.java b/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/PacketLogger.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/PacketLogger.java rename to G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/PacketLogger.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/PacketLoggerFactory.java b/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/PacketLoggerFactory.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/PacketLoggerFactory.java rename to G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/PacketLoggerFactory.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/SimpleTerminalLogger.java b/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/SimpleTerminalLogger.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/SimpleTerminalLogger.java rename to G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/SimpleTerminalLogger.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/UiLogger.java b/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/UiLogger.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/UiLogger.java rename to G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/UiLogger.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/scheduler/Interval.java b/G-Earth/src/main/java/gearth/ui/scheduler/Interval.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/scheduler/Interval.java rename to G-Earth/src/main/java/gearth/ui/scheduler/Interval.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/scheduler/ScheduleItem.java b/G-Earth/src/main/java/gearth/ui/scheduler/ScheduleItem.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/scheduler/ScheduleItem.java rename to G-Earth/src/main/java/gearth/ui/scheduler/ScheduleItem.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/scheduler/ScheduleItemContainer.java b/G-Earth/src/main/java/gearth/ui/scheduler/ScheduleItemContainer.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/scheduler/ScheduleItemContainer.java rename to G-Earth/src/main/java/gearth/ui/scheduler/ScheduleItemContainer.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/scheduler/Scheduler.java b/G-Earth/src/main/java/gearth/ui/scheduler/Scheduler.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/scheduler/Scheduler.java rename to G-Earth/src/main/java/gearth/ui/scheduler/Scheduler.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/settings/Settings.java b/G-Earth/src/main/java/gearth/ui/settings/Settings.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/settings/Settings.java rename to G-Earth/src/main/java/gearth/ui/settings/Settings.java diff --git a/G-Earth-UI/src/main/java/gearth/ui/tools/Tools.java b/G-Earth/src/main/java/gearth/ui/tools/Tools.java similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/tools/Tools.java rename to G-Earth/src/main/java/gearth/ui/tools/Tools.java diff --git a/G-Earth-UI/src/main/resources/gearth/ui/G-Earth.fxml b/G-Earth/src/main/resources/gearth/ui/G-Earth.fxml similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/G-Earth.fxml rename to G-Earth/src/main/resources/gearth/ui/G-Earth.fxml diff --git a/G-Earth-UI/src/main/resources/gearth/ui/UiLogger.fxml b/G-Earth/src/main/resources/gearth/ui/UiLogger.fxml similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/UiLogger.fxml rename to G-Earth/src/main/resources/gearth/ui/UiLogger.fxml diff --git a/G-Earth-UI/src/main/resources/gearth/ui/bootstrap3.css b/G-Earth/src/main/resources/gearth/ui/bootstrap3.css similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/bootstrap3.css rename to G-Earth/src/main/resources/gearth/ui/bootstrap3.css diff --git a/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonDelete.png b/G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonDelete.png similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonDelete.png rename to G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonDelete.png diff --git a/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonDeleteHover.png b/G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonDeleteHover.png similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonDeleteHover.png rename to G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonDeleteHover.png diff --git a/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonEdit.png b/G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonEdit.png similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonEdit.png rename to G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonEdit.png diff --git a/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonEditHover.png b/G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonEditHover.png similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonEditHover.png rename to G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonEditHover.png diff --git a/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonExit.png b/G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonExit.png similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonExit.png rename to G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonExit.png diff --git a/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonExitHover.png b/G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonExitHover.png similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonExitHover.png rename to G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonExitHover.png diff --git a/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonFire.png b/G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonFire.png similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonFire.png rename to G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonFire.png diff --git a/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonFireHover.png b/G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonFireHover.png similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonFireHover.png rename to G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonFireHover.png diff --git a/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonPause.png b/G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonPause.png similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonPause.png rename to G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonPause.png diff --git a/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonPauseHover.png b/G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonPauseHover.png similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonPauseHover.png rename to G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonPauseHover.png diff --git a/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonReload.png b/G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonReload.png similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonReload.png rename to G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonReload.png diff --git a/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonReloadHover.png b/G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonReloadHover.png similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonReloadHover.png rename to G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonReloadHover.png diff --git a/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonResume.png b/G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonResume.png similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonResume.png rename to G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonResume.png diff --git a/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonResumeHover.png b/G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonResumeHover.png similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonResumeHover.png rename to G-Earth/src/main/resources/gearth/ui/buttons/files/ButtonResumeHover.png diff --git a/G-Earth-UI/src/main/resources/gearth/ui/connection/Connection.fxml b/G-Earth/src/main/resources/gearth/ui/connection/Connection.fxml similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/connection/Connection.fxml rename to G-Earth/src/main/resources/gearth/ui/connection/Connection.fxml diff --git a/G-Earth-UI/src/main/resources/gearth/ui/extensions/Extensions.fxml b/G-Earth/src/main/resources/gearth/ui/extensions/Extensions.fxml similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/extensions/Extensions.fxml rename to G-Earth/src/main/resources/gearth/ui/extensions/Extensions.fxml diff --git a/G-Earth-UI/src/main/resources/gearth/ui/info/Info.fxml b/G-Earth/src/main/resources/gearth/ui/info/Info.fxml similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/info/Info.fxml rename to G-Earth/src/main/resources/gearth/ui/info/Info.fxml diff --git a/G-Earth-UI/src/main/resources/gearth/ui/injection/Injection.fxml b/G-Earth/src/main/resources/gearth/ui/injection/Injection.fxml similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/injection/Injection.fxml rename to G-Earth/src/main/resources/gearth/ui/injection/Injection.fxml diff --git a/G-Earth-UI/src/main/resources/gearth/ui/logger.css b/G-Earth/src/main/resources/gearth/ui/logger.css similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/logger.css rename to G-Earth/src/main/resources/gearth/ui/logger.css diff --git a/G-Earth-UI/src/main/resources/gearth/ui/logger/Logger.fxml b/G-Earth/src/main/resources/gearth/ui/logger/Logger.fxml similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/logger/Logger.fxml rename to G-Earth/src/main/resources/gearth/ui/logger/Logger.fxml diff --git a/G-Earth-UI/src/main/resources/gearth/ui/scheduler/Scheduler.fxml b/G-Earth/src/main/resources/gearth/ui/scheduler/Scheduler.fxml similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/scheduler/Scheduler.fxml rename to G-Earth/src/main/resources/gearth/ui/scheduler/Scheduler.fxml diff --git a/G-Earth-UI/src/main/resources/gearth/ui/settings/Settings.fxml b/G-Earth/src/main/resources/gearth/ui/settings/Settings.fxml similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/settings/Settings.fxml rename to G-Earth/src/main/resources/gearth/ui/settings/Settings.fxml diff --git a/G-Earth-UI/src/main/resources/gearth/ui/tools/Tools.fxml b/G-Earth/src/main/resources/gearth/ui/tools/Tools.fxml similarity index 100% rename from G-Earth-UI/src/main/resources/gearth/ui/tools/Tools.fxml rename to G-Earth/src/main/resources/gearth/ui/tools/Tools.fxml diff --git a/pom.xml b/pom.xml index 448200d..0dcdfd5 100644 --- a/pom.xml +++ b/pom.xml @@ -14,12 +14,12 @@ 1.8 - G-Earth + G-Earth-Parent https://github.com/sirjonasxx/G-Earth Cross Platform Habbo packetlogger/manipulator - G-Earth-UI + G-Earth Extensions/AdminOnConnect