Fix combining of enchanted annihilation planes in the anvil (#8658)

Author: shartte

src/main/java/appeng/mixins/AnvilMenuMixin.java

@@ -1,26 +1,33 @@
 package appeng.mixins;
 
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.AnvilMenu;
+import net.minecraft.world.inventory.ItemCombinerMenu;
 
-import appeng.parts.automation.AnnihilationPlanePartItem;
+import appeng.core.definitions.AEParts;
 
 /**
- * @see AnnihilationPlanePartItem#CALLING_DAMAGEABLE_FROM_ANVIL
+ * Workaround to make enchanted annihilation planes combinable in anvils to upgrade their enchantment levels.
  */
 @Mixin(AnvilMenu.class)
-public class AnvilMenuMixin {
-    @Inject(method = "createResult", at = @At(value = "INVOKE", target = "net/minecraft/world/item/ItemStack.isDamageableItem()Z", ordinal = 1))
-    public void setAnnihilationPlaneThreadLocal(CallbackInfo ci) {
-        AnnihilationPlanePartItem.CALLING_DAMAGEABLE_FROM_ANVIL.set(Boolean.TRUE);
+public abstract class AnvilMenuMixin extends ItemCombinerMenu {
+    public AnvilMenuMixin(int containerId, Inventory playerInventory) {
+        super(null, 0, null, null);
+        throw new AssertionError();
     }
 
-    @Inject(method = "createResult", at = @At(value = "INVOKE", target = "net/minecraft/world/item/ItemStack.isDamageableItem()Z", ordinal = 1, shift = At.Shift.AFTER))
-    public void clearAnnihilationPlaneThreadLocal(CallbackInfo ci) {
-        AnnihilationPlanePartItem.CALLING_DAMAGEABLE_FROM_ANVIL.set(null);
+    @ModifyExpressionValue(method = "createResult", at = @At(value = "INVOKE", target = "net/minecraft/world/item/ItemStack.isDamageableItem()Z", ordinal = 1))
+    public boolean setAnnihilationPlaneThreadLocal(boolean isDamageable) {
+        if (AEParts.ANNIHILATION_PLANE.is(inputSlots.getItem(0))
+                && AEParts.ANNIHILATION_PLANE.is(inputSlots.getItem(1))) {
+            return true; // Act damageable to allow combining items
+        } else {
+            return isDamageable;
+        }
     }
 }

src/main/java/appeng/parts/automation/AnnihilationPlanePartItem.java

@@ -19,13 +19,6 @@
  * Special part item for {@link AnnihilationPlanePart} to handle enchants and extended tooltips.
  */
 public class AnnihilationPlanePartItem extends PartItem<AnnihilationPlanePart> {
-    /**
-     * Workaround to make annihilation planes combinable in anvils.
-     * <p>
-     * null = false, non-null = true
-     */
-    public static final ThreadLocal<Object> CALLING_DAMAGEABLE_FROM_ANVIL = ThreadLocal.withInitial(() -> null);
-
     public AnnihilationPlanePartItem(Properties properties) {
         super(properties, AnnihilationPlanePart.class, AnnihilationPlanePart::new);
     }
@@ -45,11 +38,6 @@ public boolean isBookEnchantable(ItemStack stack, ItemStack book) {
         return true;
     }
 
-    @Override
-    public int getMaxDamage(ItemStack stack) {
-        return CALLING_DAMAGEABLE_FROM_ANVIL.get() != null ? 1 : super.getMaxDamage(stack);
-    }
-
     @Override
     public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> lines,
             TooltipFlag isAdvanced) {