From 1ab04a09b9e5f7dfaafbbe252fc65ee0de5091ea Mon Sep 17 00:00:00 2001 From: SerendipityR <48401197+SerendipityR-2022@users.noreply.github.com> Date: Wed, 24 Aug 2022 12:04:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=8F=E8=AE=AE=E7=89=88?= =?UTF-8?q?=E6=9C=AC754=E7=9A=84Forge=E4=BC=AA=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NewVersion/AttackUtils/NewBotAttack.java | 1 - .../NewVersion/ForgeProtocol/MCForge.java | 27 ++++++++++--------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/cn/serendipityr/EndMinecraftPlusV2/VersionControl/NewVersion/AttackUtils/NewBotAttack.java b/src/cn/serendipityr/EndMinecraftPlusV2/VersionControl/NewVersion/AttackUtils/NewBotAttack.java index 84f2df8..1adb36f 100644 --- a/src/cn/serendipityr/EndMinecraftPlusV2/VersionControl/NewVersion/AttackUtils/NewBotAttack.java +++ b/src/cn/serendipityr/EndMinecraftPlusV2/VersionControl/NewVersion/AttackUtils/NewBotAttack.java @@ -459,7 +459,6 @@ public class NewBotAttack extends IAttack { if (new String(packet.getData()).equals("GET:Verification")) session.send(new ClientPluginMessagePacket("VexView", "Verification:1.8.10".getBytes())); break; - default: } } else if (recvPacket instanceof ServerJoinGamePacket) { session.setFlag("join", true); diff --git a/src/cn/serendipityr/EndMinecraftPlusV2/VersionControl/NewVersion/ForgeProtocol/MCForge.java b/src/cn/serendipityr/EndMinecraftPlusV2/VersionControl/NewVersion/ForgeProtocol/MCForge.java index 3777c05..9b9dc82 100644 --- a/src/cn/serendipityr/EndMinecraftPlusV2/VersionControl/NewVersion/ForgeProtocol/MCForge.java +++ b/src/cn/serendipityr/EndMinecraftPlusV2/VersionControl/NewVersion/ForgeProtocol/MCForge.java @@ -10,6 +10,7 @@ import com.github.steveice10.packetlib.event.session.*; import com.github.steveice10.packetlib.packet.Packet; import java.lang.reflect.Field; +import java.util.Arrays; import java.util.Map; public class MCForge { @@ -25,7 +26,7 @@ public class MCForge { } public void init() { - if (ProtocolLibs.adaptAfter754) { + if (ProtocolLibs.adaptAfter758) { this.session.addListener(new SessionListener() { public void packetReceived(PacketReceivedEvent e) { if (e.getPacket() instanceof ClientboundCustomPayloadPacket) { @@ -116,18 +117,20 @@ public class MCForge { public void handle(ServerPluginMessagePacket packet) { switch (packet.getChannel()) { - case "FML|HS": - this.handshake.handle(packet); - break; - case "REGISTER": - case "minecraft:register": - this.session.send(new ClientPluginMessagePacket(packet.getChannel(), packet.getData())); - break; - case "MC|Brand": - case "minecraft:brand": - this.session.send(new ClientPluginMessagePacket(packet.getChannel(), "fml,forge".getBytes())); - break; + case "FML|HS": + this.handshake.handle(packet); + break; + case "REGISTER": + case "minecraft:register": + this.session.send(new ClientPluginMessagePacket(packet.getChannel(), packet.getData())); + break; + case "MC|Brand": + case "minecraft:brand": + this.session.send(new ClientPluginMessagePacket(packet.getChannel(), "fml,forge".getBytes())); + break; } + + // System.out.println(packet.getChannel() + " | " + Arrays.toString(packet.getData())); } public void newHandle(ClientboundCustomPayloadPacket packet) {