From 190726678c8002354f031ed6d58e9ffdc92cb8f4 Mon Sep 17 00:00:00 2001
From: IzzelAliz <csh2001331@126.com>
Date: Thu, 18 Feb 2021 01:00:46 +0800
Subject: [PATCH] Update InventoryView when container layout changed

---
 .../inventory/container/ContainerMixin.java   |  5 +--
 .../common/mod/server/ArclightContainer.java  | 31 ++++++++++++++++---
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/ContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/ContainerMixin.java
index 20ad1d43..4122df4e 100644
--- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/ContainerMixin.java
+++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/ContainerMixin.java
@@ -68,8 +68,9 @@ public abstract class ContainerMixin implements ContainerBridge {
     private long bukkitViewHash = 0;
 
     public InventoryView getBukkitView() {
-        if (bukkitViewHash != bukkitViewHash()) {
-            bukkitView = null;
+        if (bukkitView != null && bukkitViewHash != bukkitViewHash()) {
+            ArclightContainer.updateView((Container) (Object) this, bukkitView);
+            bukkitViewHash = bukkitViewHash();
         }
         if (bukkitView == null) {
             bukkitView = ArclightContainer.createInvView((Container) (Object) this);
diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/ArclightContainer.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/ArclightContainer.java
index ad09c2e4..7f9a8a0c 100644
--- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/ArclightContainer.java
+++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/ArclightContainer.java
@@ -6,6 +6,8 @@ import io.izzel.arclight.common.bridge.inventory.IInventoryBridge;
 import io.izzel.arclight.common.bridge.inventory.container.PosContainerBridge;
 import io.izzel.arclight.common.mod.ArclightMod;
 import io.izzel.arclight.common.mod.util.ArclightCaptures;
+import io.izzel.tools.product.Product;
+import io.izzel.tools.product.Product2;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.IInventory;
@@ -82,8 +84,26 @@ public class ArclightContainer {
         }
     }
 
-    // todo check this
     public static InventoryView createInvView(Container container) {
+        Product2<PlayerEntity, Integer> containerInfo = getContainerInfo(container);
+        Inventory viewing = new CraftInventory(new ContainerInvWrapper(container, containerInfo._2, containerInfo._1));
+        return new CraftInventoryView(((PlayerEntityBridge) containerInfo._1).bridge$getBukkitEntity(), viewing, container);
+    }
+
+    public static void updateView(Container container, InventoryView inventoryView) {
+        Inventory topInventory = inventoryView.getTopInventory();
+        if (topInventory instanceof CraftInventory) {
+            IInventory inventory = ((CraftInventory) topInventory).getInventory();
+            if (inventory instanceof ContainerInvWrapper) {
+                Product2<PlayerEntity, Integer> containerInfo = getContainerInfo(container);
+                ((ContainerInvWrapper) inventory).setOwner(((PlayerEntityBridge) containerInfo._1).bridge$getBukkitEntity());
+                ((ContainerInvWrapper) inventory).setSize(containerInfo._2);
+            }
+        }
+    }
+
+    // todo check this
+    private static Product2<PlayerEntity, Integer> getContainerInfo(Container container) {
         PlayerEntity candidate = ArclightCaptures.getContainerOwner();
         int bottomBegin = -1, bottomEnd = -1;
         for (ListIterator<Slot> iterator = container.inventorySlots.listIterator(); iterator.hasNext(); ) {
@@ -109,14 +129,13 @@ public class ArclightContainer {
         if (bottomBegin < bottomEnd || bottomBegin == -1) {
             bottomBegin = container.inventorySlots.size();
         }
-        Inventory viewing = new CraftInventory(new ContainerInvWrapper(container, bottomBegin, candidate));
-        return new CraftInventoryView(((PlayerEntityBridge) candidate).bridge$getBukkitEntity(), viewing, container);
+        return Product.of(candidate, bottomBegin);
     }
 
     private static class ContainerInvWrapper implements IInventory, IInventoryBridge {
 
         private final Container container;
-        private final int size;
+        private int size;
         private InventoryHolder owner;
         private final List<HumanEntity> viewers = new ArrayList<>();
 
@@ -126,6 +145,10 @@ public class ArclightContainer {
             this.owner = ((PlayerEntityBridge) owner).bridge$getBukkitEntity();
         }
 
+        public void setSize(int size) {
+            this.size = size;
+        }
+
         @Override
         public int getSizeInventory() {
             return size;