From 431cfdf77ba306f5e147c7b2d70e15c4b3c729a6 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 26 Jun 2019 20:51:01 +0800 Subject: Update mappings to 1.14.3 --- src/main/java/me/shedaniel/rei/client/RecipeHelperImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/client/RecipeHelperImpl.java') diff --git a/src/main/java/me/shedaniel/rei/client/RecipeHelperImpl.java b/src/main/java/me/shedaniel/rei/client/RecipeHelperImpl.java index 410a1cdcf..49c17245f 100644 --- a/src/main/java/me/shedaniel/rei/client/RecipeHelperImpl.java +++ b/src/main/java/me/shedaniel/rei/client/RecipeHelperImpl.java @@ -17,7 +17,6 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.Identifier; import java.awt.*; -import java.util.List; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; @@ -66,7 +65,7 @@ public class RecipeHelperImpl implements RecipeHelper { boolean slotDone = false; for(ItemStack possibleType : inventoryItems) { for(ItemStack slotPossible : slot) - if (ItemStack.areEqualIgnoreTags(slotPossible, possibleType)) { + if (ItemStack.areItemsEqualIgnoreDamage(slotPossible, possibleType)) { slotsCraftable++; slotDone = true; break; @@ -126,7 +125,7 @@ public class RecipeHelperImpl implements RecipeHelper { RecipeCategory category = getCategory(entry.getKey()); for(RecipeDisplay recipeDisplay : entry.getValue()) for(ItemStack outputStack : (List) recipeDisplay.getOutput()) - if (category.checkTags() ? ItemStack.areEqual(stack, outputStack) : ItemStack.areEqualIgnoreTags(stack, outputStack)) + if (category.checkTags() ? ItemStack.areEqualIgnoreDamage(stack, outputStack) : ItemStack.areItemsEqualIgnoreDamage(stack, outputStack)) categoriesMap.get(recipeDisplay.getRecipeCategory()).add(recipeDisplay); } for(LiveRecipeGenerator liveRecipeGenerator : liveRecipeGenerators) @@ -162,7 +161,7 @@ public class RecipeHelperImpl implements RecipeHelper { boolean found = false; for(List input : (List>) recipeDisplay.getInput()) { for(ItemStack itemStack : input) { - if (category.checkTags() ? ItemStack.areEqual(itemStack, stack) : ItemStack.areEqualIgnoreTags(itemStack, stack)) { + if (category.checkTags() ? ItemStack.areEqualIgnoreDamage(itemStack, stack) : ItemStack.areItemsEqualIgnoreDamage(itemStack, stack)) { categoriesMap.get(recipeDisplay.getRecipeCategory()).add(recipeDisplay); found = true; break; -- cgit