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

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -1,6 +1,7 @@
 name: Bug report
 description: Report some misbehaviour in the mod
 labels: [ bug ]
+type: bug
 body:
 - type: dropdown
   id: mc-version

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,6 +2,7 @@
 name: Feature request
 about: Suggest an idea or improvement
 labels: enhancement
+type: feature
 ---
 
 <!--

buildSrc/src/main/kotlin/cc/tweaked/gradle/CCTweakedExtension.kt

@@ -10,9 +10,7 @@ import org.gradle.api.GradleException
 import org.gradle.api.NamedDomainObjectProvider
 import org.gradle.api.Project
 import org.gradle.api.Task
-import org.gradle.api.artifacts.Dependency
 import org.gradle.api.plugins.JavaPluginExtension
-import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Provider
 import org.gradle.api.provider.SetProperty
 import org.gradle.api.tasks.SourceSet
@@ -33,6 +31,10 @@ import java.net.URI
 import java.util.regex.Pattern
 
 abstract class CCTweakedExtension(private val project: Project) {
+    /** Get the hash of the latest git commit. */
+    val gitHash: Provider<String> =
+        gitProvider("<no git commit>", listOf("rev-parse", "HEAD")) { it.trim() }
+
     /** Get the current git branch. */
     val gitBranch: Provider<String> =
         gitProvider("<no git branch>", listOf("rev-parse", "--abbrev-ref", "HEAD")) { it.trim() }
@@ -164,6 +166,7 @@ abstract class CCTweakedExtension(private val project: Project) {
             jacoco.applyTo(this)
 
             extensions.configure(JacocoTaskExtension::class.java) {
+                includes = listOf("dan200.computercraft.*")
                 excludes = listOf(
                     "dan200.computercraft.mixin.*", // Exclude mixins, as they're not executed at runtime.
                     "dan200.computercraft.shared.Capabilities$*", // Exclude capability tokens, as Forge rewrites them.

projects/common-api/src/main/java/dan200/computercraft/api/network/wired/WiredElement.java

@@ -19,8 +19,8 @@
  */
 public interface WiredElement extends WiredSender {
     /**
-     * Called when objects on the network change. This may occur when network nodes are added or removed, or when
-     * peripherals change.
+     * Called when peripherals on the network change. This may occur when network nodes are added or removed, or when
+     * peripherals are attached or detached from a modem.
      *
      * @param change The change which occurred.
      * @see WiredNetworkChange

projects/common/src/client/java/dan200/computercraft/client/gui/ClientInputHandler.java

@@ -10,10 +10,10 @@
 import dan200.computercraft.shared.network.server.ComputerActionServerMessage;
 import dan200.computercraft.shared.network.server.KeyEventServerMessage;
 import dan200.computercraft.shared.network.server.MouseEventServerMessage;
-import dan200.computercraft.shared.network.server.QueueEventServerMessage;
+import dan200.computercraft.shared.network.server.PasteEventComputerMessage;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 
-import javax.annotation.Nullable;
+import java.nio.ByteBuffer;
 
 /**
  * An {@link InputHandler} for use on the client.
@@ -27,6 +27,11 @@ public ClientInputHandler(AbstractContainerMenu menu) {
         this.menu = menu;
     }
 
+    @Override
+    public void terminate() {
+        ClientNetworking.sendToServer(new ComputerActionServerMessage(menu, ComputerActionServerMessage.Action.TERMINATE));
+    }
+
     @Override
     public void turnOn() {
         ClientNetworking.sendToServer(new ComputerActionServerMessage(menu, ComputerActionServerMessage.Action.TURN_ON));
@@ -42,11 +47,6 @@ public void reboot() {
         ClientNetworking.sendToServer(new ComputerActionServerMessage(menu, ComputerActionServerMessage.Action.REBOOT));
     }
 
-    @Override
-    public void queueEvent(String event, @Nullable Object[] arguments) {
-        ClientNetworking.sendToServer(new QueueEventServerMessage(menu, event, arguments));
-    }
-
     @Override
     public void keyDown(int key, boolean repeat) {
         ClientNetworking.sendToServer(new KeyEventServerMessage(menu, repeat ? KeyEventServerMessage.Action.REPEAT : KeyEventServerMessage.Action.DOWN, key));
@@ -57,6 +57,16 @@ public void keyUp(int key) {
         ClientNetworking.sendToServer(new KeyEventServerMessage(menu, KeyEventServerMessage.Action.UP, key));
     }
 
+    @Override
+    public void charTyped(byte chr) {
+        ClientNetworking.sendToServer(new KeyEventServerMessage(menu, KeyEventServerMessage.Action.CHAR, chr));
+    }
+
+    @Override
+    public void paste(ByteBuffer contents) {
+        ClientNetworking.sendToServer(new PasteEventComputerMessage(menu, contents));
+    }
+
     @Override
     public void mouseClick(int button, int x, int y) {
         ClientNetworking.sendToServer(new MouseEventServerMessage(menu, MouseEventServerMessage.Action.CLICK, button, x, y));

projects/common/src/client/java/dan200/computercraft/client/gui/GuiSprites.java

@@ -34,8 +34,8 @@ public final class GuiSprites extends TextureAtlasHolder {
 
     private static ButtonTextures button(String name) {
         return new ButtonTextures(
-            ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "gui/buttons/" + name),
-            ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "gui/buttons/" + name + "_hover")
+            ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "buttons/" + name),
+            ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "buttons/" + name + "_hover")
         );
     }
 
@@ -96,12 +96,8 @@ public static ComputerTextures getComputerTextures(ComputerFamily family) {
      * @param active The texture for the button when it is active (hovered or focused).
      */
     public record ButtonTextures(ResourceLocation normal, ResourceLocation active) {
-        public TextureAtlasSprite get(boolean active) {
-            return GuiSprites.get(active ? this.active : normal);
-        }
-
-        public Stream<ResourceLocation> textures() {
-            return Stream.of(normal, active);
+        public ResourceLocation get(boolean isActive) {
+            return isActive ? active : normal;
         }
     }
 

projects/common/src/client/java/dan200/computercraft/client/gui/TurtleScreen.java

@@ -26,6 +26,9 @@ public class TurtleScreen extends AbstractComputerScreen<TurtleMenu> {
     private static final ResourceLocation BACKGROUND_NORMAL = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "textures/gui/turtle_normal.png");
     private static final ResourceLocation BACKGROUND_ADVANCED = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "textures/gui/turtle_advanced.png");
 
+    private static final ResourceLocation SELECTED_NORMAL = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "turtle_normal_selected_slot");
+    private static final ResourceLocation SELECTED_ADVANCED = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "turtle_advanced_selected_slot");
+
     private static final int TEX_WIDTH = 278;
     private static final int TEX_HEIGHT = 217;
 
@@ -54,9 +57,9 @@ protected void renderBg(GuiGraphics graphics, float partialTicks, int mouseX, in
         if (slot >= 0) {
             var slotX = slot % 4;
             var slotY = slot / 4;
-            graphics.blit(texture,
-                leftPos + TURTLE_START_X - 2 + slotX * 18, topPos + PLAYER_START_Y - 2 + slotY * 18, 0,
-                0, 217, 24, 24, FULL_TEX_SIZE, FULL_TEX_SIZE
+            graphics.blitSprite(
+                advanced ? SELECTED_ADVANCED : SELECTED_NORMAL,
+                leftPos + TURTLE_START_X - 2 + slotX * 18, topPos + PLAYER_START_Y - 2 + slotY * 18, 0, 22, 22
             );
         }
 

projects/common/src/client/java/dan200/computercraft/client/gui/widgets/ComputerSidebar.java

@@ -55,7 +55,7 @@ public static void addButtons(BooleanSupplier isOn, InputHandler input, Consumer
         add.accept(new DynamicImageButton(
             x, y, ICON_WIDTH, ICON_HEIGHT,
             GuiSprites.TERMINATE::get,
-            b -> input.queueEvent("terminate"),
+            b -> input.terminate(),
             new HintedMessage(
                 Component.translatable("gui.computercraft.tooltip.terminate"),
                 Component.translatable("gui.computercraft.tooltip.terminate.key")

projects/common/src/client/java/dan200/computercraft/client/gui/widgets/DynamicImageButton.java

@@ -10,8 +10,8 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.Tooltip;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
 
 import javax.annotation.Nullable;
 import java.util.function.Supplier;
@@ -21,19 +21,19 @@
  * dynamically.
  */
 public class DynamicImageButton extends Button {
-    private final Boolean2ObjectFunction<TextureAtlasSprite> texture;
+    private final Boolean2ObjectFunction<ResourceLocation> texture;
     private final Supplier<HintedMessage> message;
 
     public DynamicImageButton(
-        int x, int y, int width, int height, Boolean2ObjectFunction<TextureAtlasSprite> texture, OnPress onPress,
+        int x, int y, int width, int height, Boolean2ObjectFunction<ResourceLocation> texture, OnPress onPress,
         HintedMessage message
     ) {
         this(x, y, width, height, texture, onPress, () -> message);
     }
 
     public DynamicImageButton(
         int x, int y, int width, int height,
-        Boolean2ObjectFunction<TextureAtlasSprite> texture,
+        Boolean2ObjectFunction<ResourceLocation> texture,
         OnPress onPress, Supplier<HintedMessage> message
     ) {
         super(x, y, width, height, Component.empty(), onPress, DEFAULT_NARRATION);
@@ -50,7 +50,7 @@ public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float par
         var texture = this.texture.get(isHoveredOrFocused());
 
         RenderSystem.disableDepthTest();
-        graphics.blit(getX(), getY(), 0, width, height, texture);
+        graphics.blitSprite(texture, getX(), getY(), 0, width, height);
         RenderSystem.enableDepthTest();
     }
 

projects/common/src/client/java/dan200/computercraft/client/gui/widgets/TerminalWidget.java

@@ -69,11 +69,8 @@ public TerminalWidget(Terminal terminal, InputHandler computer, int x, int y) {
 
     @Override
     public boolean charTyped(char ch, int modifiers) {
-        if (ch >= 32 && ch <= 126 || ch >= 160 && ch <= 255) {
-            // Queue the char event for any printable chars in byte range
-            computer.queueEvent("char", new Object[]{ Character.toString(ch) });
-        }
-
+        var terminalChar = StringUtil.unicodeToTerminal(ch);
+        if (StringUtil.isTypableChar(terminalChar)) computer.charTyped(terminalChar);
         return true;
     }
 
@@ -110,8 +107,8 @@ public boolean keyPressed(int key, int scancode, int modifiers) {
     }
 
     private void paste() {
-        var clipboard = StringUtil.normaliseClipboardString(Minecraft.getInstance().keyboardHandler.getClipboard());
-        if (!clipboard.isEmpty()) computer.queueEvent("paste", new Object[]{ clipboard });
+        var clipboard = StringUtil.getClipboardString(Minecraft.getInstance().keyboardHandler.getClipboard());
+        if (clipboard.remaining() > 0) computer.paste(clipboard);
     }
 
     @Override
@@ -220,7 +217,7 @@ private boolean hasMouseSupport() {
 
     public void update() {
         if (terminateTimer >= 0 && terminateTimer < TERMINATE_TIME && (terminateTimer += 0.05f) > TERMINATE_TIME) {
-            computer.queueEvent("terminate");
+            computer.terminate();
         }
 
         if (shutdownTimer >= 0 && shutdownTimer < TERMINATE_TIME && (shutdownTimer += 0.05f) > TERMINATE_TIME) {

projects/common/src/client/java/dan200/computercraft/client/render/PocketItemRenderer.java

@@ -39,8 +39,8 @@ protected void renderItem(PoseStack transform, MultiBufferSource bufferSource, I
 
         int termWidth, termHeight;
         if (terminal == null) {
-            termWidth = Config.pocketTermWidth;
-            termHeight = Config.pocketTermHeight;
+            termWidth = Config.DEFAULT_POCKET_TERM_WIDTH;
+            termHeight = Config.DEFAULT_POCKET_TERM_HEIGHT;
         } else {
             termWidth = terminal.getWidth();
             termHeight = terminal.getHeight();

projects/common/src/datagen/java/dan200/computercraft/data/DataProviders.java

@@ -74,10 +74,6 @@ public static void add(GeneratorSink generator) {
                 LecternPrintoutModel.TEXTURE
             )));
             out.accept(GuiSprites.SPRITE_SHEET, makeSprites(
-                // Buttons
-                GuiSprites.TURNED_OFF.textures(),
-                GuiSprites.TURNED_ON.textures(),
-                GuiSprites.TERMINATE.textures(),
                 // Computers
                 GuiSprites.COMPUTER_NORMAL.textures(),
                 GuiSprites.COMPUTER_ADVANCED.textures(),

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

@@ -11,8 +11,7 @@
 import dan200.computercraft.shared.computer.core.ComputerState;
 import dan200.computercraft.shared.computer.core.ServerComputer;
 import dan200.computercraft.shared.computer.inventory.ComputerMenuWithoutInventory;
-import dan200.computercraft.shared.config.Config;
-import dan200.computercraft.shared.util.ComponentMap;
+import dan200.computercraft.shared.config.ConfigSpec;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.server.level.ServerLevel;
@@ -33,10 +32,9 @@ public ComputerBlockEntity(BlockEntityType<? extends ComputerBlockEntity> type,
 
     @Override
     protected ServerComputer createComputer(int id) {
-        return new ServerComputer(
-            (ServerLevel) getLevel(), getBlockPos(), id, label,
-            getFamily(), Config.computerTermWidth, Config.computerTermHeight,
-            ComponentMap.empty()
+        return new ServerComputer((ServerLevel) getLevel(), getBlockPos(), ServerComputer.properties(id, getFamily())
+            .label(getLabel())
+            .terminalSize(ConfigSpec.computerTermWidth.get(), ConfigSpec.computerTermHeight.get())
         );
     }
 

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

@@ -6,44 +6,33 @@
 
 import dan200.computercraft.shared.computer.menu.ServerInputHandler;
 
-import javax.annotation.Nullable;
+import java.nio.ByteBuffer;
 
 /**
- * Handles user-provided input, forwarding it to a computer. This is used
+ * Handles user-provided input, forwarding it to a computer. This describes the "shape" of both the client-and
+ * server-side input handlers.
  *
  * @see ServerInputHandler
  * @see ServerComputer
  */
 public interface InputHandler {
-    void queueEvent(String event, @Nullable Object[] arguments);
+    void keyDown(int key, boolean repeat);
 
-    default void queueEvent(String event) {
-        queueEvent(event, null);
-    }
+    void keyUp(int key);
 
-    default void keyDown(int key, boolean repeat) {
-        queueEvent("key", new Object[]{ key, repeat });
-    }
+    void charTyped(byte chr);
 
-    default void keyUp(int key) {
-        queueEvent("key_up", new Object[]{ key });
-    }
+    void paste(ByteBuffer contents);
 
-    default void mouseClick(int button, int x, int y) {
-        queueEvent("mouse_click", new Object[]{ button, x, y });
-    }
+    void mouseClick(int button, int x, int y);
 
-    default void mouseUp(int button, int x, int y) {
-        queueEvent("mouse_up", new Object[]{ button, x, y });
-    }
+    void mouseUp(int button, int x, int y);
 
-    default void mouseDrag(int button, int x, int y) {
-        queueEvent("mouse_drag", new Object[]{ button, x, y });
-    }
+    void mouseDrag(int button, int x, int y);
 
-    default void mouseScroll(int direction, int x, int y) {
-        queueEvent("mouse_scroll", new Object[]{ direction, x, y });
-    }
+    void mouseScroll(int direction, int x, int y);
+
+    void terminate();
 
     void shutdown();