diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java index fb11c7414..12db2360e 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java @@ -55,14 +55,9 @@ public class RecipeBrew { for(int j = 0; j < inputsMissing.size(); j++) { Object input = inputsMissing.get(j); if(input instanceof String) { - List validStacks = OreDictionary.getOres((String) input); boolean found = false; - for(ItemStack ostack : validStacks) { - ItemStack cstack = ostack.copy(); - if(cstack.getItemDamage() == Short.MAX_VALUE) - cstack.setItemDamage(stack.getItemDamage()); - - if(stack.isItemEqual(cstack)) { + for(ItemStack ostack : OreDictionary.getOres((String) input, false)) { + if(OreDictionary.itemMatches(ostack, stack, false)) { oredictIndex = j; found = true; break; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java index 593fb1612..7da370692 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java @@ -35,22 +35,12 @@ public class RecipeManaInfusion { public boolean matches(ItemStack stack) { if(input instanceof ItemStack) { - ItemStack inputCopy = ((ItemStack) input).copy(); - if(inputCopy.getItemDamage() == Short.MAX_VALUE) - inputCopy.setItemDamage(stack.getItemDamage()); - - return stack.isItemEqual(inputCopy); + return OreDictionary.itemMatches((ItemStack) input, stack, false); } if(input instanceof String) { - List validStacks = OreDictionary.getOres((String) input); - - for(ItemStack ostack : validStacks) { - ItemStack cstack = ostack.copy(); - if(cstack.getItemDamage() == Short.MAX_VALUE) - cstack.setItemDamage(stack.getItemDamage()); - - if(stack.isItemEqual(cstack)) + for(ItemStack ostack : OreDictionary.getOres((String) input, false)) { + if(OreDictionary.itemMatches(ostack, stack, false)) return true; } } diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java index 3c86617fc..98cfcbd48 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java @@ -49,14 +49,9 @@ public class RecipePetals { for(int j = 0; j < inputsMissing.size(); j++) { Object input = inputsMissing.get(j); if(input instanceof String) { - List validStacks = OreDictionary.getOres((String) input); boolean found = false; - for(ItemStack ostack : validStacks) { - ItemStack cstack = ostack.copy(); - if(cstack.getItemDamage() == Short.MAX_VALUE) - cstack.setItemDamage(stack.getItemDamage()); - - if(stack.isItemEqual(cstack)) { + for(ItemStack ostack : OreDictionary.getOres((String) input, false)) { + if(OreDictionary.itemMatches(ostack, stack, false)) { oredictIndex = j; found = true; break; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 866f4e84e..e438227b4 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -84,7 +84,7 @@ public class SubTileHopperhock extends SubTileFunctional { List filter = getFilterForInventory(pos_, true); boolean canAccept = canAcceptItem(stack, filter, filterType); - ItemStack simulate = ItemHandlerHelper.insertItem(inv.handler, stack.copy(), true); + ItemStack simulate = ItemHandlerHelper.insertItem(inv.handler, stack, true); int availablePut = stack.getCount() - simulate.getCount(); canAccept &= availablePut > 0; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index c00d1254f..688cc65b2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -134,7 +134,7 @@ public class TileCraftCrate extends TileOpenCrate { if(stack.isEmpty() || isLocked(i) || stack.getItem() == ModItems.manaResource && stack.getItemDamage() == 11) continue; - craft.setInventorySlotContents(i, stack.copy()); + craft.setInventorySlotContents(i, stack); } for(IRecipe recipe : ForgeRegistries.RECIPES)