From a33bca92fbf9ec0a1d7f42f5a1a08b807739007c Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Sat, 20 Jul 2024 12:08:16 +0200 Subject: Fix CAL weirdness (#2740) * do not save length variable in item nbt * remove implicit recipe lock from cal --- .../multis/GT_TileEntity_CircuitAssemblyLine.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java index 10040eab94..49986d9a1c 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java @@ -255,7 +255,9 @@ public class GT_TileEntity_CircuitAssemblyLine extends this.imprintedItemName = this.type == null ? "" : GT_LanguageManager.getTranslateableItemStackName(ItemStack.loadItemStackFromNBT(this.type)); mode = aNBT.getInteger(RUNNING_MODE_KEY); - length = aNBT.getInteger(LENGTH_KEY); + if (aNBT.hasKey(LENGTH_KEY)) { + length = aNBT.getInteger(LENGTH_KEY); + } super.loadNBTData(aNBT); } @@ -263,7 +265,6 @@ public class GT_TileEntity_CircuitAssemblyLine extends public void setItemNBT(NBTTagCompound aNBT) { if (!this.type.equals(new NBTTagCompound())) aNBT.setTag(IMPRINT_KEY, this.type); aNBT.setInteger(RUNNING_MODE_KEY, mode); - aNBT.setInteger(LENGTH_KEY, length); super.saveNBTData(aNBT); } @@ -605,13 +606,13 @@ public class GT_TileEntity_CircuitAssemblyLine extends } @Override - public boolean isInputSeparationEnabled() { - return mode == 1 && super.isInputSeparationEnabled(); + public boolean supportsSingleRecipeLocking() { + return true; } @Override - public boolean isRecipeLockingEnabled() { - return this.mode == 0 && this.imprintedItemName != null && !"".equals(this.imprintedItemName); + public boolean isInputSeparationEnabled() { + return mode == 1 && super.isInputSeparationEnabled(); } @Override -- cgit