add locking to qchest

fix locking for qtank

Author: ghzdude

src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumChest.java

@@ -43,6 +43,7 @@
 import codechicken.lib.render.pipeline.IVertexOperation;
 import codechicken.lib.vec.Matrix4;
 import com.cleanroommc.modularui.api.drawable.IKey;
+import com.cleanroommc.modularui.network.NetworkUtils;
 import com.cleanroommc.modularui.screen.ModularPanel;
 import com.cleanroommc.modularui.value.sync.PanelSyncManager;
 import com.cleanroommc.modularui.value.sync.SyncHandler;
@@ -71,6 +72,7 @@ public class MetaTileEntityQuantumChest extends MetaTileEntityQuantumStorage<IIt
     protected IItemHandler outputItemInventory;
     private ItemHandlerList combinedInventory;
     protected ItemStack previousStack;
+    protected @NotNull ItemStack lockedStack = ItemStack.EMPTY;
     protected long previousStackSize;
 
     public MetaTileEntityQuantumChest(ResourceLocation metaTileEntityId, int tier, long maxStoredItems) {
@@ -252,6 +254,8 @@ public NBTTagCompound writeToNBT(NBTTagCompound data) {
             tagCompound.setTag(NBT_ITEMSTACK, virtualItemStack.writeToNBT(new NBTTagCompound()));
             tagCompound.setLong(NBT_ITEMCOUNT, itemsStoredInside);
         }
+        if (locked && !lockedStack.isEmpty())
+            data.setTag("LockedStack", lockedStack.serializeNBT());
         return tagCompound;
     }
 
@@ -264,6 +268,7 @@ public void readFromNBT(NBTTagCompound data) {
                 this.itemsStoredInside = data.getLong(NBT_ITEMCOUNT);
             }
         }
+        if (locked) this.lockedStack = new ItemStack(data.getCompoundTag("LockedStack"));
     }
 
     @Override
@@ -307,11 +312,10 @@ public void writeItemStackData(NBTTagCompound itemStack) {
 
     @Override
     protected void createWidgets(ModularPanel mainPanel, PanelSyncManager syncManager) {
-        mainPanel
-                .child(createQuantumDisplay("gregtech.machine.quantum_chest.items_stored",
-                        () -> IKey.lang(virtualItemStack.getDisplayName()).get(),
-                        textWidget -> !virtualItemStack.isEmpty(),
-                        () -> TextFormattingUtil.formatNumbers(itemsStoredInside)))
+        mainPanel.child(createQuantumDisplay("gregtech.machine.quantum_chest.items_stored",
+                () -> IKey.lang(virtualItemStack.getDisplayName()).get(),
+                textWidget -> !virtualItemStack.isEmpty(),
+                () -> TextFormattingUtil.formatNumbers(itemsStoredInside)))
                 .child(new QuantumItemRendererWidget(itemInventory)
                         .pos(148, 41));
     }
@@ -336,6 +340,7 @@ public void writeInitialSyncData(@NotNull PacketBuffer buf) {
         super.writeInitialSyncData(buf);
         this.virtualItemStack.setCount(1);
         buf.writeItemStack(virtualItemStack);
+        NetworkUtils.writeItemStack(buf, lockedStack);
         buf.writeLong(itemsStoredInside);
     }
 
@@ -348,6 +353,7 @@ public void receiveInitialSyncData(@NotNull PacketBuffer buf) {
             GTLog.logger.warn("Failed to load item from NBT in a quantum chest at " + this.getPos() +
                     " on initial server/client sync");
         }
+        this.lockedStack = NetworkUtils.readItemStack(buf);
         this.itemsStoredInside = buf.readLong();
     }
 
@@ -412,6 +418,14 @@ public void setFrontFacing(EnumFacing frontFacing) {
         }
     }
 
+    @Override
+    protected void setLocked(boolean locked) {
+        super.setLocked(locked);
+        if (locked && !this.virtualItemStack.isEmpty())
+            this.lockedStack = this.virtualItemStack.copy();
+        else this.lockedStack = ItemStack.EMPTY;
+    }
+
     @Override
     public void clearMachineInventory(@NotNull List<@NotNull ItemStack> itemBuffer) {
         clearInventory(itemBuffer, importItems);
@@ -509,6 +523,10 @@ public ItemStack insertItem(int slot, @NotNull ItemStack insertedStack, boolean
                 return ItemStack.EMPTY;
             }
 
+            // check locked and if locked stack matches
+            if (locked && !areItemStackIdentical(lockedStack, insertedStack))
+                return insertedStack;
+
             // If there is a virtualized stack and the stack to insert does not match it, do not insert anything
             if (itemsStoredInside > 0L &&
                     !virtualItemStack.isEmpty() &&

src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumTank.java

@@ -53,6 +53,7 @@
 import codechicken.lib.render.pipeline.IVertexOperation;
 import codechicken.lib.vec.Matrix4;
 import com.cleanroommc.modularui.api.drawable.IKey;
+import com.cleanroommc.modularui.network.NetworkUtils;
 import com.cleanroommc.modularui.screen.ModularPanel;
 import com.cleanroommc.modularui.value.sync.PanelSyncManager;
 import org.apache.commons.lang3.ArrayUtils;
@@ -370,8 +371,7 @@ public boolean isValidFrontFacing(EnumFacing facing) {
     @Override
     public void writeInitialSyncData(@NotNull PacketBuffer buf) {
         super.writeInitialSyncData(buf);
-        buf.writeCompoundTag(
-                fluidTank.getFluid() == null ? null : fluidTank.getFluid().writeToNBT(new NBTTagCompound()));
+        NetworkUtils.writeFluidStack(buf, fluidTank.getFluid());
     }
 
     @Override
@@ -385,12 +385,7 @@ public void receiveInitialSyncData(@NotNull PacketBuffer buf) {
                 this.frontFacing = EnumFacing.NORTH;
             }
         }
-        try {
-            this.fluidTank.setFluid(FluidStack.loadFluidStackFromNBT(buf.readCompoundTag()));
-        } catch (IOException e) {
-            GTLog.logger.warn("Failed to load fluid from NBT in a quantum tank at " + this.getPos() +
-                    " on initial server/client sync");
-        }
+        this.fluidTank.setFluid(NetworkUtils.readFluidStack(buf));
     }
 
     @Override
@@ -454,6 +449,15 @@ public boolean onScrewdriverClick(EntityPlayer playerIn, EnumHand hand, EnumFaci
         return super.onScrewdriverClick(playerIn, hand, facing, hitResult);
     }
 
+    @Override
+    protected void setLocked(boolean locked) {
+        super.setLocked(locked);
+        if (locked && fluidTank.getFluid() != null) {
+            this.lockedFluid = fluidTank.getFluid().copy();
+            this.lockedFluid.amount = 1;
+        } else this.lockedFluid = null;
+    }
+
     @Override
     public ItemStack getPickItem(EntityPlayer player) {
         if (!player.isCreative()) return super.getPickItem(player);