clean

Author: TexBlock

src/main/java/carpet/mixins/ServerGamePacketListenerImpl_scarpetEventsMixin.java

@@ -73,16 +73,17 @@ private void onQItem(ServerboundPlayerActionPacket playerActionC2SPacket_1, Call
         }
     }
 
-    @Inject(method = "handlePlayerAction", cancellable = true, at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/server/level/ServerPlayer;getItemInHand(Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/item/ItemStack;",
-            ordinal = 0,
-            shift = At.Shift.BEFORE
-    ))
-    private void onHandSwap(ServerboundPlayerActionPacket playerActionC2SPacket_1, CallbackInfo ci)
-    {
-        if(PLAYER_SWAPS_HANDS.onPlayerEvent(player)) ci.cancel();
-    }
+    // Use LivingSwapItemsEvent.Hands event with NeoForge patches
+//    @Inject(method = "handlePlayerAction", cancellable = true, at = @At(
+//            value = "INVOKE",
+//            target = "Lnet/minecraft/server/level/ServerPlayer;getItemInHand(Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/item/ItemStack;",
+//            ordinal = 0,
+//            shift = At.Shift.BEFORE
+//    ))
+//    private void onHandSwap(ServerboundPlayerActionPacket playerActionC2SPacket_1, CallbackInfo ci)
+//    {
+//        if(PLAYER_SWAPS_HANDS.onPlayerEvent(player)) ci.cancel();
+//    }
 
     @Inject(method = "handlePlayerAction", cancellable = true, at = @At(
             value = "INVOKE",

src/main/java/org/thinkingstudio/bedsheet/BedSheetModEvents.java

@@ -6,10 +6,13 @@
 import net.neoforged.bus.api.EventPriority;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.neoforge.event.RegisterCommandsEvent;
+import net.neoforged.neoforge.event.entity.living.LivingSwapItemsEvent;
 import net.neoforged.neoforge.event.entity.player.PlayerEvent;
 import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
 import net.neoforged.neoforge.network.registration.PayloadRegistrar;
 
+import static carpet.script.CarpetEventServer.Event.PLAYER_SWAPS_HANDS;
+
 public class BedSheetModEvents {
     public static void registerEvents(IEventBus modEventBus, IEventBus forgeEventBus) {
         forgeEventBus.addListener(EventPriority.HIGHEST, RegisterCommandsEvent.class, event -> {
@@ -20,6 +23,13 @@ public static void registerEvents(IEventBus modEventBus, IEventBus forgeEventBus
                 CarpetServer.onPlayerLoggedIn(serverPlayer);
             }
         });
+        forgeEventBus.addListener(EventPriority.HIGHEST, LivingSwapItemsEvent.Hands.class, event -> {
+            if (event.getEntity() instanceof ServerPlayer serverPlayer) {
+                if (PLAYER_SWAPS_HANDS.onPlayerEvent(serverPlayer)) {
+                    event.isCanceled();
+                }
+            }
+        });
 
         modEventBus.addListener(EventPriority.HIGHEST, RegisterPayloadHandlersEvent.class, event -> {
             final PayloadRegistrar registrar = event.registrar(BedSheetModReference.MODID);