fix isVaild when peripheral disconnected

Author: zyxkad

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/InventoryManagerPeripheral.java

@@ -26,11 +26,15 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class InventoryManagerPeripheral extends BasePeripheral<InventoryManagerOwner> {
-
+    public static final String PLAYER_INV_MAGIC_NAME = "@";
     public static final String PERIPHERAL_TYPE = "inventory_manager";
 
+    private final Set<IComputerAccess> computerAccesses = ConcurrentHashMap.newKeySet();
+
     public InventoryManagerPeripheral(InventoryManagerEntity tileEntity) {
         super(PERIPHERAL_TYPE, new InventoryManagerOwner(tileEntity));
     }
@@ -40,13 +44,33 @@ public boolean isEnabled() {
         return APConfig.PERIPHERALS_CONFIG.enableInventoryManager.get();
     }
 
+    @Override
+    public void attach(@NotNull IComputerAccess computer) {
+        super.attach(computer);
+        this.computerAccesses.add(computer);
+    }
+
+    @Override
+    public void detach(@NotNull IComputerAccess computer) {
+        this.computerAccesses.remove(computer);
+        super.detach(computer);
+    }
+
+    public boolean isAccessValid(IComputerAccess access) {
+        return this.computerAccesses.contains(access);
+    }
+
     @Override
     protected Map<String, Object> getPeripheralConfiguration() {
         Map<String, Object> configs = super.getPeripheralConfiguration();
         configs.put("itemsTransferEnabled", APConfig.PERIPHERALS_CONFIG.enableItemsTransfer.get());
         return configs;
     }
 
+    public Player getOwnerPlayer() {
+        return owner.getOwner();
+    }
+
     private ServerPlayer getOwnerPlayerOrError() throws LuaException {
         Player player = owner.getOwner();
         if (player == null) {
@@ -108,7 +132,7 @@ public final MethodResult pullItems(IComputerAccess computer, String fromName, O
 
     @LuaFunction(mainThread = true)
     public final PlayerStorageItemWrapper wrapStorageItem(IComputerAccess computer, int slot) throws LuaException {
-        return PlayerStorageItemWrapper.create(computer, this.getOwnerPlayerOrError(), slot - 1);
+        return PlayerStorageItemWrapper.create(computer, this, this.getOwnerPlayerOrError(), slot - 1);
     }
 
     @LuaFunction(mainThread = true)
@@ -158,6 +182,9 @@ private void assertAllowItemTransfers() throws LuaException {
 
     @NotNull
     private IItemHandler getInventoryHandler(IComputerAccess computer, String name) throws LuaException {
+        if (name.equals(PLAYER_INV_MAGIC_NAME)) {
+            return this.getPlayerInventory();
+        }
         IPeripheral toPeripheral = computer.getAvailablePeripheral(name);
         if (toPeripheral == null) {
             throw new LuaException("Target '" + name + "' does not exist");

src/main/java/de/srendi/advancedperipherals/common/util/inventory/PlayerStorageItemWrapper.java

@@ -5,6 +5,7 @@
 import dan200.computercraft.api.lua.MethodResult;
 import dan200.computercraft.api.peripheral.IComputerAccess;
 import dan200.computercraft.api.peripheral.IPeripheral;
+import de.srendi.advancedperipherals.common.addons.computercraft.peripheral.InventoryManagerPeripheral;
 import de.srendi.advancedperipherals.common.util.EmptyLuaTable;
 import de.srendi.advancedperipherals.common.util.Pair;
 import net.minecraft.server.level.ServerPlayer;
@@ -21,24 +22,24 @@
 
 // TODO: fluid variant?
 public class PlayerStorageItemWrapper {
-    public static final String PLAYER_INV_MAGIC_NAME = "@";
-
     private final IComputerAccess computer;
+    private final WeakReference<InventoryManagerPeripheral> peripheral;
     private final WeakReference<ServerPlayer> player;
     private final int slot;
     private final ItemStack stack;
     private final IItemHandler handler;
 
-    protected PlayerStorageItemWrapper(IComputerAccess computer, ServerPlayer player, int slot, ItemStack stack, IItemHandler handler) {
+    protected PlayerStorageItemWrapper(IComputerAccess computer, InventoryManagerPeripheral peripheral, ServerPlayer player, int slot, ItemStack stack, IItemHandler handler) {
         this.computer = computer;
+        this.peripheral = new WeakReference<>(peripheral);
         this.player = new WeakReference<>(player);
         this.slot = slot;
         this.stack = stack;
         this.handler = handler;
     }
 
     @Nullable
-    public static PlayerStorageItemWrapper create(IComputerAccess computer, @NotNull ServerPlayer player, int slot) {
+    public static PlayerStorageItemWrapper create(IComputerAccess computer, InventoryManagerPeripheral peripheral, @NotNull ServerPlayer player, int slot) {
         ItemStack stack = player.getInventory().getItem(slot);
         if (stack.isEmpty()) {
             return null;
@@ -47,15 +48,22 @@ public static PlayerStorageItemWrapper create(IComputerAccess computer, @NotNull
         if (handler == null) {
             return null;
         }
-        return new PlayerStorageItemWrapper(computer, player, slot, stack, handler);
+        return new PlayerStorageItemWrapper(computer, peripheral, player, slot, stack, handler);
     }
 
     public boolean isValid() {
         ServerPlayer player = this.player.get();
         if (player == null || player.isRemoved()) {
             return false;
         }
-        return player.getInventory().getItem(this.slot) == this.stack;
+        if (player.getInventory().getItem(this.slot) != this.stack) {
+            return false;
+        }
+        InventoryManagerPeripheral peripheral = this.peripheral.get();
+        if (peripheral == null || !peripheral.isAccessValid(this.computer)) {
+            return false;
+        }
+        return peripheral.getOwnerPlayer() == player;
     }
 
     protected final void assertValid() throws LuaException {
@@ -96,22 +104,22 @@ public final MethodResult pushItems(String toName, Optional<Map<?, ?>> filterTab
     }
 
     @LuaFunction(mainThread = true)
-    public final MethodResult pullItems(String toName, Optional<Map<?, ?>> filterTable) throws LuaException {
+    public final MethodResult pullItems(String fromName, Optional<Map<?, ?>> filterTable) throws LuaException {
         this.assertValid();
 
         Pair<ItemFilter, String> filter = ItemFilter.parse(EmptyLuaTable.orEmpty(filterTable.orElse(null)));
         if (filter.rightPresent()) {
             return MethodResult.of(null, filter.right());
         }
 
-        IItemHandler inventoryFrom = this.getInventoryHandler(toName);
+        IItemHandler inventoryFrom = this.getInventoryHandler(fromName);
 
         return MethodResult.of(ItemUtil.moveItem(inventoryFrom, this.handler, filter.left()));
     }
 
     @NotNull
     private IItemHandler getInventoryHandler(String name) throws LuaException {
-        if (name.equals(PLAYER_INV_MAGIC_NAME)) {
+        if (name.equals(InventoryManagerPeripheral.PLAYER_INV_MAGIC_NAME)) {
             ServerPlayer player = this.player.get();
             if (player == null || player.isRemoved()) {
                 throw new LuaException("Storage item outdate");