diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-12-05 13:53:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-05 13:53:30 +0100 |
| commit | e5b2fc453bfa87ae8569698cb721057de11b4590 (patch) | |
| tree | f2da41ecd3793add06c9e2ed91c47309976d754a /src/main/java/gregtech/api/metatileentity/implementations | |
| parent | 428859c05338af715107de27bd14f45d82dee957 (diff) | |
| parent | 8c029eab281e8612da2dd12f8b0d61ee8c8417a2 (diff) | |
| download | GT5-Unofficial-e5b2fc453bfa87ae8569698cb721057de11b4590.tar.gz GT5-Unofficial-e5b2fc453bfa87ae8569698cb721057de11b4590.tar.bz2 GT5-Unofficial-e5b2fc453bfa87ae8569698cb721057de11b4590.zip | |
Merge pull request #776 from GTNewHorizons/gui-select-circuit
GUI select circuit part 3
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java | 11 |
1 files changed, 9 insertions, 2 deletions
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 @@ -139,6 +139,13 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B } @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<ItemStack> getConfigurationCircuits() { - return GregTech_API.getConfigurationCircuitList(); + return GregTech_API.getConfigurationCircuitList(mTier); } /** |