Fix ingredients not always using the correct amount of items

This commit is contained in:
modmuss50 2019-08-18 14:30:59 +01:00
parent d585b298fb
commit bfb8d81367
2 changed files with 5 additions and 14 deletions

View file

@ -36,7 +36,6 @@ import reborncore.client.containerBuilder.builder.BuiltContainer;
import reborncore.client.containerBuilder.builder.ContainerBuilder;
import reborncore.common.crafting.RebornRecipe;
import reborncore.common.crafting.ingredient.RebornIngredient;
import reborncore.common.crafting.ingredient.StackIngredient;
import reborncore.common.powerSystem.PowerAcceptorBlockEntity;
import reborncore.common.util.ItemUtils;
import reborncore.common.util.RebornInventory;
@ -48,7 +47,6 @@ import techreborn.init.TRBlockEntities;
import techreborn.init.TRContent;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
public class FusionControlComputerBlockEntity extends PowerAcceptorBlockEntity
implements IToolDrop, InventoryProvider, IContainerProvider {
@ -210,9 +208,7 @@ public class FusionControlComputerBlockEntity extends PowerAcceptorBlockEntity
}
for (RebornIngredient ingredient : currentRecipe.getRebornIngredients()) {
if (ingredient.test(inventory.getInvStack(slot))) {
AtomicInteger count = new AtomicInteger(1);
ingredient.ifType(StackIngredient.class, stackIngredient -> count.set(stackIngredient.getCount()));
inventory.shrinkSlot(slot, count.get());
inventory.shrinkSlot(slot, ingredient.getCount());
break;
}
}

View file

@ -33,16 +33,13 @@ import reborncore.api.blockentity.InventoryProvider;
import reborncore.client.containerBuilder.IContainerProvider;
import reborncore.client.containerBuilder.builder.BuiltContainer;
import reborncore.client.containerBuilder.builder.ContainerBuilder;
import reborncore.common.crafting.ingredient.RebornIngredient;
import reborncore.common.crafting.RebornRecipe;
import reborncore.common.crafting.ingredient.StackIngredient;
import reborncore.common.blockentity.MachineBaseBlockEntity;
import reborncore.common.crafting.RebornRecipe;
import reborncore.common.crafting.ingredient.RebornIngredient;
import reborncore.common.util.RebornInventory;
import techreborn.init.ModRecipes;
import techreborn.init.TRContent;
import techreborn.init.TRBlockEntities;
import java.util.concurrent.atomic.AtomicInteger;
import techreborn.init.TRContent;
public class IronAlloyFurnaceBlockEntity extends MachineBaseBlockEntity
implements IToolDrop, InventoryProvider, IContainerProvider {
@ -196,9 +193,7 @@ public class IronAlloyFurnaceBlockEntity extends MachineBaseBlockEntity
for (RebornIngredient ingredient : recipeType.getRebornIngredients()) {
for (int inputSlot = 0; inputSlot < 2; inputSlot++) {
if (ingredient.test(this.inventory.getInvStack(inputSlot))) {
AtomicInteger count = new AtomicInteger(1);
ingredient.ifType(StackIngredient.class, stackIngredient -> count.set(stackIngredient.getCount()));
inventory.shrinkSlot(inputSlot, count.get());
inventory.shrinkSlot(inputSlot, ingredient.getCount());
break;
}
}