fix and improve the recipe repair mixin

Author: ghzdude

src/main/java/gregtech/mixins/minecraft/RecipeRepairItemMixin.java

@@ -5,11 +5,11 @@
 import gregtech.api.items.toolitem.ToolHelper;
 
 import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.RecipeRepairItem;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.NonNullList;
-import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeHooks;
 import net.minecraftforge.event.ForgeEventFactory;
 
@@ -20,38 +20,74 @@
 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.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.List;
+import java.util.Set;
 
 @Mixin(RecipeRepairItem.class)
 public class RecipeRepairItemMixin {
 
-    @Inject(method = "matches(Lnet/minecraft/inventory/InventoryCrafting;Lnet/minecraft/world/World;)Z",
-            at = @At(value = "INVOKE",
-                     target = "Ljava/util/List;get(I)Ljava/lang/Object;",
-                     shift = At.Shift.AFTER),
-            cancellable = true)
-    public void gregtechCEu$matches(InventoryCrafting inv, World worldIn, CallbackInfoReturnable<Boolean> cir,
-                                    @Local(ordinal = 0) ItemStack itemstack, @Local(ordinal = 0) List<ItemStack> list) {
-        ItemStack itemstack1 = list.get(0);
-        if (itemstack.getItem() instanceof IGTTool first &&
-                itemstack1.getItem() instanceof IGTTool second) {
-            if (first.isElectric() || second.isElectric() ||
-                    first instanceof ItemGTToolbelt || second instanceof ItemGTToolbelt) {
-                cir.setReturnValue(false);
-            } else {
-                cir.setReturnValue(first.getToolMaterial(itemstack) == second.getToolMaterial(itemstack1));
+    @Redirect(method = "matches",
+              at = @At(value = "INVOKE",
+                       ordinal = 0,
+                       target = "Lnet/minecraft/item/ItemStack;getItem()Lnet/minecraft/item/Item;"))
+    public Item gregtechCEu$checkFirst(ItemStack instance) {
+        if (instance.getItem() instanceof IGTTool)
+            return null; // return null to bypass item check
+        else return instance.getItem();
+    }
+
+    @Redirect(method = "matches",
+              at = @At(value = "INVOKE",
+                       ordinal = 1,
+                       target = "Lnet/minecraft/item/ItemStack;getItem()Lnet/minecraft/item/Item;"))
+    public Item gregtechCEu$checkSecond(ItemStack instance) {
+        if (instance.getItem() instanceof IGTTool)
+            return null; // return null to bypass item check
+        else return instance.getItem();
+    }
+
+    @ModifyReturnValue(method = "matches", at = @At(value = "RETURN", ordinal = 1), remap = false)
+    public boolean gregtechCEu$matches(boolean b, @Local List<ItemStack> list) {
+        if (!b) return false; // list size is not two
+
+        ItemStack stack1 = list.get(0);
+        ItemStack stack2 = list.get(1);
+
+        if (!(stack1.getItem() instanceof IGTTool) || stack1.getItem() instanceof ItemGTToolbelt)
+            return false;
+
+        // items must be the same at this point
+        IGTTool first = (IGTTool) stack1.getItem();
+        IGTTool second = (IGTTool) stack2.getItem();
+
+        // must be same material
+        if (first.getToolMaterial(stack1) != second.getToolMaterial(stack2))
+            return false;
+
+        // must not be electric
+        if (first.isElectric() || second.isElectric())
+            return false;
+
+        // must share at least one tool class
+        Set<String> firstClasses = first.getToolClasses(stack1);
+        Set<String> secondClasses = second.getToolClasses(stack2);
+        if (!firstClasses.isEmpty() && !secondClasses.isEmpty()) {
+            for (String toolClass : first.getToolClasses(stack1)) {
+                if (second.getToolClasses(stack2).contains(toolClass)) {
+                    return true;
+                }
             }
         }
+        return false;
     }
 
     @Inject(method = "getCraftingResult(Lnet/minecraft/inventory/InventoryCrafting;)Lnet/minecraft/item/ItemStack;",
             at = @At(value = "INVOKE_ASSIGN",
                      target = "Ljava/util/List;get(I)Ljava/lang/Object;",
-                     ordinal = 0,
-                     shift = At.Shift.BY,
-                     by = 2),
+                     ordinal = 0),
             cancellable = true)
     public void gregtechCEu$getCraftingResultFirst(InventoryCrafting inv, CallbackInfoReturnable<ItemStack> cir,
                                                    @Local(ordinal = 0) ItemStack itemstack,
@@ -63,11 +99,6 @@ public class RecipeRepairItemMixin {
         }
     }
 
-    /*
-     * @Inject(method = "getCraftingResult(Lnet/minecraft/inventory/InventoryCrafting;)Lnet/minecraft/item/ItemStack;",
-     * at = @At(value = "RETURN", ordinal = 1),
-     * cancellable = true)
-     */
     @ModifyReturnValue(method = "getCraftingResult", at = @At(value = "RETURN", ordinal = 1))
     public ItemStack gregtechCEu$getCraftingResultSecond(ItemStack originalResult, InventoryCrafting inv,
                                                          @Local(ordinal = 3) int itemDamage,