Merge remote-tracking branch 'origin/master-1.21-lts' into master-26-lts

Author: rubensworks

loader-common/src/main/java/org/cyclops/colossalchests2/block/DisplayWallInteractions.java

@@ -158,23 +158,19 @@ public static InteractionResult useItemOn(ItemStack stack, Player player, BlockE
 
     /**
      * A right-click with an empty hand on a face: right after an insert there it inserts all of the type it shows,
-     * otherwise it opens the settings. Sneaking does nothing, except on a hidden face, where it is the only way to the
-     * settings.
+     * otherwise it opens the settings. Sneaking opens the settings on any face, like on other functional walls.
      * @return The result, or null to fall back to the default wall behaviour.
      */
     @Nullable
     public static InteractionResult useWithoutItem(Player player, BlockEntityChestWall wall, Direction face) {
-        if (wall.isFaceHidden(face)) {
-            if (!player.isSecondaryUseActive()) {
-                return null;
-            }
+        if (player.isSecondaryUseActive()) {
             if (player instanceof ServerPlayer serverPlayer) {
                 openSettings(serverPlayer, wall);
             }
             return InteractionResult.SUCCESS;
         }
-        if (player.isSecondaryUseActive()) {
-            return InteractionResult.PASS;
+        if (wall.isFaceHidden(face)) {
+            return null;
         }
         // Only the server knows about the previous click, the client lets it decide.
         if (player instanceof ServerPlayer serverPlayer) {
@@ -190,7 +186,7 @@ public static InteractionResult useWithoutItem(Player player, BlockEntityChestWa
     }
 
     private static void openSettings(ServerPlayer player, BlockEntityChestWall wall) {
-        IModHelpers.get().getMinecraftHelpers().openMenu(player, wall, buf -> ContainerDisplay.writeOpenData(buf, wall));
+        IModHelpers.get().getMinecraftHelpers().openMenu(player, wall, ContainerDisplay.openDataWriter(wall));
     }
 
     /**

loader-common/src/main/java/org/cyclops/colossalchests2/blockentity/BlockEntityChestCore.java

@@ -324,7 +324,7 @@ public int getComparatorSignal() {
      */
     public void openMenu(ServerPlayer player) {
         if (isFormed()) {
-            IModHelpers.get().getMinecraftHelpers().openMenu(player, this, data -> ContainerChest.writeOpenData(data, this));
+            IModHelpers.get().getMinecraftHelpers().openMenu(player, this, ContainerChest.openDataWriter(this));
         }
     }
 

loader-common/src/main/java/org/cyclops/colossalchests2/gametest/GameTestsCommon.java

@@ -143,6 +143,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -1888,11 +1889,7 @@ public void testDisplayWallInsertsAndTakes(GameTestHelper helper) {
                     helper.assertTrue(player.getInventory().getItem(4).is(Items.DIRT), "Expected the held dirt to stay");
                     helper.assertValueEqual(countInInventory(player, Items.STONE), 1, "stone next to the held dirt");
                     player.getInventory().setSelectedSlot(0);
-                    // Sneaking with an empty hand does nothing.
-                    player.getInventory().clearContent();
-                    player.setShiftKeyDown(true);
-                    helper.assertValueEqual(click(helper, player, display), InteractionResult.PASS, "sneaking click");
-                    helper.assertTrue(wall.getDisplayed(Direction.UP).is(Items.STONE), "Expected stone to stay shown");
+                    // Sneaking with an empty hand opens the settings. Checked in-game, as NeoForge does not open menus for mock players.
                 })
                 .thenSucceed();
     }
@@ -1961,6 +1958,32 @@ public void testDisplayWallSettings(GameTestHelper helper) {
                 .thenSucceed();
     }
 
+    @GameTest(template = TEMPLATE_EMPTY)
+    public void testDisplayOpenDataReadWhenOpening(GameTestHelper helper) {
+        BlockPos corePos = buildChest(helper, MIN_A, 3, ChestMaterial.WOOD);
+        BlockPos display = placeWall(helper, MIN_A.offset(1, 2, 1), WallType.DISPLAY);
+        List<Consumer<FriendlyByteBuf>> writers = Lists.newArrayList();
+        int[] faces = new int[1];
+        helper.startSequence()
+                .thenWaitUntil(() -> assertFormed(helper, corePos, MIN_A, 3))
+                .thenExecute(() -> {
+                    // Fabric writes open data later, off the server thread, so it must not depend on the chest by then.
+                    BlockEntityChestWall wall = getWall(helper, display);
+                    faces[0] = wall.getDisplayFaces().size();
+                    helper.assertTrue(faces[0] > 0, "Expected faces to show items on");
+                    writers.add(ContainerDisplay.openDataWriter(wall));
+                    helper.setBlock(MIN_A, Blocks.AIR);
+                })
+                .thenWaitUntil(() -> assertDormant(helper, corePos))
+                .thenExecute(() -> {
+                    FriendlyByteBuf data = new FriendlyByteBuf(Unpooled.buffer());
+                    writers.getFirst().accept(data);
+                    ContainerDisplay client = new ContainerDisplay(103, makeViewer(helper).getInventory(), data);
+                    helper.assertValueEqual(client.getFaces().size(), faces[0], "faces on the client");
+                })
+                .thenSucceed();
+    }
+
     @GameTest(template = TEMPLATE_EMPTY)
     public void testDisplayWallFaces(GameTestHelper helper) {
         BlockPos corePos = buildChest(helper, MIN_A, 3, ChestMaterial.WOOD);

loader-common/src/main/java/org/cyclops/colossalchests2/inventory/ContainerChest.java

@@ -33,6 +33,7 @@
 import org.cyclops.colossalchests2.upgrade.UpgradeSet;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.function.Consumer;
 import java.util.Arrays;
 import java.util.BitSet;
 import java.util.List;
@@ -124,11 +125,26 @@ private ContainerChest(int id, Inventory inventory, BlockPos corePos, int slotCo
      * Write what the client-side constructor reads.
      */
     public static void writeOpenData(FriendlyByteBuf data, BlockEntityChestCore core) {
-        data.writeBlockPos(core.getBlockPos());
-        data.writeVarInt(core.getStorage().getSlotCount());
-        data.writeVarInt(core.getUpgrades().getContainerSize());
-        data.writeVarIntArray(getMaxUpgradeCounts(core));
-        data.writeVarIntArray(getBetterMaterialTakesMore(core));
+        openDataWriter(core).accept(data);
+    }
+
+    /**
+     * Some loaders write open data later, off the server thread, so read the chest now.
+     * @return A writer of what the client-side constructor reads.
+     */
+    public static Consumer<FriendlyByteBuf> openDataWriter(BlockEntityChestCore core) {
+        BlockPos pos = core.getBlockPos();
+        int slotCount = core.getStorage().getSlotCount();
+        int upgradeSlots = core.getUpgrades().getContainerSize();
+        int[] maxUpgradeCounts = getMaxUpgradeCounts(core);
+        int[] betterMaterialTakesMore = getBetterMaterialTakesMore(core);
+        return data -> {
+            data.writeBlockPos(pos);
+            data.writeVarInt(slotCount);
+            data.writeVarInt(upgradeSlots);
+            data.writeVarIntArray(maxUpgradeCounts);
+            data.writeVarIntArray(betterMaterialTakesMore);
+        };
     }
 
     private static int[] getMaxUpgradeCounts(BlockEntityChestCore core) {

loader-common/src/main/java/org/cyclops/colossalchests2/inventory/ContainerDisplay.java

@@ -1,6 +1,7 @@
 package org.cyclops.colossalchests2.inventory;
 
 import com.google.common.collect.Lists;
+import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.Container;
@@ -14,6 +15,7 @@
 import org.cyclops.colossalchests2.blockentity.DisplayOption;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.function.Consumer;
 import java.util.List;
 import java.util.Locale;
 
@@ -85,11 +87,23 @@ private static Direction getFront(BlockEntityChestWall wall) {
      * Write what the client constructor reads.
      */
     public static void writeOpenData(FriendlyByteBuf data, BlockEntityChestWall wall) {
-        data.writeBlockPos(wall.getBlockPos());
-        data.writeEnum(getFront(wall));
-        List<Direction> faces = wall.getDisplayFaces();
-        data.writeVarInt(faces.size());
-        faces.forEach(data::writeEnum);
+        openDataWriter(wall).accept(data);
+    }
+
+    /**
+     * Some loaders write open data later, off the server thread, so read the wall now.
+     * @return A writer of what the client constructor reads.
+     */
+    public static Consumer<FriendlyByteBuf> openDataWriter(BlockEntityChestWall wall) {
+        BlockPos pos = wall.getBlockPos();
+        Direction front = getFront(wall);
+        List<Direction> faces = List.copyOf(wall.getDisplayFaces());
+        return data -> {
+            data.writeBlockPos(pos);
+            data.writeEnum(front);
+            data.writeVarInt(faces.size());
+            faces.forEach(data::writeEnum);
+        };
     }
 
     private static Direction readFront(FriendlyByteBuf data) {

loader-common/src/main/resources/assets/colossalchests2/lang/en_us.json

@@ -8,18 +8,18 @@
   "block.colossalchests2.chest_core_copper": "Copper Chest Core",
   "block.colossalchests2.chest_wall_iron": "Iron Chest Wall",
   "block.colossalchests2.chest_core_iron": "Iron Chest Core",
-  "block.colossalchests2.chest_wall_interface": "Chest Interface",
+  "block.colossalchests2.chest_wall_interface": "Interface Chest Wall",
   "block.colossalchests2.chest_wall_interface.info": "A wall for chest external access. Sneak-right-click with empty hand to set filters.",
-  "block.colossalchests2.chest_wall_void": "Void Chest Interface",
-  "block.colossalchests2.chest_wall_void.info": "An interface that destroys overflowing items.",
-  "block.colossalchests2.chest_wall_display": "Chest Display",
+  "block.colossalchests2.chest_wall_void": "Void Chest Wall",
+  "block.colossalchests2.chest_wall_void.info": "Like an Interface Chest Wall, but destroys overflowing items.",
+  "block.colossalchests2.chest_wall_display": "Display Chest Wall",
   "block.colossalchests2.chest_wall_magnet": "Magnet Chest Wall",
   "block.colossalchests2.chest_wall_magnet.info": "Pulls dropped items around it into the chest. Sneak-right-click with empty hand to set its radius.",
   "block.colossalchests2.chest_wall_golem": "Golem Chest Wall",
   "block.colossalchests2.chest_wall_golem.info": "Copper golems can take items out of this.",
   "block.colossalchests2.chest_wall_redstone": "Redstone Chest Wall",
   "block.colossalchests2.chest_wall_redstone.info": "Emits a redstone signal based on how full the chest is.",
-  "block.colossalchests2.chest_wall_display.info": "Shows an item and its count. Take items with (sneak-)left-click and insert with (double) right-click.",
+  "block.colossalchests2.chest_wall_display.info": "Shows an item and its count. Take items with (sneak-)left-click and insert with (double) right-click. Sneak-right-click with empty hand to configure.",
   "block.colossalchests2.chest_wall_gold": "Golden Chest Wall",
   "block.colossalchests2.chest_core_gold": "Golden Chest Core",
   "block.colossalchests2.chest_wall_diamond": "Diamond Chest Wall",