fix offhand swing for other players

GTNewHorizons · Jan 26, 2025 · 381541c · 381541c
1 parent 8a52501
commit 381541c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 13 deletions.
diff --git a/src/main/java/xonin/backhand/CommonProxy.java b/src/main/java/xonin/backhand/CommonProxy.java
@@ -1,12 +1,8 @@
 package xonin.backhand;
 
-import javax.annotation.Nullable;
-
-import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.FakePlayer;
 
 import com.gtnewhorizon.gtnhlib.eventbus.EventBusSubscriber;
 import com.gtnewhorizon.gtnhlib.keybind.SyncedKeybind;
@@ -43,7 +39,8 @@ public static void onPlayerJoin(PlayerEvent.PlayerLoggedInEvent event) {
     @SubscribeEvent
     public static void addTracking(net.minecraftforge.event.entity.player.PlayerEvent.StartTracking event) {
         if (BackhandUtils.isValidPlayer(event.entityPlayer) && BackhandUtils.isValidPlayer(event.target)) {
-            BackhandPacketHandler.sendPacketToPlayer(new OffhandSyncItemPacket((EntityPlayer) event.target), event.entityPlayer);
+            BackhandPacketHandler
+                .sendPacketToPlayer(new OffhandSyncItemPacket((EntityPlayer) event.target), event.entityPlayer);
         }
     }
 

diff --git a/src/main/java/xonin/backhand/mixins/early/minecraft/MixinEntityLivingBase.java b/src/main/java/xonin/backhand/mixins/early/minecraft/MixinEntityLivingBase.java
@@ -14,7 +14,6 @@
 
 import com.llamalad7.mixinextras.sugar.Local;
 
-import xonin.backhand.Backhand;
 import xonin.backhand.api.core.BackhandUtils;
 import xonin.backhand.packet.BackhandPacketHandler;
 import xonin.backhand.packet.OffhandSyncItemPacket;

diff --git a/src/main/java/xonin/backhand/mixins/early/minecraft/MixinEntityPlayer.java b/src/main/java/xonin/backhand/mixins/early/minecraft/MixinEntityPlayer.java
@@ -25,7 +25,6 @@
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 
-import xonin.backhand.Backhand;
 import xonin.backhand.api.core.BackhandUtils;
 import xonin.backhand.api.core.IBackhandPlayer;
 import xonin.backhand.api.core.IOffhandInventory;

diff --git a/src/main/java/xonin/backhand/mixins/early/minecraft/MixinEntityPlayerClient.java b/src/main/java/xonin/backhand/mixins/early/minecraft/MixinEntityPlayerClient.java
@@ -2,7 +2,6 @@
 
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
@@ -20,9 +19,6 @@
 @Mixin(EntityPlayer.class)
 public abstract class MixinEntityPlayerClient extends EntityLivingBase implements IBackhandPlayer {
 
-    @Shadow
-    public InventoryPlayer inventory;
-
     @Shadow
     private ItemStack itemInUse;
 

diff --git a/src/main/java/xonin/backhand/mixins/early/minecraft/MixinNetHandlerPlayClient.java b/src/main/java/xonin/backhand/mixins/early/minecraft/MixinNetHandlerPlayClient.java
@@ -36,10 +36,13 @@ public abstract class MixinNetHandlerPlayClient {
 
     @Inject(
         method = "handleAnimation",
-        at = @At(value = "INVOKE", target = "Lnet/minecraft/network/play/server/S0BPacketAnimation;func_148977_d()I"))
+        at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/network/play/server/S0BPacketAnimation;func_148977_d()I",
+            ordinal = 0))
     private void backhand$handleOffhandSwing(S0BPacketAnimation packetIn, CallbackInfo ci, @Local Entity entity) {
         if (!(entity instanceof IBackhandPlayer player)) return;
-        if (packetIn.func_148978_c() == 99) {
+        if (packetIn.func_148977_d() == 99) {
             player.swingOffItem();
         }
     }