Don't suggest items with nbt tags for inventoryrecipes

gbl · Mar 27, 2018 · 2871deb · 2871deb
1 parent 16265f9
commit 2871deb
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/src/main/java/de/guntram/mcmod/easiercrafting/InventoryRecipeScanner.java b/src/main/java/de/guntram/mcmod/easiercrafting/InventoryRecipeScanner.java
@@ -7,10 +7,8 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockShulkerBox;
 import net.minecraft.inventory.Container;
@@ -57,7 +55,17 @@ static List<IRecipe> findUnusualRecipes(Container inventory, int firstInventoryS
             ItemStack stack=invitem.getStack();
             Item item = stack.getItem();
 
-            if (item == Items.DYE) {
+            if (item.isRepairable() && stack.isItemDamaged()) {
+                NBTTagList enchantments = stack.getEnchantmentTagList();
+                if (enchantments.tagCount() <= ConfigurationHandler.getMaxEnchantsAllowedForRepair()) {
+                    Integer previous=hasRepairable.get(item);
+                    hasRepairable.put(item, previous == null ? 1 : previous+1);
+                }
+            }
+            else if (stack.hasTagCompound()) {
+                continue;
+            }
+            else if (item == Items.DYE) {
                 int dyeIndex=stack.getMetadata() & 15;
                 hasDye[dyeIndex]+=stack.getCount();
             }
@@ -108,13 +116,6 @@ else if (item == Items.FILLED_MAP) {
             else if (item == Items.MAP) {
                 hasMap=true;
             }
-            else if (item.isRepairable() && stack.isItemDamaged()) {
-                NBTTagList enchantments = stack.getEnchantmentTagList();
-                if (enchantments.tagCount() <= ConfigurationHandler.getMaxEnchantsAllowedForRepair()) {
-                    Integer previous=hasRepairable.get(item);
-                    hasRepairable.put(item, previous == null ? 1 : previous+1);
-                }
-            }
         }
 
         System.out.print("hasDye: ");