Simplified item interaction fix

ViaVersion · Nov 12, 2023 · 18b4340 · 18b4340
1 parent 740a439
commit 18b4340
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 126 deletions.
diff --git a/.../de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinArmorItem.java b/.../de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinArmorItem.java
diff --git a/...de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinElytraItem.java b/...de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinElytraItem.java
diff --git a/.../de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinEquipment.java b/.../de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinEquipment.java
@@ -18,8 +18,10 @@
 package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
 
 import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
+import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Equipment;
+import net.minecraft.item.ItemStack;
 import net.raphimc.vialoader.util.VersionEnum;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -28,6 +30,23 @@
 @Mixin(Equipment.class)
 public interface MixinEquipment {
 
+    @Redirect(method = "equipAndSwap", at = @At(value = "INVOKE", target = "Lnet/minecraft/enchantment/EnchantmentHelper;hasBindingCurse(Lnet/minecraft/item/ItemStack;)Z"))
+    default boolean removeBindingCurseCondition(ItemStack stack) {
+        if (ProtocolHack.getTargetVersion().isOlderThanOrEqualTo(VersionEnum.r1_19_3)) {
+            return false;
+        }
+        return EnchantmentHelper.hasBindingCurse(stack);
+    }
+
+    @Redirect(method = "equipAndSwap", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;areEqual(Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ItemStack;)Z"))
+    default boolean simplifyCondition(ItemStack left, ItemStack right) {
+        if (ProtocolHack.getTargetVersion().isOlderThanOrEqualTo(VersionEnum.r1_19_3)) {
+            return !right.isEmpty();
+        }
+
+        return ItemStack.areEqual(left, right);
+    }
+
     @Redirect(method = "equipAndSwap", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;isCreative()Z"))
     default boolean removeCreativeCondition(PlayerEntity instance) {
         if (ProtocolHack.getTargetVersion().isOlderThanOrEqualTo(VersionEnum.r1_20tor1_20_1)) {

diff --git a/src/main/resources/viafabricplus.mixins.json b/src/main/resources/viafabricplus.mixins.json
@@ -96,11 +96,9 @@
     "fixes.minecraft.input.MixinKeyboard",
     "fixes.minecraft.input.MixinKeyboardInput",
     "fixes.minecraft.input.MixinMouse",
-    "fixes.minecraft.item.MixinArmorItem",
     "fixes.minecraft.item.MixinAxeItem",
     "fixes.minecraft.item.MixinBlockItem",
     "fixes.minecraft.item.MixinBrushItem",
-    "fixes.minecraft.item.MixinElytraItem",
     "fixes.minecraft.item.MixinEnderPearlItem",
     "fixes.minecraft.item.MixinEquipment",
     "fixes.minecraft.item.MixinFireworkRocketItem",