diff --git a/gradle.properties b/gradle.properties index 4a4b3bd..e2bd579 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.daemon=false mc_version=1.7.10 nei_version=2.1.6-GTNH ae2_version=rv3-beta-52-GTNH -mod_version=1.2.17 +mod_version=1.2.18 forge_version=10.13.4.1614 mod_group=com.github.vfyjxf.neenergistics mod_id=neenergistics diff --git a/src/main/java/com/github/vfyjxf/nee/client/NEEContainerDrawHandler.java b/src/main/java/com/github/vfyjxf/nee/client/NEEContainerDrawHandler.java index feaeefc..6b3753e 100644 --- a/src/main/java/com/github/vfyjxf/nee/client/NEEContainerDrawHandler.java +++ b/src/main/java/com/github/vfyjxf/nee/client/NEEContainerDrawHandler.java @@ -17,6 +17,7 @@ import net.minecraft.client.gui.*; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.client.event.GuiScreenEvent; import org.lwjgl.input.Keyboard; @@ -175,10 +176,17 @@ public class NEEContainerDrawHandler implements IContainerDrawHandler { IngredientTracker tracker = new IngredientTracker(firstGui, ingredients); //check stacks in player's inventory and crafting grid + List inventoryStacks = new ArrayList<>(); for (Slot slot : (List) firstGui.inventorySlots.inventorySlots) { boolean canGetStack = slot != null && slot.getHasStack() && slot.getStack().stackSize > 0 && slot.isItemValid(slot.getStack()) && slot.canTakeStack(Minecraft.getMinecraft().thePlayer); if (canGetStack) { - tracker.addIngredientStack(slot.getStack()); + inventoryStacks.add(slot.getStack().copy()); + } + } + + for (int i = 0; i < tracker.getIngredients().size(); i++) { + for (ItemStack stack : inventoryStacks) { + tracker.addAvailableStack(stack); } } 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 b003f30..b1a2c76 100644 --- a/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHelper.java +++ b/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHelper.java @@ -69,7 +69,7 @@ public class NEECraftingHelper implements IOverlayHandler { for (Slot slot : (List) firstGui.inventorySlots.inventorySlots) { boolean canGetStack = slot != null && slot.getHasStack() && slot.getStack().stackSize > 0 && slot.isItemValid(slot.getStack()) && slot.canTakeStack(Minecraft.getMinecraft().thePlayer); if (canGetStack) { - tracker.addIngredientStack(slot.getStack()); + tracker.addAvailableStack(slot.getStack()); } } diff --git a/src/main/java/com/github/vfyjxf/nee/utils/IngredientTracker.java b/src/main/java/com/github/vfyjxf/nee/utils/IngredientTracker.java index 05bc4e8..7ad0404 100644 --- a/src/main/java/com/github/vfyjxf/nee/utils/IngredientTracker.java +++ b/src/main/java/com/github/vfyjxf/nee/utils/IngredientTracker.java @@ -124,12 +124,18 @@ public class IngredientTracker { return requireToCraftStacks; } - public void addIngredientStack(ItemStack stack) { + public void addAvailableStack(ItemStack stack) { for (Ingredient ingredient : this.ingredients) { if (ingredient.requiresToCraft()) { ItemStack craftableStack = ingredient.getCraftableIngredient(); - if (craftableStack != null && craftableStack.isItemEqual(stack) && ItemStack.areItemStackTagsEqual(craftableStack, stack)) { + if (craftableStack != null && craftableStack.isItemEqual(stack) && ItemStack.areItemStackTagsEqual(craftableStack, stack) && stack.stackSize > 0) { + int missingCount = (int) ingredient.getMissingCount(); ingredient.addCurrentCount(stack.stackSize); + if (ingredient.requiresToCraft()) { + stack.stackSize = 0; + } else { + stack.stackSize -= missingCount; + } break; } }