From 8c029eab281e8612da2dd12f8b0d61ee8c8417a2 Mon Sep 17 00:00:00 2001 From: Glease <4586901+Glease@users.noreply.github.com> Date: Fri, 3 Dec 2021 14:29:00 +0800 Subject: Make machine reconfiguration interface a little nicer also tweaked the API a little for GT++ conf circuits and bartworks circuit programmer Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> --- .../implementations/GT_MetaTileEntity_BasicMachine.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/main/java/gregtech/api/metatileentity/implementations') diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java index 8f77b6ac5a..92bf07f379 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java @@ -138,6 +138,13 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B return true; } + @Override + public void setInventorySlotContents(int aIndex, ItemStack aStack) { + if (allowSelectCircuit() && aIndex == getCircuitSlot() && aStack != null && aStack.stackSize != 0) + aStack = GT_Utility.copyAmount(0, aStack); + super.setInventorySlotContents(aIndex, aStack); + } + @Override public GT_MetaTileEntity_Cleanroom getCallbackBase() { return this.mCleanroom; @@ -210,7 +217,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B @Override public boolean isValidSlot(int aIndex) { - return aIndex > 0 && super.isValidSlot(aIndex) && aIndex != OTHER_SLOT_COUNT + mInputSlotCount + mOutputItems.length; + return aIndex > 0 && super.isValidSlot(aIndex) && aIndex != getCircuitSlot() && aIndex != OTHER_SLOT_COUNT + mInputSlotCount + mOutputItems.length; } @Override @@ -871,7 +878,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B * This list is unmodifiable. Its elements are not supposed to be modified in any way! */ public List getConfigurationCircuits() { - return GregTech_API.getConfigurationCircuitList(); + return GregTech_API.getConfigurationCircuitList(mTier); } /** -- cgit