Make GuiSecurityTab's ISecurityObject properly "update" when the held…

… stack changes to properly update what level it displays mekanism#6993
EnabledEnzo · Feb 16, 2021 · ebf355c · ebf355c
1 parent 7910add
commit ebf355c
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 6 deletions.
diff --git a/src/main/java/mekanism/client/gui/element/tab/GuiSecurityTab.java b/src/main/java/mekanism/client/gui/element/tab/GuiSecurityTab.java
@@ -53,12 +53,14 @@ public GuiSecurityTab(IGuiWrapper gui, ISecurityObject securityObject, int y) {
     }
 
     private static ISecurityObject getItemSecurityObject(@Nonnull Hand hand) {
-        ItemStack stack = minecraft.player.getHeldItem(hand);
-        if (stack.isEmpty() || !(stack.getItem() instanceof ISecurityItem)) {
-            minecraft.player.closeScreen();
-            return ISecurityObject.NO_SECURITY;
-        }
-        return SecurityUtils.wrapSecurityItem(stack);
+        return SecurityUtils.wrapSecurityItem(() -> {
+            ItemStack stack = minecraft.player.getHeldItem(hand);
+            if (stack.isEmpty() || !(stack.getItem() instanceof ISecurityItem)) {
+                minecraft.player.closeScreen();
+                return ItemStack.EMPTY;
+            }
+            return stack;
+        });
     }
 
     public GuiSecurityTab(IGuiWrapper gui, @Nonnull Hand hand) {

diff --git a/src/main/java/mekanism/common/inventory/container/ISecurityContainer.java b/src/main/java/mekanism/common/inventory/container/ISecurityContainer.java
@@ -4,5 +4,8 @@
 
 public interface ISecurityContainer {
 
+    /**
+     * @apiNote Only for use on the server, which means that it doesn't need to properly update on the client side if the stack changes
+     */
     ISecurityObject getSecurityObject();
 }
diff --git a/src/main/java/mekanism/common/util/SecurityUtils.java b/src/main/java/mekanism/common/util/SecurityUtils.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 import java.util.UUID;
+import java.util.function.Supplier;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import mekanism.api.text.EnumColor;
@@ -188,4 +189,63 @@ public void setSecurityMode(SecurityMode mode) {
             }
         };
     }
+
+    /**
+     * @apiNote Mainly for use on the client side when the stack potentially could change while our security object currently exists
+     */
+    public static ISecurityObject wrapSecurityItem(@Nonnull Supplier<ItemStack> stackSupplier) {
+        ItemStack stack = stackSupplier.get();
+        if (stack.isEmpty() || !(stack.getItem() instanceof ISecurityItem)) {
+            return ISecurityObject.NO_SECURITY;
+        }
+        return new ISecurityObject() {
+
+            private ItemStack getAndValidateStack() {
+                ItemStack stack = stackSupplier.get();
+                if (stack.isEmpty() || !(stack.getItem() instanceof ISecurityItem)) {
+                    return ItemStack.EMPTY;
+                }
+                return stack;
+            }
+
+            @Override
+            public boolean hasSecurity() {
+                return !getAndValidateStack().isEmpty();
+            }
+
+            @Nullable
+            @Override
+            public UUID getOwnerUUID() {
+                ItemStack stack = getAndValidateStack();
+                if (stack.isEmpty()) {
+                    return null;
+                }
+                return ((ISecurityItem) stack.getItem()).getOwnerUUID(stack);
+            }
+
+            @Nullable
+            @Override
+            public String getOwnerName() {
+                UUID ownerUUID = getOwnerUUID();
+                return ownerUUID == null ? null : MekanismClient.clientUUIDMap.get(ownerUUID);
+            }
+
+            @Override
+            public SecurityMode getSecurityMode() {
+                ItemStack stack = getAndValidateStack();
+                if (stack.isEmpty()) {
+                    return SecurityMode.PUBLIC;
+                }
+                return ((ISecurityItem) stack.getItem()).getSecurity(stack);
+            }
+
+            @Override
+            public void setSecurityMode(SecurityMode mode) {
+                ItemStack stack = getAndValidateStack();
+                if (!stack.isEmpty()) {
+                    ((ISecurityItem) stack.getItem()).setSecurity(stack, mode);
+                }
+            }
+        };
+    }
 }