diff --git a/src/main/java/mekanism/common/base/IFactory.java b/src/main/java/mekanism/common/base/IFactory.java index 261a5c00e..006f3249d 100644 --- a/src/main/java/mekanism/common/base/IFactory.java +++ b/src/main/java/mekanism/common/base/IFactory.java @@ -112,6 +112,16 @@ public interface IFactory { return type; } + @Nullable + public static RecipeType getFromMachineType(MachineType machineType) { + for (RecipeType type : values()) { + if (type.type == machineType) { + return type; + } + } + return null; + } + public BasicMachineRecipe getRecipe(ItemStackInput input) { return (BasicMachineRecipe) RecipeHandler.getRecipe(input, recipe); } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFactory.java b/src/main/java/mekanism/common/inventory/container/ContainerFactory.java index 2ba4d611b..172044a25 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFactory.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFactory.java @@ -3,6 +3,7 @@ package mekanism.common.inventory.container; import javax.annotation.Nonnull; import mekanism.api.infuse.InfuseRegistry; import mekanism.common.base.IFactory.RecipeType; +import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.item.ItemBlockMachine; @@ -25,8 +26,14 @@ public class ContainerFactory extends ContainerMekanism { @Override protected void addSlots() { addSlotToContainer(new SlotDischarge(tileEntity, 1, 7, 13)); - addSlotToContainer(new Slot(tileEntity, 2, 180, 75)); - addSlotToContainer(new Slot(tileEntity, 3, 180, 112)); + addSlotToContainer(new Slot(tileEntity, 2, 180, 75) { + @Override + public boolean isItemValid(ItemStack stack) { + MachineType swapType = MachineType.get(stack); + return swapType != null && !swapType.isFactory(); + } + }); + addSlotToContainer(new SlotOutput(tileEntity, 3, 180, 112)); addSlotToContainer(new Slot(tileEntity, 4, 7, 57)); if (tileEntity.tier == FactoryTier.BASIC) { for (int i = 0; i < tileEntity.tier.processes; i++) { diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index c2c37e15d..46cbf48e2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -33,6 +33,7 @@ import mekanism.common.base.ITierUpgradeable; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.computer.IComputerIntegration; +import mekanism.common.item.ItemBlockMachine; import mekanism.common.recipe.GasConversionHandler; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.AdvancedMachineInput; @@ -235,37 +236,38 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt handleSecondaryFuel(); sortInventory(); - if (!inventory.get(2).isEmpty() && inventory.get(3).isEmpty()) { - RecipeType toSet = null; + ItemStack machineSwapItem = inventory.get(2); + if (!machineSwapItem.isEmpty() && machineSwapItem.getItem() instanceof ItemBlockMachine && inventory.get(3).isEmpty()) { - for (RecipeType type : RecipeType.values()) { - if (ItemHandlerHelper.canItemStacksStack(inventory.get(2), type.getStack())) { - toSet = type; - break; - } - } - if (toSet != null && recipeType != toSet) { - if (recipeTicks < RECIPE_TICKS_REQUIRED) { - recipeTicks++; + MachineType swapType = MachineType.get(machineSwapItem); + + if (swapType != null && !swapType.isFactory()) { + + RecipeType toSet = RecipeType.getFromMachineType(swapType); + + if (toSet != null && recipeType != toSet) { + if (recipeTicks < RECIPE_TICKS_REQUIRED) { + recipeTicks++; + } else { + recipeTicks = 0; + ItemStack returnStack = getMachineStack(); + + upgradeComponent.write(ItemDataUtils.getDataMap(returnStack)); + upgradeComponent.setSupported(Upgrade.GAS, toSet.fuelEnergyUpgrades()); + upgradeComponent.read(ItemDataUtils.getDataMapIfPresentNN(machineSwapItem)); + + inventory.set(2, ItemStack.EMPTY); + inventory.set(3, returnStack); + + setRecipeType(toSet); + gasTank.setGas(null); + secondaryEnergyPerTick = getSecondaryEnergyPerTick(recipeType); + world.notifyNeighborsOfStateChange(getPos(), getBlockType(), true); + MekanismUtils.saveChunk(this); + } } else { recipeTicks = 0; - ItemStack returnStack = getMachineStack(); - - upgradeComponent.write(ItemDataUtils.getDataMap(returnStack)); - upgradeComponent.setSupported(Upgrade.GAS, toSet.fuelEnergyUpgrades()); - upgradeComponent.read(ItemDataUtils.getDataMapIfPresentNN(inventory.get(2))); - - inventory.set(2, ItemStack.EMPTY); - inventory.set(3, returnStack); - - setRecipeType(toSet); - gasTank.setGas(null); - secondaryEnergyPerTick = getSecondaryEnergyPerTick(recipeType); - world.notifyNeighborsOfStateChange(getPos(), getBlockType(), true); - MekanismUtils.saveChunk(this); } - } else { - recipeTicks = 0; } } else { recipeTicks = 0;