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