nitro/G-Earth
1
0
Fork 0
mirror of https://github.com/sirjonasxx/G-Earth.git synced 2024-11-23 08:50:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

rename things

Browse Source
This commit is contained in:
sirjonasxx 2021-08-14 02:06:03 +02:00
parent 6cf8ecd193
commit ec6e4c1c41
46 changed files with 99 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
G-Earth/src/main/java/gearth/extensions/Extension.java
View File

@ -5,11 +5,10 @@ import gearth.protocol.HMessage;
import gearth.protocol.HPacket; import gearth.protocol.HPacket;
import gearth.protocol.connection.HClient; import gearth.protocol.connection.HClient;
import gearth.services.Constants; import gearth.services.Constants;
import gearth.services.extensionhandler.extensions.implementations.network.NetworkExtensionInfo; import gearth.services.extension_handler.extensions.implementations.network.NetworkExtensionInfo;
import java.io.*; import java.io.*;
import java.net.Socket; import java.net.Socket;
import java.util.ArrayList;
/** /**
* Created by Jonas on 23/06/18. * Created by Jonas on 23/06/18.

4
G-Earth/src/main/java/gearth/extensions/InternalExtensionBuilder.java
View File

@ -5,8 +5,8 @@ import gearth.services.packet_info.PacketInfoManager;
import gearth.protocol.HMessage; import gearth.protocol.HMessage;
import gearth.protocol.HPacket; import gearth.protocol.HPacket;
import gearth.protocol.connection.HClient; import gearth.protocol.connection.HClient;
import gearth.services.extensionhandler.extensions.ExtensionType; import gearth.services.extension_handler.extensions.ExtensionType;
import gearth.services.extensionhandler.extensions.GEarthExtension; import gearth.services.extension_handler.extensions.GEarthExtension;
// wraps internal GEarthExtension class to IExtension interface // wraps internal GEarthExtension class to IExtension interface
// to allow internal extensions that follow the same remote-extensions interface // to allow internal extensions that follow the same remote-extensions interface

4
G-Earth/src/main/java/gearth/extensions/InternalExtensionFormBuilder.java
View File

@ -1,8 +1,8 @@
package gearth.extensions; package gearth.extensions;
import gearth.Main; import gearth.Main;
import gearth.services.extensionhandler.extensions.GEarthExtension; import gearth.services.extension_handler.extensions.GEarthExtension;
import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducerObserver; import gearth.services.extension_handler.extensions.extensionproducers.ExtensionProducerObserver;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.stage.Stage; import javafx.stage.Stage;

2
G-Earth/src/main/java/gearth/protocol/HConnection.java
View File

@ -9,7 +9,7 @@ import gearth.protocol.connection.proxy.ProxyProvider;
import gearth.protocol.connection.proxy.ProxyProviderFactory; import gearth.protocol.connection.proxy.ProxyProviderFactory;
import gearth.protocol.connection.proxy.flash.unix.LinuxRawIpFlashProxyProvider; import gearth.protocol.connection.proxy.flash.unix.LinuxRawIpFlashProxyProvider;
import gearth.protocol.connection.proxy.unity.UnityProxyProvider; import gearth.protocol.connection.proxy.unity.UnityProxyProvider;
import gearth.services.extensionhandler.ExtensionHandler; import gearth.services.extension_handler.ExtensionHandler;
import java.io.IOException; import java.io.IOException;

2
G-Earth/src/main/java/gearth/protocol/packethandler/PacketHandler.java
View File

@ -3,7 +3,7 @@ package gearth.protocol.packethandler;
import gearth.misc.listenerpattern.Observable; import gearth.misc.listenerpattern.Observable;
import gearth.protocol.HMessage; import gearth.protocol.HMessage;
import gearth.protocol.TrafficListener; import gearth.protocol.TrafficListener;
import gearth.services.extensionhandler.ExtensionHandler; import gearth.services.extension_handler.ExtensionHandler;
import java.io.IOException; import java.io.IOException;

5
G-Earth/src/main/java/gearth/protocol/packethandler/flash/FlashPacketHandler.java
View File

@ -4,12 +4,11 @@ import gearth.misc.listenerpattern.Observable;
import gearth.protocol.HConnection; import gearth.protocol.HConnection;
import gearth.protocol.HMessage; import gearth.protocol.HMessage;
import gearth.protocol.HPacket; import gearth.protocol.HPacket;
import gearth.protocol.TrafficListener;
import gearth.protocol.crypto.RC4; import gearth.protocol.crypto.RC4;
import gearth.protocol.packethandler.PacketHandler; import gearth.protocol.packethandler.PacketHandler;
import gearth.protocol.packethandler.PayloadBuffer; import gearth.protocol.packethandler.PayloadBuffer;
import gearth.services.extensionhandler.ExtensionHandler; import gearth.services.extension_handler.ExtensionHandler;
import gearth.services.extensionhandler.OnHMessageHandled; import gearth.services.extension_handler.OnHMessageHandled;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;

2
G-Earth/src/main/java/gearth/protocol/packethandler/flash/IncomingFlashPacketHandler.java
View File

@ -4,7 +4,7 @@ import gearth.misc.listenerpattern.Observable;
import gearth.protocol.HMessage; import gearth.protocol.HMessage;
import gearth.protocol.HPacket; import gearth.protocol.HPacket;
import gearth.protocol.TrafficListener; import gearth.protocol.TrafficListener;
import gearth.services.extensionhandler.ExtensionHandler; import gearth.services.extension_handler.ExtensionHandler;
import java.io.OutputStream; import java.io.OutputStream;

2
G-Earth/src/main/java/gearth/protocol/packethandler/flash/OutgoingFlashPacketHandler.java
View File

@ -3,7 +3,7 @@ package gearth.protocol.packethandler.flash;
import gearth.misc.listenerpattern.Observable; import gearth.misc.listenerpattern.Observable;
import gearth.protocol.HMessage; import gearth.protocol.HMessage;
import gearth.protocol.HPacket; import gearth.protocol.HPacket;
import gearth.services.extensionhandler.ExtensionHandler; import gearth.services.extension_handler.ExtensionHandler;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;

5
G-Earth/src/main/java/gearth/protocol/packethandler/unity/UnityPacketHandler.java
View File

@ -4,9 +4,8 @@ import gearth.protocol.HMessage;
import gearth.protocol.HPacket; import gearth.protocol.HPacket;
import gearth.protocol.packethandler.ByteArrayUtils; import gearth.protocol.packethandler.ByteArrayUtils;
import gearth.protocol.packethandler.PacketHandler; import gearth.protocol.packethandler.PacketHandler;
import gearth.protocol.packethandler.PayloadBuffer; import gearth.services.extension_handler.ExtensionHandler;
import gearth.services.extensionhandler.ExtensionHandler; import gearth.services.extension_handler.OnHMessageHandled;
import gearth.services.extensionhandler.OnHMessageHandled;
import javax.websocket.Session; import javax.websocket.Session;
import java.io.IOException; import java.io.IOException;

7
G-Earth/src/main/java/gearth/services/extension_handler/ExtensionConnectedListener.java Normal file
View File

@ -0,0 +1,7 @@
package gearth.services.extension_handler;
import gearth.services.extension_handler.extensions.GEarthExtension;
public interface ExtensionConnectedListener {
void onExtensionConnect(GEarthExtension e);
}

13
G-Earth/src/main/java/gearth/services/extensionhandler/ExtensionHandler.java → G-Earth/src/main/java/gearth/services/extension_handler/ExtensionHandler.java
View File

@ -1,4 +1,4 @@
package gearth.services.extensionhandler; package gearth.services.extension_handler;
import gearth.Main; import gearth.Main;
import gearth.misc.listenerpattern.Observable; import gearth.misc.listenerpattern.Observable;
@ -6,12 +6,11 @@ import gearth.protocol.HConnection;
import gearth.protocol.HMessage; import gearth.protocol.HMessage;
import gearth.protocol.HPacket; import gearth.protocol.HPacket;
import gearth.protocol.connection.HState; import gearth.protocol.connection.HState;
import gearth.services.extensionhandler.extensions.ExtensionListener; import gearth.services.extension_handler.extensions.ExtensionListener;
import gearth.services.extensionhandler.extensions.GEarthExtension; import gearth.services.extension_handler.extensions.GEarthExtension;
import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducer; import gearth.services.extension_handler.extensions.extensionproducers.ExtensionProducer;
import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducerFactory; import gearth.services.extension_handler.extensions.extensionproducers.ExtensionProducerFactory;
import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducerObserver; import gearth.services.extension_handler.extensions.extensionproducers.ExtensionProducerObserver;
import gearth.services.packet_info.PacketInfoManager;
import javafx.util.Pair; import javafx.util.Pair;
import java.io.IOException; import java.io.IOException;

2
G-Earth/src/main/java/gearth/services/extensionhandler/OnHMessageHandled.java → G-Earth/src/main/java/gearth/services/extension_handler/OnHMessageHandled.java
View File

@ -1,4 +1,4 @@
package gearth.services.extensionhandler; package gearth.services.extension_handler;
import gearth.protocol.HMessage; import gearth.protocol.HMessage;

2
G-Earth/src/main/java/gearth/services/extensionhandler/extensions/ExtensionListener.java → G-Earth/src/main/java/gearth/services/extension_handler/extensions/ExtensionListener.java
View File

@ -1,4 +1,4 @@
package gearth.services.extensionhandler.extensions; package gearth.services.extension_handler.extensions;
import gearth.protocol.HMessage; import gearth.protocol.HMessage;
import gearth.protocol.HPacket; import gearth.protocol.HPacket;

2
G-Earth/src/main/java/gearth/services/extensionhandler/extensions/ExtensionType.java → G-Earth/src/main/java/gearth/services/extension_handler/extensions/ExtensionType.java
View File

@ -1,4 +1,4 @@
package gearth.services.extensionhandler.extensions; package gearth.services.extension_handler.extensions;
public enum ExtensionType { public enum ExtensionType {
INTERNAL, INTERNAL,

8
G-Earth/src/main/java/gearth/services/extensionhandler/extensions/GEarthExtension.java → G-Earth/src/main/java/gearth/services/extension_handler/extensions/GEarthExtension.java
View File

@ -1,4 +1,4 @@
package gearth.services.extensionhandler.extensions; package gearth.services.extension_handler.extensions;
import gearth.misc.listenerpattern.Observable; import gearth.misc.listenerpattern.Observable;
import gearth.misc.listenerpattern.SynchronizedObservable; import gearth.misc.listenerpattern.SynchronizedObservable;
@ -6,9 +6,9 @@ import gearth.services.packet_info.PacketInfoManager;
import gearth.protocol.HMessage; import gearth.protocol.HMessage;
import gearth.protocol.HPacket; import gearth.protocol.HPacket;
import gearth.protocol.connection.HClient; import gearth.protocol.connection.HClient;
import gearth.services.extensionhandler.extensions.listeners.OmRemoveClickListener; import gearth.services.extension_handler.extensions.listeners.OmRemoveClickListener;
import gearth.services.extensionhandler.extensions.listeners.OnClickListener; import gearth.services.extension_handler.extensions.listeners.OnClickListener;
import gearth.services.extensionhandler.extensions.listeners.OnDeleteListener; import gearth.services.extension_handler.extensions.listeners.OnDeleteListener;
public abstract class GEarthExtension { public abstract class GEarthExtension {

2
G-Earth/src/main/java/gearth/services/extensionhandler/extensions/extensionproducers/ExtensionProducer.java → G-Earth/src/main/java/gearth/services/extension_handler/extensions/extensionproducers/ExtensionProducer.java
View File

@ -1,4 +1,4 @@
package gearth.services.extensionhandler.extensions.extensionproducers; package gearth.services.extension_handler.extensions.extensionproducers;
public interface ExtensionProducer { public interface ExtensionProducer {

7
G-Earth/src/main/java/gearth/services/extensionhandler/extensions/extensionproducers/ExtensionProducerFactory.java → G-Earth/src/main/java/gearth/services/extension_handler/extensions/extensionproducers/ExtensionProducerFactory.java
View File

@ -1,10 +1,9 @@
package gearth.services.extensionhandler.extensions.extensionproducers; package gearth.services.extension_handler.extensions.extensionproducers;
import gearth.services.extensionhandler.extensions.implementations.network.NetworkExtensionsProducer; import gearth.services.extension_handler.extensions.implementations.network.NetworkExtensionsProducer;
import gearth.services.extensionhandler.extensions.implementations.simple.SimpleExtensionProducer; import gearth.services.extension_handler.extensions.implementations.simple.SimpleExtensionProducer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
public class ExtensionProducerFactory { public class ExtensionProducerFactory {

7
G-Earth/src/main/java/gearth/services/extension_handler/extensions/extensionproducers/ExtensionProducerObserver.java Normal file
View File

@ -0,0 +1,7 @@
package gearth.services.extension_handler.extensions.extensionproducers;
import gearth.services.extension_handler.extensions.GEarthExtension;
public interface ExtensionProducerObserver {
void onExtensionProduced(GEarthExtension extension);
}

6
G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/NetworkExtension.java → G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/NetworkExtension.java
View File

@ -1,10 +1,10 @@
package gearth.services.extensionhandler.extensions.implementations.network; package gearth.services.extension_handler.extensions.implementations.network;
import gearth.services.packet_info.PacketInfoManager; import gearth.services.packet_info.PacketInfoManager;
import gearth.protocol.HMessage; import gearth.protocol.HMessage;
import gearth.protocol.connection.HClient; import gearth.protocol.connection.HClient;
import gearth.services.extensionhandler.extensions.ExtensionType; import gearth.services.extension_handler.extensions.ExtensionType;
import gearth.services.extensionhandler.extensions.GEarthExtension; import gearth.services.extension_handler.extensions.GEarthExtension;
import gearth.protocol.HPacket; import gearth.protocol.HPacket;
import java.io.DataInputStream; import java.io.DataInputStream;

2
G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/NetworkExtensionInfo.java → G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/NetworkExtensionInfo.java
View File

@ -1,4 +1,4 @@
package gearth.services.extensionhandler.extensions.implementations.network; package gearth.services.extension_handler.extensions.implementations.network;
public class NetworkExtensionInfo { public class NetworkExtensionInfo {

10
G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/NetworkExtensionsProducer.java → G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/NetworkExtensionsProducer.java
View File

@ -1,9 +1,9 @@
package gearth.services.extensionhandler.extensions.implementations.network; package gearth.services.extension_handler.extensions.implementations.network;
import gearth.protocol.HPacket; import gearth.protocol.HPacket;
import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducer; import gearth.services.extension_handler.extensions.extensionproducers.ExtensionProducer;
import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducerObserver; import gearth.services.extension_handler.extensions.extensionproducers.ExtensionProducerObserver;
import gearth.services.extensionhandler.extensions.implementations.network.authentication.Authenticator; import gearth.services.extension_handler.extensions.implementations.network.authentication.Authenticator;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.IOException; import java.io.IOException;
@ -67,7 +67,7 @@ public class NetworkExtensionsProducer implements ExtensionProducer {
observer.onExtensionProduced(gEarthExtension); observer.onExtensionProduced(gEarthExtension);
} }
else { else {
gEarthExtension.close(); //you shall not pass... gEarthExtension.close();
} }
break; break;

4
G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/authentication/Authenticator.java → G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/authentication/Authenticator.java
View File

@ -1,7 +1,7 @@
package gearth.services.extensionhandler.extensions.implementations.network.authentication; package gearth.services.extension_handler.extensions.implementations.network.authentication;
import gearth.misc.ConfirmationDialog; import gearth.misc.ConfirmationDialog;
import gearth.services.extensionhandler.extensions.implementations.network.NetworkExtension; import gearth.services.extension_handler.extensions.implementations.network.NetworkExtension;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.scene.control.Alert; import javafx.scene.control.Alert;
import javafx.scene.control.ButtonType; import javafx.scene.control.ButtonType;

2
G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/executer/ExecutionInfo.java → G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/executer/ExecutionInfo.java
View File

@ -1,4 +1,4 @@
package gearth.services.extensionhandler.extensions.implementations.network.executer; package gearth.services.extension_handler.extensions.implementations.network.executer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;

2
G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/executer/ExtensionRunner.java → G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/executer/ExtensionRunner.java
View File

@ -1,4 +1,4 @@
package gearth.services.extensionhandler.extensions.implementations.network.executer; package gearth.services.extension_handler.extensions.implementations.network.executer;
/** /**
* Created by Jonas on 21/09/18. * Created by Jonas on 21/09/18.

2
G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/executer/ExtensionRunnerFactory.java → G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/executer/ExtensionRunnerFactory.java
View File

@ -1,4 +1,4 @@
package gearth.services.extensionhandler.extensions.implementations.network.executer; package gearth.services.extension_handler.extensions.implementations.network.executer;
/** /**
* Created by Jonas on 22/09/18. * Created by Jonas on 22/09/18.

4
G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/executer/NormalExtensionRunner.java → G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/executer/NormalExtensionRunner.java
View File

@ -1,7 +1,7 @@
package gearth.services.extensionhandler.extensions.implementations.network.executer; package gearth.services.extension_handler.extensions.implementations.network.executer;
import gearth.Main; import gearth.Main;
import gearth.services.extensionhandler.extensions.implementations.network.authentication.Authenticator; import gearth.services.extension_handler.extensions.implementations.network.authentication.Authenticator;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;

6
G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/simple/ExampleExtension.java → G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/simple/ExampleExtension.java
View File

@ -1,11 +1,11 @@
package gearth.services.extensionhandler.extensions.implementations.simple; package gearth.services.extension_handler.extensions.implementations.simple;
import gearth.services.packet_info.PacketInfoManager; import gearth.services.packet_info.PacketInfoManager;
import gearth.protocol.HMessage; import gearth.protocol.HMessage;
import gearth.protocol.HPacket; import gearth.protocol.HPacket;
import gearth.protocol.connection.HClient; import gearth.protocol.connection.HClient;
import gearth.services.extensionhandler.extensions.ExtensionType; import gearth.services.extension_handler.extensions.ExtensionType;
import gearth.services.extensionhandler.extensions.GEarthExtension; import gearth.services.extension_handler.extensions.GEarthExtension;
public class ExampleExtension extends GEarthExtension { public class ExampleExtension extends GEarthExtension {
@Override @Override

0
G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/simple/README.md → G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/simple/README.md
View File

6
G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/simple/SimpleExtensionProducer.java → G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/simple/SimpleExtensionProducer.java
View File

@ -1,8 +1,8 @@
package gearth.services.extensionhandler.extensions.implementations.simple; package gearth.services.extension_handler.extensions.implementations.simple;
import gearth.extensions.InternalExtensionFormBuilder; import gearth.extensions.InternalExtensionFormBuilder;
import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducer; import gearth.services.extension_handler.extensions.extensionproducers.ExtensionProducer;
import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducerObserver; import gearth.services.extension_handler.extensions.extensionproducers.ExtensionProducerObserver;
import gearth.services.internal_extensions.blockreplacepackets.BlockAndReplacePackets; import gearth.services.internal_extensions.blockreplacepackets.BlockAndReplacePackets;
import gearth.services.internal_extensions.packetinfoexplorer.PacketInfoExplorer; import gearth.services.internal_extensions.packetinfoexplorer.PacketInfoExplorer;

2
G-Earth/src/main/java/gearth/services/extensionhandler/extensions/listeners/OmRemoveClickListener.java → G-Earth/src/main/java/gearth/services/extension_handler/extensions/listeners/OmRemoveClickListener.java
View File

@ -1,4 +1,4 @@
package gearth.services.extensionhandler.extensions.listeners; package gearth.services.extension_handler.extensions.listeners;
public interface OmRemoveClickListener { public interface OmRemoveClickListener {
void onRemove(); void onRemove();

5
G-Earth/src/main/java/gearth/services/extension_handler/extensions/listeners/OnClickListener.java Normal file
View File

@ -0,0 +1,5 @@
package gearth.services.extension_handler.extensions.listeners;
public interface OnClickListener {
void onClick();
}

5
G-Earth/src/main/java/gearth/services/extension_handler/extensions/listeners/OnDeleteListener.java Normal file
View File

@ -0,0 +1,5 @@
package gearth.services.extension_handler.extensions.listeners;
public interface OnDeleteListener {
void onDelete();
}

7
G-Earth/src/main/java/gearth/services/extensionhandler/ExtensionConnectedListener.java
View File

@ -1,7 +0,0 @@
package gearth.services.extensionhandler;
import gearth.services.extensionhandler.extensions.GEarthExtension;
public interface ExtensionConnectedListener {
void onExtensionConnect(GEarthExtension e);
}

7
G-Earth/src/main/java/gearth/services/extensionhandler/extensions/extensionproducers/ExtensionProducerObserver.java
View File

@ -1,7 +0,0 @@
package gearth.services.extensionhandler.extensions.extensionproducers;
import gearth.services.extensionhandler.extensions.GEarthExtension;
public interface ExtensionProducerObserver {
void onExtensionProduced(GEarthExtension extension);
}

5
G-Earth/src/main/java/gearth/services/extensionhandler/extensions/listeners/OnClickListener.java
View File

@ -1,5 +0,0 @@
package gearth.services.extensionhandler.extensions.listeners;
public interface OnClickListener {
void onClick();
}

5
G-Earth/src/main/java/gearth/services/extensionhandler/extensions/listeners/OnDeleteListener.java
View File

@ -1,5 +0,0 @@
package gearth.services.extensionhandler.extensions.listeners;
public interface OnDeleteListener {
void onDelete();
}

6
G-Earth/src/main/java/gearth/services/gpython/GPythonShell.java → G-Earth/src/main/java/gearth/services/g_python/GPythonShell.java
View File

@ -1,4 +1,4 @@
package gearth.services.gpython; package gearth.services.g_python;
import gearth.Main; import gearth.Main;
import gearth.ui.extra.ExtraController; import gearth.ui.extra.ExtraController;
@ -11,11 +11,7 @@ import javafx.scene.layout.FlowPane;
import javafx.scene.layout.Region; import javafx.scene.layout.Region;
import java.io.*; import java.io.*;
import java.net.URI;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;

2
G-Earth/src/main/java/gearth/services/gpython/GPythonVersionUtils.java → G-Earth/src/main/java/gearth/services/g_python/GPythonVersionUtils.java
View File

@ -1,4 +1,4 @@
package gearth.services.gpython; package gearth.services.g_python;
import org.apache.maven.artifact.versioning.ComparableVersion; import org.apache.maven.artifact.versioning.ComparableVersion;

2
G-Earth/src/main/java/gearth/services/gpython/OnQtConsoleLaunch.java → G-Earth/src/main/java/gearth/services/g_python/OnQtConsoleLaunch.java
View File

@ -1,4 +1,4 @@
package gearth.services.gpython; package gearth.services.g_python;
public interface OnQtConsoleLaunch { public interface OnQtConsoleLaunch {

12
G-Earth/src/main/java/gearth/ui/extensions/ExtensionItemContainer.java
View File

@ -1,7 +1,7 @@
package gearth.ui.extensions; package gearth.ui.extensions;
import gearth.services.extensionhandler.extensions.ExtensionType; import gearth.services.extension_handler.extensions.ExtensionType;
import gearth.services.extensionhandler.extensions.GEarthExtension; import gearth.services.extension_handler.extensions.GEarthExtension;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.event.EventHandler; import javafx.event.EventHandler;
import javafx.geometry.Insets; import javafx.geometry.Insets;
@ -13,10 +13,10 @@ import javafx.scene.paint.Paint;
import javafx.scene.text.Font; import javafx.scene.text.Font;
import gearth.misc.ConfirmationDialog; import gearth.misc.ConfirmationDialog;
import gearth.ui.buttons.*; import gearth.ui.buttons.*;
import gearth.services.extensionhandler.extensions.implementations.network.executer.ExecutionInfo; import gearth.services.extension_handler.extensions.implementations.network.executer.ExecutionInfo;
import gearth.services.extensionhandler.extensions.implementations.network.executer.ExtensionRunner; import gearth.services.extension_handler.extensions.implementations.network.executer.ExtensionRunner;
import gearth.services.extensionhandler.extensions.implementations.network.executer.ExtensionRunnerFactory; import gearth.services.extension_handler.extensions.implementations.network.executer.ExtensionRunnerFactory;
import gearth.services.extensionhandler.extensions.implementations.network.executer.NormalExtensionRunner; import gearth.services.extension_handler.extensions.implementations.network.executer.NormalExtensionRunner;
import java.nio.file.Paths; import java.nio.file.Paths;

2
G-Earth/src/main/java/gearth/ui/extensions/ExtensionItemContainerProducer.java
View File

@ -1,6 +1,6 @@
package gearth.ui.extensions; package gearth.ui.extensions;
import gearth.services.extensionhandler.extensions.GEarthExtension; import gearth.services.extension_handler.extensions.GEarthExtension;
import javafx.scene.Node; import javafx.scene.Node;
import javafx.scene.control.ScrollPane; import javafx.scene.control.ScrollPane;
import javafx.scene.layout.VBox; import javafx.scene.layout.VBox;

24
G-Earth/src/main/java/gearth/ui/extensions/ExtensionsController.java
View File

@ -1,31 +1,23 @@
package gearth.ui.extensions; package gearth.ui.extensions;
import gearth.Main; import gearth.services.extension_handler.ExtensionHandler;
import gearth.services.extensionhandler.ExtensionConnectedListener; import gearth.services.extension_handler.extensions.ExtensionListener;
import gearth.services.extensionhandler.ExtensionHandler; import gearth.services.extension_handler.extensions.implementations.network.NetworkExtensionsProducer;
import gearth.services.extensionhandler.extensions.ExtensionListener; import gearth.services.extension_handler.extensions.implementations.network.authentication.Authenticator;
import gearth.services.extensionhandler.extensions.GEarthExtension; import gearth.services.extension_handler.extensions.implementations.network.executer.ExecutionInfo;
import gearth.services.extensionhandler.extensions.implementations.network.NetworkExtensionsProducer; import gearth.services.extension_handler.extensions.implementations.network.executer.ExtensionRunner;
import gearth.services.extensionhandler.extensions.implementations.network.authentication.Authenticator; import gearth.services.extension_handler.extensions.implementations.network.executer.ExtensionRunnerFactory;
import gearth.services.extensionhandler.extensions.implementations.network.executer.ExecutionInfo; import gearth.services.g_python.GPythonShell;
import gearth.services.extensionhandler.extensions.implementations.network.executer.ExtensionRunner;
import gearth.services.extensionhandler.extensions.implementations.network.executer.ExtensionRunnerFactory;
import gearth.services.gpython.GPythonShell;
import gearth.services.gpython.OnQtConsoleLaunch;
import gearth.ui.SubForm; import gearth.ui.SubForm;
import gearth.ui.extensions.logger.ExtensionLogger; import gearth.ui.extensions.logger.ExtensionLogger;
import gearth.ui.extra.ExtraController;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.scene.control.*; import javafx.scene.control.*;
import javafx.scene.layout.FlowPane;
import javafx.scene.layout.GridPane; import javafx.scene.layout.GridPane;
import javafx.scene.layout.Region;
import javafx.scene.layout.VBox; import javafx.scene.layout.VBox;
import javafx.stage.FileChooser; import javafx.stage.FileChooser;
import java.io.File; import java.io.File;
import java.io.IOException;
/** /**
* Created by Jonas on 06/04/18. * Created by Jonas on 06/04/18.

2
G-Earth/src/main/java/gearth/ui/extra/ExtraController.java
View File

@ -6,7 +6,7 @@ import gearth.protocol.HConnection;
import gearth.protocol.connection.HState; import gearth.protocol.connection.HState;
import gearth.protocol.connection.proxy.ProxyProviderFactory; import gearth.protocol.connection.proxy.ProxyProviderFactory;
import gearth.protocol.connection.proxy.SocksConfiguration; import gearth.protocol.connection.proxy.SocksConfiguration;
import gearth.services.gpython.GPythonVersionUtils; import gearth.services.g_python.GPythonVersionUtils;
import gearth.ui.SubForm; import gearth.ui.SubForm;
import gearth.ui.info.InfoController; import gearth.ui.info.InfoController;
import javafx.application.Platform; import javafx.application.Platform;

4
G-Earth/src/main/java/gearth/ui/logger/LoggerController.java
View File

@ -1,8 +1,6 @@
package gearth.ui.logger; package gearth.ui.logger;
import gearth.extensions.parsers.HDirection;
import gearth.protocol.connection.HState; import gearth.protocol.connection.HState;
import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducer;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.scene.control.Button; import javafx.scene.control.Button;
@ -12,14 +10,12 @@ import javafx.scene.input.KeyCode;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;
import javafx.scene.text.Text; import javafx.scene.text.Text;
import javafx.scene.text.TextFlow; import javafx.scene.text.TextFlow;
import gearth.protocol.HConnection;
import gearth.protocol.HMessage; import gearth.protocol.HMessage;
import gearth.ui.SubForm; import gearth.ui.SubForm;
import gearth.ui.logger.loggerdisplays.PacketLogger; import gearth.ui.logger.loggerdisplays.PacketLogger;
import gearth.ui.logger.loggerdisplays.PacketLoggerFactory; import gearth.ui.logger.loggerdisplays.PacketLoggerFactory;
import java.util.Calendar; import java.util.Calendar;
import java.util.function.Predicate;
public class LoggerController extends SubForm { public class LoggerController extends SubForm {

6
G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/PacketLoggerFactory.java
View File

@ -3,9 +3,9 @@ package gearth.ui.logger.loggerdisplays;
import gearth.Main; import gearth.Main;
import gearth.extensions.InternalExtensionFormBuilder; import gearth.extensions.InternalExtensionFormBuilder;
import gearth.misc.OSValidator; import gearth.misc.OSValidator;
import gearth.services.extensionhandler.ExtensionHandler; import gearth.services.extension_handler.ExtensionHandler;
import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducer; import gearth.services.extension_handler.extensions.extensionproducers.ExtensionProducer;
import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducerObserver; import gearth.services.extension_handler.extensions.extensionproducers.ExtensionProducerObserver;
import gearth.services.internal_extensions.uilogger.UiLogger; import gearth.services.internal_extensions.uilogger.UiLogger;
/** /**

0
G-Earth/src/main/resources/gearth/services/gpython/init_script.py → G-Earth/src/main/resources/gearth/services/g_python/init_script.py
View File