try fix #4

Author: TexBlock

CHANGELOG.md

@@ -1,2 +1,2 @@
 ## Changelog
-- clean
+- try fix #4

gradle.properties

@@ -10,7 +10,7 @@ loom.platform = neoforge
 
 # Mod Properties
 	upstream_version = 1.4.147
-	mod_version = 0.1.2
+	mod_version = 0.1.3
 	maven_group = org.thinkingstudio.bedsheet
 	archives_base_name = bedsheet
 

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

@@ -73,17 +73,16 @@ private void onQItem(ServerboundPlayerActionPacket playerActionC2SPacket_1, Call
         }
     }
 
-    // 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",
+            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/carpet/mixins/ServerPlayer_scarpetEventMixin.java

@@ -73,16 +73,15 @@ private void grabStat(Stat<?> stat, int amount, CallbackInfo ci)
         STATISTICS.onPlayerStatistic((ServerPlayer) (Object)this, stat, amount);
     }
 
-    // use LivingDeathEvent replace
-//    @Inject(method = "die", at = @At("HEAD"))
-//    private void onDeathEvent(DamageSource source, CallbackInfo ci)
-//    {
-//        ((EntityInterface)this).getEventContainer().onEvent(EntityEventsGroup.Event.ON_DEATH, source.getMsgId());
-//        if (PLAYER_DIES.isNeeded())
-//        {
-//            PLAYER_DIES.onPlayerEvent((ServerPlayer) (Object)this);
-//        }
-//    }
+    @Inject(method = "die", at = @At("HEAD"))
+    private void onDeathEvent(DamageSource source, CallbackInfo ci)
+    {
+        ((EntityInterface)this).getEventContainer().onEvent(EntityEventsGroup.Event.ON_DEATH, source.getMsgId());
+        if (PLAYER_DIES.isNeeded())
+        {
+            PLAYER_DIES.onPlayerEvent((ServerPlayer) (Object)this);
+        }
+    }
 
     @Redirect(method = "setPlayerInput", at = @At(
             value = "INVOKE",

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

@@ -1,22 +1,15 @@
 package org.thinkingstudio.bedsheet;
 
 import carpet.CarpetServer;
-import carpet.fakes.EntityInterface;
 import carpet.network.CarpetClient;
-import carpet.script.EntityEventsGroup;
 import net.minecraft.server.level.ServerPlayer;
 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.LivingDeathEvent;
-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_DIES;
-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 -> {
@@ -25,21 +18,6 @@ public static void registerEvents(IEventBus modEventBus, IEventBus forgeEventBus
         forgeEventBus.addListener(EventPriority.HIGHEST, PlayerEvent.PlayerLoggedInEvent.class, event -> {
             CarpetServer.onPlayerLoggedIn((ServerPlayer) event.getEntity());
         });
-        forgeEventBus.addListener(EventPriority.HIGHEST, LivingSwapItemsEvent.Hands.class, event -> {
-            if(PLAYER_SWAPS_HANDS.onPlayerEvent((ServerPlayer) event.getEntity())) {
-                event.isCanceled();
-            }
-        });
-        forgeEventBus.addListener(EventPriority.HIGHEST, LivingDeathEvent.class, event -> {
-            if (event.getEntity() instanceof ServerPlayer serverPlayer) {
-                ((EntityInterface) serverPlayer).getEventContainer().onEvent(EntityEventsGroup.Event.ON_DEATH, event.getSource().getMsgId());
-                if (PLAYER_DIES.isNeeded())
-                {
-                    PLAYER_DIES.onPlayerEvent(serverPlayer);
-                }
-            }
-            ((EntityInterface) event.getEntity()).getEventContainer().onEvent(EntityEventsGroup.Event.ON_DEATH, event.getSource().getMsgId());
-        });
 
         modEventBus.addListener(EventPriority.HIGHEST, RegisterPayloadHandlersEvent.class, event -> {
             final PayloadRegistrar registrar = event.registrar(BedSheetModReference.MODID);