Merge branch 'mc-1.20.x' into mc-1.21.x

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -30,3 +30,5 @@ body:
       Description of the bug. Please include the following:
       - Logs: These will be located in the `logs/` directory of your Minecraft instance. This is always useful, even if it doesn't include errors, so please upload this!
       - Detailed reproduction steps: sometimes I can spot a bug pretty easily, but often it's much more obscure. The more information I have to help reproduce it, the quicker it'll get fixed.
+
+      ![A gif of burning text reading "Upload your logs!!!"](https://tweaked.cc/images/logs.gif)

gradle.properties

@@ -10,8 +10,9 @@ kotlin.jvm.target.validation.mode=error
 
 neogradle.subsystems.conventions.runs.enabled=false
 
+# Mod properties
 isUnstable=true
-modVersion=1.114.3
+modVersion=1.114.4
 
 # Minecraft properties: We want to configure this here so we can read it in settings.gradle
 mcVersion=1.21.1

projects/common/src/main/java/dan200/computercraft/shared/ModRegistry.java

@@ -31,6 +31,7 @@
 import dan200.computercraft.shared.computer.blocks.ComputerBlock;
 import dan200.computercraft.shared.computer.blocks.ComputerBlockEntity;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
+import dan200.computercraft.shared.computer.core.ServerComputer;
 import dan200.computercraft.shared.computer.inventory.ComputerMenuWithoutInventory;
 import dan200.computercraft.shared.computer.items.AbstractComputerItem;
 import dan200.computercraft.shared.computer.items.CommandComputerItem;
@@ -90,7 +91,6 @@
 import dan200.computercraft.shared.turtle.upgrades.TurtleModem;
 import dan200.computercraft.shared.turtle.upgrades.TurtleSpeaker;
 import dan200.computercraft.shared.turtle.upgrades.TurtleTool;
-import dan200.computercraft.shared.util.ComponentMap;
 import dan200.computercraft.shared.util.DataComponentUtil;
 import dan200.computercraft.shared.util.NonNegativeId;
 import dan200.computercraft.shared.util.StorageCapacity;
@@ -615,7 +615,7 @@ public static void register() {
 
         ComputerCraftAPI.registerAPIFactory(computer -> {
             var turtle = computer.getComponent(ComputerComponents.TURTLE);
-            var metrics = Objects.requireNonNull(computer.getComponent(ComponentMap.METRICS));
+            var metrics = Objects.requireNonNull(computer.getComponent(ServerComputer.METRICS));
             return turtle == null ? null : new TurtleAPI(metrics, (TurtleAccessInternal) turtle);
         });
 

projects/common/src/main/java/dan200/computercraft/shared/command/CommandComputerCraft.java

@@ -24,15 +24,13 @@
 import dan200.computercraft.shared.computer.metrics.basic.BasicComputerMetricsObserver;
 import dan200.computercraft.shared.computer.metrics.basic.ComputerMetrics;
 import dan200.computercraft.shared.network.container.ComputerContainerData;
+import dan200.computercraft.shared.platform.PlatformHelper;
 import net.minecraft.ChatFormatting;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
-import net.minecraft.world.MenuProvider;
 import net.minecraft.world.entity.RelativeMovement;
-import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
@@ -259,18 +257,11 @@ private static int queue(Collection<ServerComputer> computers, List<String> args
      * @return The constant {@code 1}.
      */
     private static int view(CommandSourceStack source, ServerComputer computer) throws CommandSyntaxException {
-        var player = source.getPlayerOrException();
-        new ComputerContainerData(computer, new ItemStack(ModRegistry.Items.COMPUTER_NORMAL.get())).open(player, new MenuProvider() {
-            @Override
-            public Component getDisplayName() {
-                return Component.translatable("gui.computercraft.view_computer");
-            }
-
-            @Override
-            public AbstractContainerMenu createMenu(int id, Inventory player, Player entity) {
-                return new ComputerMenuWithoutInventory(ModRegistry.Menus.COMPUTER.get(), id, player, p -> true, computer);
-            }
-        });
+        PlatformHelper.get().openMenu(
+            source.getPlayerOrException(), Component.translatable("gui.computercraft.view_computer"),
+            (id, player, entity) -> new ComputerMenuWithoutInventory(ModRegistry.Menus.COMPUTER.get(), id, player, p -> true, computer),
+            new ComputerContainerData(computer, new ItemStack(ModRegistry.Items.COMPUTER_NORMAL.get()))
+        );
         return 1;
     }
 

projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/AbstractComputerBlock.java

@@ -7,6 +7,7 @@
 import dan200.computercraft.annotations.ForgeOverride;
 import dan200.computercraft.shared.common.IBundledRedstoneBlock;
 import dan200.computercraft.shared.network.container.ComputerContainerData;
+import dan200.computercraft.shared.platform.PlatformHelper;
 import dan200.computercraft.shared.platform.RegistryEntry;
 import dan200.computercraft.shared.util.BlockEntityHelpers;
 import net.minecraft.core.BlockPos;
@@ -121,7 +122,7 @@ protected InteractionResult useWithoutItem(BlockState state, Level level, BlockP
                 var serverComputer = computer.createServerComputer();
                 serverComputer.turnOn();
 
-                new ComputerContainerData(serverComputer, getItem(computer)).open(player, computer);
+                PlatformHelper.get().openMenu(player, computer.getName(), computer, new ComputerContainerData(serverComputer, getItem(computer)));
             }
             return InteractionResult.sidedSuccess(level.isClientSide);
         }

projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/AbstractComputerBlockEntity.java

@@ -28,9 +28,10 @@
 import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
 import net.minecraft.world.Container;
 import net.minecraft.world.LockCode;
-import net.minecraft.world.MenuProvider;
 import net.minecraft.world.Nameable;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.MenuConstructor;
+import net.minecraft.world.level.block.GameMasterBlock;
 import net.minecraft.world.level.block.entity.BaseContainerBlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
@@ -40,7 +41,7 @@
 import java.util.Objects;
 import java.util.UUID;
 
-public abstract class AbstractComputerBlockEntity extends BlockEntity implements Nameable, MenuProvider {
+public abstract class AbstractComputerBlockEntity extends BlockEntity implements Nameable, MenuConstructor {
     private static final String NBT_ID = "ComputerId";
     private static final String NBT_LABEL = "Label";
     private static final String NBT_ON = "On";
@@ -344,6 +345,10 @@ public final int getComputerID() {
         return label;
     }
 
+    public final boolean isAdminOnly() {
+        return getBlockState().getBlock() instanceof GameMasterBlock;
+    }
+
     public final void setComputerID(int id) {
         if (getLevel().isClientSide || computerID == id) return;
 
@@ -454,4 +459,9 @@ public Component getCustomName() {
     public Component getDisplayName() {
         return Nameable.super.getDisplayName();
     }
+
+    @Override
+    public boolean onlyOpCanSetNbt() {
+        return isAdminOnly();
+    }
 }

projects/common/src/main/java/dan200/computercraft/shared/computer/core/ComputerSystem.java

@@ -11,7 +11,6 @@
 import dan200.computercraft.core.apis.ComputerAccess;
 import dan200.computercraft.core.apis.IAPIEnvironment;
 import dan200.computercraft.core.computer.ApiLifecycle;
-import dan200.computercraft.shared.util.ComponentMap;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 
@@ -26,11 +25,11 @@
 final class ComputerSystem extends ComputerAccess implements IComputerSystem, ApiLifecycle {
     private final ServerComputer computer;
     private final IAPIEnvironment environment;
-    private final ComponentMap components;
+    private final Map<ComputerComponent<?>, Object> components;
 
     private boolean active;
 
-    ComputerSystem(ServerComputer computer, IAPIEnvironment environment, ComponentMap components) {
+    ComputerSystem(ServerComputer computer, IAPIEnvironment environment, Map<ComputerComponent<?>, Object> components) {
         super(environment);
         this.computer = computer;
         this.environment = environment;
@@ -95,7 +94,8 @@ public IPeripheral getAvailablePeripheral(String name) {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public <T> @Nullable T getComponent(ComputerComponent<T> component) {
-        return components.get(component);
+        return (T) components.get(component);
     }
 }

projects/common/src/main/java/dan200/computercraft/shared/computer/core/ServerComputer.java

@@ -26,18 +26,21 @@
 import dan200.computercraft.shared.network.client.ClientNetworkContext;
 import dan200.computercraft.shared.network.client.ComputerTerminalClientMessage;
 import dan200.computercraft.shared.network.server.ServerNetworking;
-import dan200.computercraft.shared.util.ComponentMap;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 
 import javax.annotation.Nullable;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
 
 public class ServerComputer implements ComputerEnvironment, ComputerEvents.Receiver {
+    public static final ComputerComponent<MetricsObserver> METRICS = ComputerComponent.create("computercraft", "metrics");
+
     private final UUID instanceUUID = UUID.randomUUID();
 
     private ServerLevel level;
@@ -65,14 +68,12 @@ public ServerComputer(ServerLevel level, BlockPos position, Properties propertie
 
         storageCapacity = properties.storageCapacity;
 
-        var componentBuilder = ComponentMap.builder();
-        componentBuilder.add(ComponentMap.METRICS, metrics);
+        properties.addComponent(METRICS, metrics);
         if (family == ComputerFamily.COMMAND) {
-            componentBuilder.add(ComputerComponents.ADMIN_COMPUTER, new AdminComputer() {
+            properties.addComponent(ComputerComponents.ADMIN_COMPUTER, new AdminComputer() {
             });
         }
-        componentBuilder.add(properties.components.build());
-        var components = componentBuilder.build();
+        var components = Map.copyOf(properties.components);
 
         computer = new Computer(context.computerContext(), this, terminal, properties.computerID);
         computer.setLabel(properties.label);
@@ -282,7 +283,7 @@ public static final class Properties {
         private int terminalWidth = Config.DEFAULT_COMPUTER_TERM_WIDTH;
         private int terminalHeight = Config.DEFAULT_COMPUTER_TERM_HEIGHT;
         private long storageCapacity = -1;
-        private final ComponentMap.Builder components = ComponentMap.builder();
+        private final Map<ComputerComponent<?>, Object> components = new HashMap<>();
 
         private Properties(int computerID, ComputerFamily family) {
             this.computerID = computerID;
@@ -313,7 +314,8 @@ public Properties storageCapacity(long capacity) {
         }
 
         public <T> Properties addComponent(ComputerComponent<T> component, T value) {
-            components.add(component, value);
+            if (components.containsKey(component)) throw new IllegalArgumentException(component + " is already set");
+            components.put(component, value);
             return this;
         }
     }

projects/common/src/main/java/dan200/computercraft/shared/network/container/ContainerData.java

@@ -8,9 +8,7 @@
 import dan200.computercraft.shared.platform.PlatformHelper;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.world.MenuProvider;
 import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.MenuType;
 
@@ -20,16 +18,6 @@
 public interface ContainerData {
     void toBytes(RegistryFriendlyByteBuf buf);
 
-    /**
-     * Open a menu for a specific player using this data.
-     *
-     * @param player The player to open the menu for.
-     * @param menu   The underlying menu provider.
-     */
-    default void open(Player player, MenuProvider menu) {
-        PlatformHelper.get().openMenu(player, menu, this);
-    }
-
     static <C extends AbstractContainerMenu, T extends ContainerData> MenuType<C> toType(StreamCodec<RegistryFriendlyByteBuf, T> codec, Factory<C, T> factory) {
         return PlatformHelper.get().createMenuType(codec, factory);
     }

projects/common/src/main/java/dan200/computercraft/shared/peripheral/monitor/MonitorBlockEntity.java

@@ -18,6 +18,7 @@
 import net.minecraft.core.HolderLookup;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
@@ -237,7 +238,7 @@ private void updateBlockState() {
         getLevel().setBlock(getBlockPos(), getBlockState()
             .setValue(MonitorBlock.STATE, MonitorEdgeState.fromConnections(
                 yIndex < height - 1, yIndex > 0,
-                xIndex > 0, xIndex < width - 1)), 2);
+                xIndex > 0, xIndex < width - 1)), Block.UPDATE_CLIENTS);
     }
 
     // region Sizing and placement stuff

projects/common/src/main/java/dan200/computercraft/shared/platform/PlatformHelper.java

@@ -17,17 +17,22 @@
 import net.minecraft.core.Direction;
 import net.minecraft.core.Registry;
 import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.chat.Component;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.level.ServerPlayerGameMode;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
 import net.minecraft.tags.TagKey;
-import net.minecraft.world.*;
+import net.minecraft.world.Container;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.WorldlyContainer;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.inventory.MenuConstructor;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.DyeColor;
@@ -109,10 +114,11 @@ static PlatformHelper get() {
      * Open a container using a specific {@link ContainerData}.
      *
      * @param player The player to open the menu for.
-     * @param owner  The underlying menu provider.
-     * @param menu   The menu data.
+     * @param title  The title for this menu.
+     * @param menu   The underlying menu constructor.
+     * @param data   The menu data.
      */
-    void openMenu(Player player, MenuProvider owner, ContainerData menu);
+    void openMenu(Player player, Component title, MenuConstructor menu, ContainerData data);
 
     /**
      * Invalidate components on a block enitty.