Skip to content

Commit 93ec3e6

Browse files
committed
properly fix sync issue
1 parent 6cdc30b commit 93ec3e6

File tree

5 files changed

+8
-57
lines changed

5 files changed

+8
-57
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,17 @@ public static <T extends GuiData> void open(@NotNull UIFactory<T> factory, @NotN
6666
ModularPanel panel = factory.createPanel(guiData, syncManager);
6767
WidgetTree.collectSyncValues(syncManager, panel);
6868
ModularContainer container = new ModularContainer(syncManager);
69-
// open container // this mimics forge behaviour
69+
// sync to client
7070
player.getNextWindowId();
7171
player.closeContainer();
7272
int windowId = player.currentWindowId;
73-
player.openContainer = container;
74-
player.openContainer.windowId = windowId;
75-
player.openContainer.addListener(player);
76-
// sync to client
7773
PacketBuffer buffer = new PacketBuffer(Unpooled.buffer());
7874
factory.writeGuiData(guiData, buffer);
7975
NetworkHandler.sendToPlayer(new OpenGuiPacket<>(windowId, factory, buffer), player);
76+
// open container // this mimics forge behaviour
77+
player.openContainer = container;
78+
player.openContainer.windowId = windowId;
79+
player.openContainer.addListener(player);
8080
// finally invoke event
8181
MinecraftForge.EVENT_BUS.post(new PlayerContainerEvent.Open(player, container));
8282
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static void init() {
2525
registerC2S(PacketSyncHandler.class);
2626
registerC2S(SyncConfig.class);
2727
registerS2C(OpenGuiPacket.class);
28-
registerC2S(OpenGuiHandshake.class);
28+
//registerC2S(OpenGuiHandshake.class);
2929
}
3030

3131
private static void registerC2S(Class<? extends IPacket> clazz) {

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

Lines changed: 0 additions & 41 deletions
This file was deleted.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ public void read(PacketBuffer buf) {
5050
@Override
5151
public @Nullable IPacket executeClient(NetHandlerPlayClient handler) {
5252
GuiManager.open(this.windowId, this.factory, this.data, Minecraft.getMinecraft().player);
53-
NetworkHandler.sendToServer(new OpenGuiHandshake(this.windowId));
5453
return null;
5554
}
5655
}

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public static ModularContainer getCurrent(EntityPlayer player) {
4646
}
4747

4848
private final GuiSyncManager guiSyncManager;
49-
private boolean init = true, handshake = false;
49+
private boolean init = true;
5050
private final List<ModularSlot> slots = new ArrayList<>();
5151
private final List<ModularSlot> shiftClickSlots = new ArrayList<>();
5252

@@ -72,17 +72,14 @@ public ContainerAccessor acc() {
7272
@Override
7373
public void onContainerClosed(@NotNull EntityPlayer playerIn) {
7474
super.onContainerClosed(playerIn);
75-
this.handshake = false;
7675
if (this.guiSyncManager != null) {
7776
this.guiSyncManager.onClose();
7877
}
7978
}
8079

8180
@Override
8281
public void detectAndSendChanges() {
83-
if (this.handshake) {
84-
super.detectAndSendChanges();
85-
}
82+
super.detectAndSendChanges();
8683
this.guiSyncManager.detectAndSendChanges(this.init);
8784
this.init = false;
8885
}
@@ -366,8 +363,4 @@ public void buildSortingContext(ISortingContextBuilder builder) {
366363
public IPosSetter getPlayerButtonPosSetter() {
367364
return null;
368365
}
369-
370-
public void onHandshake() {
371-
this.handshake = true;
372-
}
373366
}

0 commit comments

Comments
 (0)