ability to reopen containers

Author: brachy84

src/main/java/com/cleanroommc/modularui/api/MCHelper.java

@@ -3,6 +3,7 @@
 import com.cleanroommc.modularui.ModularUI;
 import com.cleanroommc.modularui.ModularUIConfig;
 import com.cleanroommc.modularui.api.drawable.IKey;
+import com.cleanroommc.modularui.network.ModularNetwork;
 import com.cleanroommc.modularui.network.NetworkUtils;
 
 import net.minecraft.client.Minecraft;
@@ -60,6 +61,7 @@ public static void popScreen(boolean openParentOnClose, GuiScreen parent) {
             // instead they are kept in a stack until all screens are closed
             if (openParentOnClose) {
                 Minecraft.getMinecraft().displayGuiScreen(parent);
+                ModularNetwork.CLIENT.reopenSyncerOf(parent);
             } else {
                 Minecraft.getMinecraft().displayGuiScreen(null);
             }

src/main/java/com/cleanroommc/modularui/factory/GuiManager.java

@@ -90,7 +90,7 @@ public static <T extends GuiData> void open(@NotNull UIFactory<T> factory, @NotN
         factory.writeGuiData(guiData, buffer);
         int nid = ModularNetwork.SERVER.activate(msm);
         NetworkHandler.sendToPlayer(new OpenGuiPacket<>(windowId, nid, factory, buffer), player);
-        // open container // this mimics forge behaviour
+        // open container // this mimics forge behavior
         player.openContainer = container;
         player.openContainer.windowId = windowId;
         player.openContainer.addListener(player);

src/main/java/com/cleanroommc/modularui/network/ModularNetwork.java

@@ -1,9 +1,11 @@
 package com.cleanroommc.modularui.network;
 
+import com.cleanroommc.modularui.api.IMuiScreen;
 import com.cleanroommc.modularui.value.sync.ModularSyncManager;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
@@ -64,6 +66,14 @@ public void closeContainer(int networkId, boolean dispose, EntityPlayerSP player
         public void closeAll() {
             closeAll(Minecraft.getMinecraft().player);
         }
+
+        @SideOnly(Side.CLIENT)
+        public void reopenSyncerOf(GuiScreen guiScreen) {
+            if (guiScreen instanceof IMuiScreen ms && !ms.getScreen().isClientOnly()) {
+                ModularSyncManager msm = ms.getScreen().getSyncManager();
+                reopen(Minecraft.getMinecraft().player, msm, true);
+            }
+        }
     }
 
     public static final class Server extends ModularNetworkSide {

src/main/java/com/cleanroommc/modularui/network/ModularNetworkSide.java

@@ -4,12 +4,15 @@
 import com.cleanroommc.modularui.network.packets.CloseAllGuiPacket;
 import com.cleanroommc.modularui.network.packets.CloseGuiPacket;
 import com.cleanroommc.modularui.network.packets.PacketSyncHandler;
+import com.cleanroommc.modularui.network.packets.ReopenGuiPacket;
 import com.cleanroommc.modularui.screen.ModularContainer;
 import com.cleanroommc.modularui.value.sync.ModularSyncManager;
 import com.cleanroommc.modularui.value.sync.SyncHandler;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.network.PacketBuffer;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.player.PlayerContainerEvent;
 
 import it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap;
 import it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap;
@@ -115,4 +118,20 @@ void deactivate(int networkId, boolean dispose) {
             msm.dispose();
         }
     }
+
+    @ApiStatus.Internal
+    public void reopen(EntityPlayer player, ModularSyncManager msm, boolean sync) {
+        if (player.openContainer != msm.getContainer()) {
+            closeContainer(player);
+            player.openContainer = msm.getContainer();
+            msm.onOpen();
+            MinecraftForge.EVENT_BUS.post(new PlayerContainerEvent.Open(player, msm.getContainer()));
+        }
+        if (sync) sendPacket(new ReopenGuiPacket(inverseActiveScreens.getInt(msm)), player);
+    }
+
+    @ApiStatus.Internal
+    public void reopen(EntityPlayer player, int networkId, boolean sync) {
+        reopen(player, activeScreens.get(networkId), sync);
+    }
 }

src/main/java/com/cleanroommc/modularui/network/NetworkHandler.java

@@ -5,6 +5,7 @@
 import com.cleanroommc.modularui.network.packets.CloseGuiPacket;
 import com.cleanroommc.modularui.network.packets.OpenGuiPacket;
 import com.cleanroommc.modularui.network.packets.PacketSyncHandler;
+import com.cleanroommc.modularui.network.packets.ReopenGuiPacket;
 import com.cleanroommc.modularui.network.packets.SClipboard;
 import com.cleanroommc.modularui.network.packets.SyncConfig;
 
@@ -30,6 +31,7 @@ public static void init() {
         registerC2S(SyncConfig.class);
 
         registerBoth(OpenGuiPacket.class);
+        registerBoth(ReopenGuiPacket.class);
         registerBoth(CloseGuiPacket.class);
         registerBoth(CloseAllGuiPacket.class);
         registerBoth(PacketSyncHandler.class);

src/main/java/com/cleanroommc/modularui/network/packets/ReopenGuiPacket.java

@@ -0,0 +1,46 @@
+package com.cleanroommc.modularui.network.packets;
+
+import com.cleanroommc.modularui.network.IPacket;
+import com.cleanroommc.modularui.network.ModularNetwork;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.network.PacketBuffer;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.io.IOException;
+
+public class ReopenGuiPacket implements IPacket {
+
+    private int networkId;
+
+    public ReopenGuiPacket() {}
+
+    public ReopenGuiPacket(int networkId) {
+        this.networkId = networkId;
+    }
+
+    @Override
+    public void write(PacketBuffer buf) throws IOException {
+        buf.writeInt(networkId);
+    }
+
+    @Override
+    public void read(PacketBuffer buf) throws IOException {
+        this.networkId = buf.readInt();
+    }
+
+    @Override
+    public @Nullable IPacket executeClient(NetHandlerPlayClient handler) {
+        ModularNetwork.CLIENT.reopen(Minecraft.getMinecraft().player, this.networkId, false);
+        return null;
+    }
+
+    @Override
+    public @Nullable IPacket executeServer(NetHandlerPlayServer handler) {
+        ModularNetwork.SERVER.reopen(handler.player, this.networkId, false);
+        return null;
+    }
+}