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

Invert FLASH to SHOCKWAVE checks to fix NITRO compatibility

Browse Source
This commit is contained in:
UnfamiliarLegacy 2024-07-20 06:59:25 +02:00
parent 2bb833e7ba
commit 62ef67b308
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
G-Earth/src/main/java/gearth/protocol/connection/packetsafety/PacketTypeChecker.java
View File

@ -26,7 +26,7 @@ public class PacketTypeChecker {
throw new PacketTypeException(String.format("ShockPacketIncoming expected for %s", clientType)); throw new PacketTypeException(String.format("ShockPacketIncoming expected for %s", clientType));
} }
} else if (packet.getFormat() != HPacketFormat.EVA_WIRE) { } else if (packet.getFormat() != HPacketFormat.EVA_WIRE) {
throw new PacketTypeException(String.format("Invalid packet, expected HPacket for %s", clientType)); throw new PacketTypeException(String.format("Invalid packet, expected %s for client type %s, got %s", HPacketFormat.EVA_WIRE, clientType, packet.getFormat()));
} }
} }
} }

8
G-Earth/src/main/java/gearth/protocol/connection/proxy/ProxyProviderFactory.java
View File

@ -101,7 +101,7 @@ public class ProxyProviderFactory {
} }
public ProxyProvider provide(HClient client) { public ProxyProvider provide(HClient client) {
return provide(client, client == HClient.FLASH ? autoDetectHosts : autoDetectHostsOrigins); return provide(client, client == HClient.SHOCKWAVE ? autoDetectHostsOrigins : autoDetectHosts);
} }
public ProxyProvider provide(HClient client, String domain, int port) { public ProxyProvider provide(HClient client, String domain, int port) {
@ -152,9 +152,9 @@ public class ProxyProviderFactory {
} }
private ProxyProvider provide(HClient client, List<String> potentialHosts) { private ProxyProvider provide(HClient client, List<String> potentialHosts) {
return client == HClient.FLASH return client == HClient.SHOCKWAVE
? new FlashProxy(proxySetter, stateSetter, hConnection, potentialHosts, socksConfig.useSocks() && !socksConfig.onlyUseIfNeeded()) ? new ShockwaveProxy(proxySetter, stateSetter, hConnection, potentialHosts)
: new ShockwaveProxy(proxySetter, stateSetter, hConnection, potentialHosts); : new FlashProxy(proxySetter, stateSetter, hConnection, potentialHosts, socksConfig.useSocks() && !socksConfig.onlyUseIfNeeded());
} }
public static void setSocksConfig(SocksConfiguration configuration) { public static void setSocksConfig(SocksConfiguration configuration) {

6
G-Earth/src/main/java/gearth/ui/subforms/injection/InjectionController.java
View File

@ -117,7 +117,7 @@ public class InjectionController extends SubForm {
lbl_corruption.getStyleClass().add("not-corrupted-label"); lbl_corruption.getStyleClass().add("not-corrupted-label");
// For Shockwave parse with either WEDGIE_INCOMING or WEDGIE_OUTGOING, both will validate the same expression. // For Shockwave parse with either WEDGIE_INCOMING or WEDGIE_OUTGOING, both will validate the same expression.
HPacketFormat format = getHConnection().getClientType() == HClient.FLASH ? HPacketFormat.EVA_WIRE : HPacketFormat.WEDGIE_INCOMING; HPacketFormat format = getHConnection().getClientType() == HClient.SHOCKWAVE ? HPacketFormat.WEDGIE_INCOMING : HPacketFormat.EVA_WIRE;
HPacket[] packets = parsePackets(format, inputPacket.getText()); HPacket[] packets = parsePackets(format, inputPacket.getText());
if (packets.length == 0) { if (packets.length == 0) {
@ -203,7 +203,7 @@ public class InjectionController extends SubForm {
} }
public void sendToServer_clicked(ActionEvent actionEvent) { public void sendToServer_clicked(ActionEvent actionEvent) {
HPacketFormat format = getHConnection().getClientType() == HClient.FLASH ? HPacketFormat.EVA_WIRE : HPacketFormat.WEDGIE_OUTGOING; HPacketFormat format = getHConnection().getClientType() == HClient.SHOCKWAVE ? HPacketFormat.WEDGIE_OUTGOING : HPacketFormat.EVA_WIRE;
HPacket[] packets = parsePackets(format, inputPacket.getText()); HPacket[] packets = parsePackets(format, inputPacket.getText());
for (HPacket packet : packets) { for (HPacket packet : packets) {
getHConnection().sendToServer(packet); getHConnection().sendToServer(packet);
@ -214,7 +214,7 @@ public class InjectionController extends SubForm {
} }
public void sendToClient_clicked(ActionEvent actionEvent) { public void sendToClient_clicked(ActionEvent actionEvent) {
HPacketFormat format = getHConnection().getClientType() == HClient.FLASH ? HPacketFormat.EVA_WIRE : HPacketFormat.WEDGIE_INCOMING; HPacketFormat format = getHConnection().getClientType() == HClient.SHOCKWAVE ? HPacketFormat.WEDGIE_INCOMING : HPacketFormat.EVA_WIRE;
HPacket[] packets = parsePackets(format, inputPacket.getText()); HPacket[] packets = parsePackets(format, inputPacket.getText());
for (HPacket packet : packets) { for (HPacket packet : packets) {
getHConnection().sendToClient(packet); getHConnection().sendToClient(packet);

2
pom.xml
View File

@ -11,7 +11,7 @@
<properties> <properties>
<!-- Version of the application. --> <!-- Version of the application. -->
<revision>1.5.4-beta-7</revision> <revision>1.5.4-beta-8</revision>
<changelist>-SNAPSHOT</changelist> <changelist>-SNAPSHOT</changelist>
<!-- Version for https://github.com/sirjonasxx/G-ExtensionStore to keep compatibility with beta versions. --> <!-- Version for https://github.com/sirjonasxx/G-ExtensionStore to keep compatibility with beta versions. -->
<storeVersion>1.5.3</storeVersion> <storeVersion>1.5.3</storeVersion>