fix issues with crafting

xGinko · Nov 8, 2023 · 94c1f5a · 94c1f5a
1 parent a311721
commit 94c1f5a
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 30 deletions.
diff --git a/AnarchyExploitFixesFolia/pom.xml b/AnarchyExploitFixesFolia/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>me.moomoo.anarchyexploitfixes</groupId>
         <artifactId>AnarchyExploitFixes</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.2</version>
     </parent>
 
     <artifactId>Folia</artifactId>

diff --git a/...a/me/moomoo/anarchyexploitfixes/modules/protocollib/windowclick/AntiWindowClickCrash.java b/...a/me/moomoo/anarchyexploitfixes/modules/protocollib/windowclick/AntiWindowClickCrash.java
@@ -9,10 +9,8 @@
 
 public class AntiWindowClickCrash implements AnarchyExploitFixesModule {
 
-
     public AntiWindowClickCrash() {
-        Config config = AnarchyExploitFixes.getConfiguration();
-        config.addComment("patches.window-click-crash-patch.enable", "Patches Container click / Window click crash exploit.");
+        AnarchyExploitFixes.getConfiguration().addComment("patches.window-click-crash-patch.enable", "Patches Container click / Window click crash exploit.");
     }
 
     @Override

diff --git a/...va/me/moomoo/anarchyexploitfixes/modules/protocollib/windowclick/WindowClickListener.java b/...va/me/moomoo/anarchyexploitfixes/modules/protocollib/windowclick/WindowClickListener.java
@@ -4,8 +4,8 @@
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.events.ListenerPriority;
 import com.comphenix.protocol.events.PacketAdapter;
+import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
-import com.comphenix.protocol.reflect.StructureModifier;
 import me.moomoo.anarchyexploitfixes.AnarchyExploitFixes;
 
 public class WindowClickListener extends PacketAdapter {
@@ -20,25 +20,27 @@ protected void register() {
 
     @Override
     public void onPacketReceiving(PacketEvent event) {
-        final StructureModifier<Integer> integers = event.getPacket().getIntegers();
-        if (getButton(integers) < 0 || getSlot(integers) < 0) {
+        final PacketContainer packet = event.getPacket();
+        if (!getClickType(packet).equals(InventoryClickType.SWAP)) return;
+
+        if (getButton(packet) < 0 || getSlot(packet) < 0) {
             event.setCancelled(true);
         }
     }
 
-    private int getSyncId(StructureModifier<Integer> packet) {
-        return packet.read(0);
+    private int getSlot(PacketContainer packet) {
+        return packet.getIntegers().read(2);
     }
 
-    private int getRevision(StructureModifier<Integer> packet) {
-        return packet.read(1);
+    private int getButton(PacketContainer packet) {
+        return packet.getIntegers().read(3);
     }
 
-    private int getSlot(StructureModifier<Integer> packet) {
-        return packet.read(2);
+    private enum InventoryClickType {
+        PICKUP, QUICK_MOVE, SWAP, CLONE, THROW, QUICK_CRAFT, PICKUP_ALL;
     }
 
-    private int getButton(StructureModifier<Integer> packet) {
-        return packet.read(3);
+    private InventoryClickType getClickType(PacketContainer packet) {
+        return packet.getEnumModifier(InventoryClickType.class, 4).read(0);
     }
 }
diff --git a/AnarchyExploitFixesLegacy/pom.xml b/AnarchyExploitFixesLegacy/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>me.moomoo.anarchyexploitfixes</groupId>
         <artifactId>AnarchyExploitFixes</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.2</version>
     </parent>
 
     <artifactId>Legacy</artifactId>

diff --git a/...a/me/moomoo/anarchyexploitfixes/modules/protocollib/windowclick/AntiWindowClickCrash.java b/...a/me/moomoo/anarchyexploitfixes/modules/protocollib/windowclick/AntiWindowClickCrash.java
@@ -11,8 +11,7 @@ public class AntiWindowClickCrash implements AnarchyExploitFixesModule {
 
 
     public AntiWindowClickCrash() {
-        Config config = AnarchyExploitFixes.getConfiguration();
-        config.addComment("patches.window-click-crash-patch.enable", "Patches Container click / Window click crash exploit.");
+        AnarchyExploitFixes.getConfiguration().addComment("patches.window-click-crash-patch.enable", "Patches Container click / Window click crash exploit.");
     }
 
     @Override

diff --git a/...va/me/moomoo/anarchyexploitfixes/modules/protocollib/windowclick/WindowClickListener.java b/...va/me/moomoo/anarchyexploitfixes/modules/protocollib/windowclick/WindowClickListener.java
@@ -4,8 +4,8 @@
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.events.ListenerPriority;
 import com.comphenix.protocol.events.PacketAdapter;
+import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
-import com.comphenix.protocol.reflect.StructureModifier;
 import me.moomoo.anarchyexploitfixes.AnarchyExploitFixes;
 
 public class WindowClickListener extends PacketAdapter {
@@ -20,25 +20,27 @@ protected void register() {
 
     @Override
     public void onPacketReceiving(PacketEvent event) {
-        final StructureModifier<Integer> integers = event.getPacket().getIntegers();
-        if (getButton(integers) < 0 || getSlot(integers) < 0) {
+        final PacketContainer packet = event.getPacket();
+        if (!getClickType(packet).equals(InventoryClickType.SWAP)) return;
+
+        if (getButton(packet) < 0 || getSlot(packet) < 0) {
             event.setCancelled(true);
         }
     }
 
-    private int getSyncId(StructureModifier<Integer> packet) {
-        return packet.read(0);
+    private int getSlot(PacketContainer packet) {
+        return packet.getIntegers().read(2);
     }
 
-    private int getRevision(StructureModifier<Integer> packet) {
-        return packet.read(1);
+    private int getButton(PacketContainer packet) {
+        return packet.getIntegers().read(3);
     }
 
-    private int getSlot(StructureModifier<Integer> packet) {
-        return packet.read(2);
+    private enum InventoryClickType {
+        PICKUP, QUICK_MOVE, SWAP, CLONE, THROW, QUICK_CRAFT, PICKUP_ALL;
     }
 
-    private int getButton(StructureModifier<Integer> packet) {
-        return packet.read(3);
+    private InventoryClickType getClickType(PacketContainer packet) {
+        return packet.getEnumModifier(InventoryClickType.class, 4).read(0);
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.moomoo.anarchyexploitfixes</groupId>
     <artifactId>AnarchyExploitFixes</artifactId>
-    <version>2.5.1</version>
+    <version>2.5.2</version>
     <modules>
         <module>AnarchyExploitFixesFolia</module>
         <module>AnarchyExploitFixesLegacy</module>