Sync fixes (#50)

* try some shit

* fix desyncs

* undo testing stuff

* fix

Author: brachy84

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

@@ -10,10 +10,15 @@
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.network.PacketBuffer;
 import net.minecraftforge.client.event.GuiOpenEvent;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.common.util.FakePlayer;
+import net.minecraftforge.event.entity.player.PlayerContainerEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.gameevent.TickEvent;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@@ -22,6 +27,8 @@
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Objects;
 
@@ -30,6 +37,7 @@ public class GuiManager {
     private static final Object2ObjectMap<String, UIFactory<?>> FACTORIES = new Object2ObjectOpenHashMap<>(16);
 
     private static GuiScreenWrapper lastMui;
+    private static final List<EntityPlayer> openedContainers = new ArrayList<>(4);
 
     public static void registerFactory(UIFactory<?> factory) {
         Objects.requireNonNull(factory);
@@ -50,6 +58,8 @@ public static void registerFactory(UIFactory<?> factory) {
     }
 
     public static <T extends GuiData> void open(@NotNull UIFactory<T> factory, @NotNull T guiData, EntityPlayerMP player) {
+        if (player instanceof FakePlayer || openedContainers.contains(player)) return;
+        openedContainers.add(player);
         // create panel, collect sync handlers and create container
         guiData.setJeiSettings(JeiSettings.DUMMY);
         GuiSyncManager syncManager = new GuiSyncManager(player);
@@ -67,6 +77,8 @@ public static <T extends GuiData> void open(@NotNull UIFactory<T> factory, @NotN
         PacketBuffer buffer = new PacketBuffer(Unpooled.buffer());
         factory.writeGuiData(guiData, buffer);
         NetworkHandler.sendToPlayer(new OpenGuiPacket<>(windowId, factory, buffer), player);
+        // finally invoke event
+        MinecraftForge.EVENT_BUS.post(new PlayerContainerEvent.Open(player, container));
     }
 
     @SideOnly(Side.CLIENT)
@@ -82,6 +94,7 @@ public static <T extends GuiData> void open(int windowId, @NotNull UIFactory<T>
         GuiScreenWrapper guiScreenWrapper = new GuiScreenWrapper(new ModularContainer(syncManager), screen);
         guiScreenWrapper.inventorySlots.windowId = windowId;
         Minecraft.getMinecraft().displayGuiScreen(guiScreenWrapper);
+        player.openContainer = guiScreenWrapper.inventorySlots;
     }
 
     @SideOnly(Side.CLIENT)
@@ -91,6 +104,13 @@ static void openScreen(ModularScreen screen, JeiSettingsImpl jeiSettings) {
         Minecraft.getMinecraft().displayGuiScreen(screenWrapper);
     }
 
+    @SubscribeEvent
+    public static void onTick(TickEvent.ServerTickEvent event) {
+        if (event.phase == TickEvent.Phase.END) {
+            openedContainers.clear();
+        }
+    }
+
     @SubscribeEvent
     public static void onGuiOpen(GuiOpenEvent event) {
         if (lastMui != null && event.getGui() == null) {

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

@@ -1,10 +1,7 @@
 package com.cleanroommc.modularui.network;
 
 import com.cleanroommc.modularui.ModularUI;
-import com.cleanroommc.modularui.network.packets.OpenGuiPacket;
-import com.cleanroommc.modularui.network.packets.PacketSyncHandler;
-import com.cleanroommc.modularui.network.packets.SClipboard;
-import com.cleanroommc.modularui.network.packets.SyncConfig;
+import com.cleanroommc.modularui.network.packets.*;
 
 import net.minecraft.client.network.NetHandlerPlayClient;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -28,6 +25,7 @@ public static void init() {
         registerC2S(PacketSyncHandler.class);
         registerC2S(SyncConfig.class);
         registerS2C(OpenGuiPacket.class);
+        registerC2S(OpenGuiHandshake.class);
     }
 
     private static void registerC2S(Class<? extends IPacket> clazz) {

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

@@ -0,0 +1,41 @@
+package com.cleanroommc.modularui.network.packets;
+
+import com.cleanroommc.modularui.network.IPacket;
+import com.cleanroommc.modularui.screen.ModularContainer;
+
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.network.PacketBuffer;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.io.IOException;
+
+public class OpenGuiHandshake implements IPacket {
+
+    private int windowId;
+
+    public OpenGuiHandshake() {
+    }
+
+    public OpenGuiHandshake(int windowId) {
+        this.windowId = windowId;
+    }
+
+    @Override
+    public void write(PacketBuffer buf) throws IOException {
+        buf.writeVarInt(this.windowId);
+    }
+
+    @Override
+    public void read(PacketBuffer buf) throws IOException {
+        this.windowId = buf.readVarInt();
+    }
+
+    @Override
+    public @Nullable IPacket executeServer(NetHandlerPlayServer handler) {
+        if (handler.player.openContainer instanceof ModularContainer container && container.windowId == this.windowId) {
+            container.onHandshake();
+        }
+        return null;
+    }
+}

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

@@ -4,6 +4,7 @@
 import com.cleanroommc.modularui.factory.GuiData;
 import com.cleanroommc.modularui.factory.GuiManager;
 import com.cleanroommc.modularui.network.IPacket;
+import com.cleanroommc.modularui.network.NetworkHandler;
 import com.cleanroommc.modularui.network.NetworkUtils;
 
 import net.minecraft.client.Minecraft;
@@ -49,6 +50,7 @@ public void read(PacketBuffer buf) {
     @Override
     public @Nullable IPacket executeClient(NetHandlerPlayClient handler) {
         GuiManager.open(this.windowId, this.factory, this.data, Minecraft.getMinecraft().player);
+        NetworkHandler.sendToServer(new OpenGuiHandshake(this.windowId));
         return null;
     }
 }

src/main/java/com/cleanroommc/modularui/screen/ModularContainer.java

@@ -46,7 +46,7 @@ public static ModularContainer getCurrent(EntityPlayer player) {
     }
 
     private final GuiSyncManager guiSyncManager;
-    private boolean init = true;
+    private boolean init = true, handshake = false;
     private final List<ModularSlot> slots = new ArrayList<>();
     private final List<ModularSlot> shiftClickSlots = new ArrayList<>();
 
@@ -72,14 +72,17 @@ public ContainerAccessor acc() {
     @Override
     public void onContainerClosed(@NotNull EntityPlayer playerIn) {
         super.onContainerClosed(playerIn);
+        this.handshake = false;
         if (this.guiSyncManager != null) {
             this.guiSyncManager.onClose();
         }
     }
 
     @Override
     public void detectAndSendChanges() {
-        super.detectAndSendChanges();
+        if (this.handshake) {
+            super.detectAndSendChanges();
+        }
         this.guiSyncManager.detectAndSendChanges(this.init);
         this.init = false;
     }
@@ -363,4 +366,8 @@ public void buildSortingContext(ISortingContextBuilder builder) {
     public IPosSetter getPlayerButtonPosSetter() {
         return null;
     }
+
+    public void onHandshake() {
+        this.handshake = true;
+    }
 }

src/main/java/com/cleanroommc/modularui/test/TestTile.java

@@ -1,6 +1,5 @@
 package com.cleanroommc.modularui.test;
 
-import com.cleanroommc.modularui.ModularUI;
 import com.cleanroommc.modularui.api.IGuiHolder;
 import com.cleanroommc.modularui.api.drawable.IKey;
 import com.cleanroommc.modularui.drawable.*;
@@ -23,15 +22,17 @@
 import com.cleanroommc.modularui.widgets.layout.Row;
 import com.cleanroommc.modularui.widgets.textfield.TextFieldWidget;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ITickable;
 import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.items.IItemHandlerModifiable;
 import net.minecraftforge.items.ItemStackHandler;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 
@@ -215,7 +216,7 @@ public ModularPanel buildUI(PosGuiData guiData, GuiSyncManager guiSyncManager) {
                                                         .size(14, 14)
                                                         .length(3)
                                                         .texture(GuiTextures.CYCLE_BUTTON_DEMO)
-                                                        .value(new IntValue.Dynamic(() -> this.val2, val -> this.val2 = val))
+                                                        .value(new IntSyncValue(() -> this.val2, val -> this.val2 = val))
                                                         .margin(8, 0))
                                                 .child(IKey.str("Hello World").asWidget().height(18)))
                                         .child(new SpecialButton(IKey.str("A very long string that looks cool when animated").withAnimation())
@@ -354,12 +355,29 @@ public void update() {
             if (this.time++ % 20 == 0) {
                 this.val++;
             }
+        } else {
+            if (this.time++ % 20 == 0 && ++this.val2 == 3) {
+                this.val2 = 0;
+            }
         }
         if (++this.progress == this.duration) {
             this.progress = 0;
         }
     }
 
+    @Override
+    public @NotNull NBTTagCompound writeToNBT(@NotNull NBTTagCompound compound) {
+        compound = super.writeToNBT(compound);
+        compound.setTag("item_inv", this.bigInventory.serializeNBT());
+        return compound;
+    }
+
+    @Override
+    public void readFromNBT(@NotNull NBTTagCompound compound) {
+        super.readFromNBT(compound);
+        this.bigInventory.deserializeNBT(compound.getCompoundTag("item_inv"));
+    }
+
     private static class SpecialButton extends ButtonWidget<SpecialButton> {
 
         private final AnimatedText animatedKey;

src/main/java/com/cleanroommc/modularui/widgets/FluidSlot.java

@@ -143,7 +143,7 @@ public void draw(GuiContext context, WidgetTheme widgetTheme) {
             GuiDraw.drawFluidTexture(content, this.contentOffsetX, y, getArea().width - this.contentOffsetX * 2, height, 0);
         }
         if (this.overlayTexture != null) {
-            this.overlayTexture.draw(context, getArea());
+            this.overlayTexture.drawAtZero(context, getArea(), widgetTheme);
         }
         if (content != null && this.syncHandler.controlsAmount()) {
             String s = NumberFormat.formatWithMaxDigits(getBaseUnitAmount(content.amount)) + getBaseUnit();

src/main/java/com/cleanroommc/modularui/widgets/ItemSlot.java

@@ -32,6 +32,8 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
+import net.minecraftforge.items.IItemHandlerModifiable;
+
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -169,6 +171,10 @@ public ItemSlot slot(ModularSlot slot) {
         return this;
     }
 
+    public ItemSlot slot(IItemHandlerModifiable itemHandler, int index) {
+        return slot(new ModularSlot(itemHandler, index));
+    }
+
     @SideOnly(Side.CLIENT)
     private void drawSlot(Slot slotIn) {
         GuiScreenWrapper guiScreen = getScreen().getScreenWrapper();