From 71bc78fa20d310c448594e66019e95fcd23b7edf Mon Sep 17 00:00:00 2001 From: miozune Date: Thu, 26 May 2022 06:48:48 +0900 Subject: [PATCH] Don't merge stacks for AL recipes (#10) * Don't merge stacks for AL recipes * use WILDCARD_VALUE --- .../vfyjxf/nee/nei/NEECraftingHandler.java | 20 +++++++++---------- .../vfyjxf/nee/nei/NEECraftingHelper.java | 4 ++-- .../processor/GregTech5RecipeProcessor.java | 4 ++++ .../nee/processor/IRecipeProcessor.java | 4 ++++ 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHandler.java b/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHandler.java index 47ab943..c39520c 100644 --- a/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHandler.java +++ b/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHandler.java @@ -19,6 +19,7 @@ import com.github.vfyjxf.nee.utils.ItemUtils; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.oredict.OreDictionary; import java.util.*; @@ -73,7 +74,7 @@ public class NEECraftingHandler implements IOverlayHandler { List inputs = processor.getRecipeInput(recipe, recipeIndex, identifier); List outputs = processor.getRecipeOutput(recipe, recipeIndex, identifier); String recipeProcessorId = processor.getRecipeProcessorId(); - List tInputs = new ArrayList<>(); + List mergedInputs = new ArrayList<>(); if (!inputs.isEmpty() && !outputs.isEmpty()) { NEECraftingHandler.ingredients.clear(); @@ -81,10 +82,10 @@ public class NEECraftingHandler implements IOverlayHandler { ItemStack currentStack = positionedStack.items[0]; boolean find = false; ItemCombination currentValue = ItemCombination.valueOf(NEEConfig.itemCombinationMode); - if (currentValue != ItemCombination.DISABLED) { + if (currentValue != ItemCombination.DISABLED && processor.mergeStacks(recipe, recipeIndex, identifier)) { boolean isWhitelist = currentValue == ItemCombination.WHITELIST && Arrays.asList(NEEConfig.itemCombinationWhitelist).contains(identifier); if (currentValue == ItemCombination.ENABLED || isWhitelist) { - for (PositionedStack storedStack : tInputs) { + for (PositionedStack storedStack : mergedInputs) { ItemStack firstStack = storedStack.items[0]; boolean areItemStackEqual = firstStack.isItemEqual(currentStack) && ItemStack.areItemStackTagsEqual(firstStack, currentStack); if (areItemStackEqual && (firstStack.stackSize + currentStack.stackSize) <= firstStack.getMaxStackSize()) { @@ -95,10 +96,10 @@ public class NEECraftingHandler implements IOverlayHandler { } } if (!find) { - tInputs.add(positionedStack.copy()); + mergedInputs.add(positionedStack.copy()); } } - for (PositionedStack positionedStack : tInputs) { + for (PositionedStack positionedStack : mergedInputs) { ItemStack currentStack = positionedStack.items[0]; ItemStack preferModItem = ItemUtils.getPreferModItem(positionedStack.items); @@ -118,8 +119,7 @@ public class NEECraftingHandler implements IOverlayHandler { continue; } - //Fix ItemStack with wrong meta - if (currentStack.getItemDamage() == 32767) { + if (currentStack.getItemDamage() == OreDictionary.WILDCARD_VALUE) { currentStack.setItemDamage(0); } @@ -134,8 +134,7 @@ public class NEECraftingHandler implements IOverlayHandler { } ItemStack outputStack = positionedStack.item.copy(); - //Fix ItemStack with wrong meta(maybe ?) - if (outputStack.getItemDamage() == 32767) { + if (outputStack.getItemDamage() == OreDictionary.WILDCARD_VALUE) { outputStack.setItemDamage(0); } @@ -174,8 +173,7 @@ public class NEECraftingHandler implements IOverlayHandler { ItemUtils.transformGTTool(stack); - //Fix ItemStack with wrong meta - if (stack.getItemDamage() == 32767) { + if (stack.getItemDamage() == OreDictionary.WILDCARD_VALUE) { stack.setItemDamage(0); } diff --git a/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHelper.java b/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHelper.java index a7cd144..ab4001a 100644 --- a/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHelper.java +++ b/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHelper.java @@ -36,6 +36,7 @@ import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.client.event.GuiScreenEvent; +import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.input.Keyboard; import java.io.ByteArrayOutputStream; @@ -109,8 +110,7 @@ public class NEECraftingHelper implements IOverlayHandler { } } - //Fix ItemStack with wrong meta - if (stack.getItemDamage() == 32767) { + if (stack.getItemDamage() == OreDictionary.WILDCARD_VALUE) { stack.setItemDamage(0); } diff --git a/src/main/java/com/github/vfyjxf/nee/processor/GregTech5RecipeProcessor.java b/src/main/java/com/github/vfyjxf/nee/processor/GregTech5RecipeProcessor.java index 5f37c24..f4c5343 100644 --- a/src/main/java/com/github/vfyjxf/nee/processor/GregTech5RecipeProcessor.java +++ b/src/main/java/com/github/vfyjxf/nee/processor/GregTech5RecipeProcessor.java @@ -106,4 +106,8 @@ public class GregTech5RecipeProcessor implements IRecipeProcessor { return recipeOutputs; } + @Override + public boolean mergeStacks(IRecipeHandler recipe, int recipeIndex, String identifier) { + return !"gt.recipe.fakeAssemblylineProcess".equals(identifier); + } } diff --git a/src/main/java/com/github/vfyjxf/nee/processor/IRecipeProcessor.java b/src/main/java/com/github/vfyjxf/nee/processor/IRecipeProcessor.java index ead82f6..32201eb 100644 --- a/src/main/java/com/github/vfyjxf/nee/processor/IRecipeProcessor.java +++ b/src/main/java/com/github/vfyjxf/nee/processor/IRecipeProcessor.java @@ -27,4 +27,8 @@ public interface IRecipeProcessor { @Nonnull List getRecipeOutput(IRecipeHandler recipe, int recipeIndex, String identifier); + default boolean mergeStacks(IRecipeHandler recipe, int recipeIndex, String identifier) { + return true; + } + }