Fix container syncing

jeremiahwinsley · Aug 30, 2021 · 208a7ca · 208a7ca
1 parent 9271728
commit 208a7ca
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 54 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -5,4 +5,4 @@ org.gradle.daemon=false
 
 group=net.permutated
 mod_id=pylons
-version=1.0.2
+version=1.0.3
diff --git a/src/main/java/net/permutated/pylons/block/AbstractPylonBlock.java b/src/main/java/net/permutated/pylons/block/AbstractPylonBlock.java
@@ -132,6 +132,8 @@ public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerE
         if (!world.isClientSide) {
             TileEntity tileEntity = world.getBlockEntity(pos);
             if (tileEntity instanceof AbstractPylonTile) {
+                AbstractPylonTile pylonTile = (AbstractPylonTile) tileEntity;
+
                 INamedContainerProvider containerProvider = new INamedContainerProvider() {
                     @Override
                     public ITextComponent getDisplayName() {
@@ -141,13 +143,13 @@ public ITextComponent getDisplayName() {
                     @Override
                     public Container createMenu(int i, PlayerInventory playerInventory, PlayerEntity playerEntity) {
                         PacketBuffer buffer = new PacketBuffer(Unpooled.buffer());
-                        return containerFactory().create(i, playerInventory, buffer.writeBlockPos(pos));
+                        pylonTile.updateContainer(buffer);
+                        return containerFactory().create(i, playerInventory, buffer);
                     }
                 };
 
-                AbstractPylonTile pylonTile = (AbstractPylonTile) tileEntity;
                 if (player.getUUID().equals(pylonTile.getOwner()) || player.hasPermissions(2)) {
-                    NetworkHooks.openGui((ServerPlayerEntity) player, containerProvider, tileEntity.getBlockPos());
+                    NetworkHooks.openGui((ServerPlayerEntity) player, containerProvider, pylonTile::updateContainer);
                 } else {
                     return ActionResultType.FAIL;
                 }

diff --git a/src/main/java/net/permutated/pylons/client/gui/AbstractPylonScreen.java b/src/main/java/net/permutated/pylons/client/gui/AbstractPylonScreen.java
@@ -9,6 +9,7 @@
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.util.text.TranslationTextComponent;
 import net.permutated.pylons.inventory.container.AbstractPylonContainer;
+import net.permutated.pylons.util.Constants;
 import net.permutated.pylons.util.ResourceUtil;
 import net.permutated.pylons.util.TranslationKey;
 
@@ -46,10 +47,10 @@ protected void renderLabels(MatrixStack matrixStack, int mouseX, int mouseY) {
         String owner = this.menu.getOwnerName();
 
         ITextComponent component;
-        if (owner != null) {
-            component = translate("owner", owner);
-        } else {
+        if (owner.equals(Constants.UNKNOWN)) {
             component = translate("noOwner").withStyle(TextFormatting.RED);
+        } else {
+            component = translate("owner", owner);
         }
         drawText(matrixStack, component, 24);
     }

diff --git a/src/main/java/net/permutated/pylons/inventory/container/AbstractPylonContainer.java b/src/main/java/net/permutated/pylons/inventory/container/AbstractPylonContainer.java
@@ -22,7 +22,9 @@
 
 public abstract class AbstractPylonContainer extends Container {
 
-    protected final AbstractPylonTile tileEntity;
+    @Nullable // should only be accessed from server
+    private final AbstractPylonTile tileEntity;
+    protected final String ownerName;
 
     protected AbstractPylonContainer(@Nullable ContainerType<?> containerType, int windowId, PlayerInventory playerInventory, PacketBuffer packetBuffer) {
         super(containerType, windowId);
@@ -41,34 +43,40 @@ protected AbstractPylonContainer(@Nullable ContainerType<?> containerType, int w
             });
         }
 
+        int nameLength = packetBuffer.readInt();
+        ownerName = packetBuffer.readUtf(nameLength);
+
         registerPlayerSlots(wrappedInventory);
     }
 
     protected abstract RegistryObject<Block> getBlock();
 
-    @Nullable
+    protected int getInventorySize() {
+        return AbstractPylonTile.SLOTS;
+    }
+
     public String getOwnerName() {
-        return tileEntity.getOwnerName();
+        return ownerName;
     }
 
     @Override
     public boolean stillValid(PlayerEntity playerEntity) {
-        World world = tileEntity.getLevel();
-
-        if (world != null) {
-            IWorldPosCallable callable = IWorldPosCallable.create(world, tileEntity.getBlockPos());
-            return stillValid(callable, playerEntity, getBlock().get());
-        } else {
-            return false;
+        if (tileEntity != null) {
+            World world = tileEntity.getLevel();
+            if (world != null) {
+                IWorldPosCallable callable = IWorldPosCallable.create(world, tileEntity.getBlockPos());
+                return stillValid(callable, playerEntity, getBlock().get());
+            }
         }
+        return false;
     }
 
     @Override
     public ItemStack quickMoveStack(PlayerEntity playerIn, int index) {
         ItemStack itemstack = ItemStack.EMPTY;
         Slot slot = this.slots.get(index);
 
-        int inventorySize = this.tileEntity.getInventorySize();
+        int inventorySize = getInventorySize();
 
         if (slot != null && slot.hasItem()) {
             ItemStack stack = slot.getItem();

diff --git a/src/main/java/net/permutated/pylons/inventory/container/ExpulsionPylonContainer.java b/src/main/java/net/permutated/pylons/inventory/container/ExpulsionPylonContainer.java
@@ -5,12 +5,14 @@
 import net.minecraft.network.PacketBuffer;
 import net.minecraftforge.fml.RegistryObject;
 import net.permutated.pylons.ModRegistry;
-import net.permutated.pylons.tile.ExpulsionPylonTile;
 
 public class ExpulsionPylonContainer extends AbstractPylonContainer {
 
+    private final boolean allowedDimension;
+
     public ExpulsionPylonContainer(int windowId, PlayerInventory playerInventory, PacketBuffer packetBuffer) {
         super(ModRegistry.EXPULSION_PYLON_CONTAINER.get(), windowId, playerInventory, packetBuffer);
+        allowedDimension = packetBuffer.readBoolean();
     }
 
     @Override
@@ -19,10 +21,6 @@ protected RegistryObject<Block> getBlock() {
     }
 
     public boolean isAllowedDimension() {
-        if (tileEntity instanceof ExpulsionPylonTile) {
-            ExpulsionPylonTile pylonTile = (ExpulsionPylonTile) tileEntity;
-            return pylonTile.isAllowedDimension();
-        }
-        return false;
+        return allowedDimension;
     }
 }
diff --git a/src/main/java/net/permutated/pylons/tile/AbstractPylonTile.java b/src/main/java/net/permutated/pylons/tile/AbstractPylonTile.java
@@ -5,6 +5,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.network.NetworkManager;
+import net.minecraft.network.PacketBuffer;
 import net.minecraft.network.play.server.SUpdateTileEntityPacket;
 import net.minecraft.tileentity.ITickableTileEntity;
 import net.minecraft.tileentity.TileEntity;
@@ -21,6 +22,7 @@
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.ItemStackHandler;
 import net.permutated.pylons.util.Constants;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -54,10 +56,6 @@ public <T> LazyOptional<T> getCapability(Capability<T> cap, @Nullable Direction
         return super.getCapability(cap, side);
     }
 
-    public int getInventorySize() {
-        return this.itemStackHandler.getSlots();
-    }
-
     public void dropItems() {
         AbstractPylonTile.dropItems(level, worldPosition, itemStackHandler);
     }
@@ -81,11 +79,6 @@ public void setOwner(UUID owner) {
         this.setChanged();
     }
 
-    @Nullable
-    public String getOwnerName() {
-        return this.ownerName;
-    }
-
     private long lastTicked = 0L;
 
     public boolean canTick(final int every) {
@@ -108,6 +101,21 @@ protected static void dropItems(@Nullable World world, BlockPos pos, IItemHandle
         }
     }
 
+    /**
+     * Serialize data to be sent to the GUI on the client.
+     *
+     * Overrides MUST call the super method first to ensure correct deserialization.
+     * @param packetBuffer the packet ready to be filled
+     */
+    public void updateContainer(PacketBuffer packetBuffer) {
+        String lastKnown = UsernameCache.getLastKnownUsername(owner);
+        String username = StringUtils.defaultString(lastKnown, Constants.UNKNOWN);
+
+        packetBuffer.writeBlockPos(worldPosition);
+        packetBuffer.writeInt(username.length());
+        packetBuffer.writeUtf(username);
+    }
+
     // Save TE data to disk
     @Override
     public CompoundNBT save(CompoundNBT tag) {
@@ -123,17 +131,6 @@ private void writeOwner(CompoundNBT tag) {
         }
     }
 
-    // Write username to a provided CompoundNBT
-    // Only used for server -> client sync
-    private void writeUsername(CompoundNBT tag) {
-        if (owner != null) {
-            ownerName = UsernameCache.getLastKnownUsername(owner);
-            if (ownerName != null) {
-                tag.putString(Constants.NBT.NAME, ownerName);
-            }
-        }
-    }
-
     // Load TE data from disk
     @Override
     public void load(BlockState state, CompoundNBT tag) {
@@ -149,27 +146,17 @@ private void readOwner(CompoundNBT tag) {
         }
     }
 
-    // Read username from a provided CompoundNBT
-    // Only used for server -> client sync
-    private void readUsername(CompoundNBT tag) {
-        if (tag.contains(Constants.NBT.NAME)) {
-            ownerName = tag.getString(Constants.NBT.NAME);
-        }
-    }
-
     // Called whenever a client loads a new chunk
     @Override
     public CompoundNBT getUpdateTag() {
         CompoundNBT tag = super.getUpdateTag();
         writeOwner(tag);
-        writeUsername(tag);
         return tag;
     }
 
     @Override
     public void handleUpdateTag(BlockState state, CompoundNBT tag) {
         readOwner(tag);
-        readUsername(tag);
     }
 
     // Called whenever a block update happens on the client

diff --git a/src/main/java/net/permutated/pylons/tile/ExpulsionPylonTile.java b/src/main/java/net/permutated/pylons/tile/ExpulsionPylonTile.java
@@ -7,6 +7,7 @@
 import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.network.PacketBuffer;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.management.PlayerInteractionManager;
 import net.minecraft.tags.BlockTags;
@@ -64,6 +65,12 @@ public void tick() {
         }
     }
 
+    @Override
+    public void updateContainer(PacketBuffer packetBuffer) {
+        super.updateContainer(packetBuffer);
+        packetBuffer.writeBoolean(isAllowedDimension());
+    }
+
     public boolean isAllowedDimension() {
         if (level != null) {
             if (allowedDimensions == null) {

diff --git a/src/main/java/net/permutated/pylons/util/Constants.java b/src/main/java/net/permutated/pylons/util/Constants.java
@@ -9,6 +9,8 @@ private Constants() {
     public static final String INFUSION_PYLON = "infusion_pylon";
 
 
+    public static final String UNKNOWN = "unknown";
+
     public static class NBT {
         private NBT() {
             // nothing to do