From b99811507ee3e54f88e865fb27e0b5b213691881 Mon Sep 17 00:00:00 2001 From: matteo2678 <66562258+warior456@users.noreply.github.com> Date: Tue, 21 Feb 2023 16:18:52 +0100 Subject: [PATCH 1/6] add bypass to velocity only? this is untested --- src/main/java/one/oktw/PacketHandler.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/one/oktw/PacketHandler.java b/src/main/java/one/oktw/PacketHandler.java index b54c7c1..3312ba0 100644 --- a/src/main/java/one/oktw/PacketHandler.java +++ b/src/main/java/one/oktw/PacketHandler.java @@ -20,9 +20,8 @@ class PacketHandler { PacketHandler(ModConfig config) { this.config = config; } - void handleVelocityPacket(MinecraftServer server, ServerLoginNetworkHandler handler, boolean understood, PacketByteBuf buf, ServerLoginNetworking.LoginSynchronizer synchronizer, PacketSender ignored) { - if (!understood) { + if (!understood && config.allowBypassProxy == false) { handler.disconnect(Text.of("This server requires you to connect with Velocity.")); return; } From cdc445217fe496605b841f77ce274578b086ce02 Mon Sep 17 00:00:00 2001 From: matteo2678 <66562258+warior456@users.noreply.github.com> Date: Tue, 21 Feb 2023 16:21:32 +0100 Subject: [PATCH 2/6] add allowBypassProxy option this is untested --- src/main/java/one/oktw/ModConfig.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/one/oktw/ModConfig.java b/src/main/java/one/oktw/ModConfig.java index e53c8fa..913f2d0 100644 --- a/src/main/java/one/oktw/ModConfig.java +++ b/src/main/java/one/oktw/ModConfig.java @@ -5,6 +5,7 @@ public class ModConfig { private boolean hackOnlineMode = true; private boolean hackEarlySend = false; private boolean hackMessageChain = true; + private boolean allowBypassProxy = false; private String secret = ""; public boolean getHackOnlineMode() { @@ -33,6 +34,15 @@ public boolean getHackMessageChain() { return Boolean.parseBoolean(env); } } + + public boolean getHackMessageChain() { + String env = System.getenv("ALLOW_BYPASS_PROXY"); + if (env == null) { + return allowBypassProxy; + } else { + return Boolean.parseBoolean(env); + } + } public String getSecret() { String env = System.getenv("FABRIC_PROXY_SECRET"); From ba409a2dbd3daaac90b1bd82b6e671c373fd6cc4 Mon Sep 17 00:00:00 2001 From: matteo2678 <66562258+warior456@users.noreply.github.com> Date: Tue, 21 Feb 2023 16:24:34 +0100 Subject: [PATCH 3/6] build --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index df767f7..d22b6e2 100644 --- a/README.md +++ b/README.md @@ -19,3 +19,4 @@ Enable `hackEarlySend` will use mixin for early send packet to velocity. * Start server to generate config * Setting velocity `player-info-forwarding-mode` to `modern` and `forwarding-secret` * Setting `secret` in `config/FabricProxy-Lite.toml` match velocity config +build From 73982905f64ef2fe93bae9f605bbc49ab570be1d Mon Sep 17 00:00:00 2001 From: matteo2678 <66562258+warior456@users.noreply.github.com> Date: Tue, 21 Feb 2023 16:24:52 +0100 Subject: [PATCH 4/6] build --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d22b6e2..8b444a8 100644 --- a/README.md +++ b/README.md @@ -19,4 +19,4 @@ Enable `hackEarlySend` will use mixin for early send packet to velocity. * Start server to generate config * Setting velocity `player-info-forwarding-mode` to `modern` and `forwarding-secret` * Setting `secret` in `config/FabricProxy-Lite.toml` match velocity config -build + From 371eca90e3b861c7673fedf6722cc0c16317037a Mon Sep 17 00:00:00 2001 From: matteo2678 <66562258+warior456@users.noreply.github.com> Date: Tue, 21 Feb 2023 16:30:14 +0100 Subject: [PATCH 5/6] typo fix --- src/main/java/one/oktw/ModConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/one/oktw/ModConfig.java b/src/main/java/one/oktw/ModConfig.java index 913f2d0..0d91b51 100644 --- a/src/main/java/one/oktw/ModConfig.java +++ b/src/main/java/one/oktw/ModConfig.java @@ -35,7 +35,7 @@ public boolean getHackMessageChain() { } } - public boolean getHackMessageChain() { + public boolean getallowBypassProxy() { String env = System.getenv("ALLOW_BYPASS_PROXY"); if (env == null) { return allowBypassProxy; From 0047de94f6ed45043868a089fa3b728a44c92289 Mon Sep 17 00:00:00 2001 From: matteo2678 <66562258+warior456@users.noreply.github.com> Date: Tue, 21 Feb 2023 16:31:13 +0100 Subject: [PATCH 6/6] oops --- src/main/java/one/oktw/PacketHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/one/oktw/PacketHandler.java b/src/main/java/one/oktw/PacketHandler.java index 3312ba0..f214176 100644 --- a/src/main/java/one/oktw/PacketHandler.java +++ b/src/main/java/one/oktw/PacketHandler.java @@ -21,7 +21,7 @@ class PacketHandler { this.config = config; } void handleVelocityPacket(MinecraftServer server, ServerLoginNetworkHandler handler, boolean understood, PacketByteBuf buf, ServerLoginNetworking.LoginSynchronizer synchronizer, PacketSender ignored) { - if (!understood && config.allowBypassProxy == false) { + if (!understood && config.getallowBypassProxy() == false) { handler.disconnect(Text.of("This server requires you to connect with Velocity.")); return; }