Simplify KeyboardScreen

Author: SirEndii

src/main/java/de/srendi/advancedperipherals/client/screens/KeyboardScreen.java

@@ -2,48 +2,42 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import dan200.computercraft.client.gui.ClientInputHandler;
+import dan200.computercraft.client.gui.widgets.WidgetTerminal;
+import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.shared.computer.core.InputHandler;
 import de.srendi.advancedperipherals.client.screens.base.BaseScreen;
 import de.srendi.advancedperipherals.common.container.KeyboardContainer;
-import net.minecraft.SharedConstants;
+import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Inventory;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
 
-import java.util.BitSet;
-
 /**
  * A simple screen but without any rendering calls. Used to unlock the mouse so we can freely write stuff
  * <p>
- * Char/key logic stolen from CC's WidgetTerminal
+ * We just create a terminal which is used to forward all the key presses and mouse clicks but we don't render it.
  */
 public class KeyboardScreen extends BaseScreen<KeyboardContainer> {
 
     protected final InputHandler input;
-    private final BitSet keysDown = new BitSet(256);
-
-    private float terminateTimer = -1;
-    private float rebootTimer = -1;
-    private float shutdownTimer = -1;
+    private final Terminal terminalData;
 
-    private int lastMouseButton = -1;
-    private int lastMouseX = -1;
-    private int lastMouseY = -1;
+    private WidgetTerminal terminal;
 
     public KeyboardScreen(KeyboardContainer screenContainer, Inventory inv, Component titleIn) {
         super(screenContainer, inv, titleIn);
         input = new ClientInputHandler(menu);
+        terminalData = new Terminal(0, 0, false);
     }
 
     @Override
     public void render(@NotNull PoseStack poseStack, int x, int y, float partialTicks) {
         Minecraft minecraft = Minecraft.getInstance();
         float scale = 2f;
         int screenWidth = minecraft.getWindow().getGuiScaledWidth();
-        int screenHeight = minecraft.getWindow().getGuiScaledHeight();
         // Make the text a bit smaller on small screens
         if (screenWidth <= 1080)
             scale = 1f;
@@ -52,12 +46,23 @@ public void render(@NotNull PoseStack poseStack, int x, int y, float partialTick
         String text = "Press ESC to close the Keyboard Screen.";
         float textX = (screenWidth / 2f - minecraft.font.width(text) * scale / 2f) / scale;
         minecraft.font.drawShadow(poseStack, text, textX, 1, 0xFFFFFF);
+    }
+
+    @Override
+    protected void init() {
+        passEvents = true;
+        KeyMapping.releaseAll();
 
-        // Prevents JEI/REI/EMI from rendering. Maybe not the best way, but it works for now.
-        poseStack.scale(4f, 4f, 1);
-        minecraft.font.draw(poseStack, "", screenWidth, screenHeight, 0xFFFFFF);
+        super.init();
+        minecraft.keyboardHandler.setSendRepeatsToGui(true);
+
+        terminal = addWidget(new WidgetTerminal(terminalData, new ClientInputHandler(menu), 0, 0));
+        terminal.visible = false;
+        terminal.active = false;
+        setFocused(terminal);
     }
 
+
     @Override
     protected void renderBg(@NotNull PoseStack matrixStack, float partialTicks, int x, int y) {
     }
@@ -66,149 +71,52 @@ protected void renderBg(@NotNull PoseStack matrixStack, float partialTicks, int
     public void renderBackground(@NotNull PoseStack pPoseStack) {
     }
 
-    @Override
-    public boolean charTyped(char ch, int modifiers) {
-        if (ch >= 32 && ch <= 126 || ch >= 160 && ch <= 255) { // printable chars in byte range
-            // Queue the "char" event
-            input.queueEvent("char", new Object[]{Character.toString(ch)});
-        }
-
-        return true;
-    }
 
     @Override
-    public boolean keyPressed(int key, int scancode, int modifiers) {
-        if (key == GLFW.GLFW_KEY_ESCAPE) {
-            onClose();
-            return true;
-        }
-        if ((modifiers & GLFW.GLFW_MOD_CONTROL) != 0) {
-            switch (key) {
-                case GLFW.GLFW_KEY_T:
-                    if (terminateTimer < 0) terminateTimer = 0;
-                    return true;
-                case GLFW.GLFW_KEY_S:
-                    if (shutdownTimer < 0) shutdownTimer = 0;
-                    return true;
-                case GLFW.GLFW_KEY_R:
-                    if (rebootTimer < 0) rebootTimer = 0;
-                    return true;
-
-                case GLFW.GLFW_KEY_V:
-                    // Ctrl+V for paste
-                    String clipboard = Minecraft.getInstance().keyboardHandler.getClipboard();
-                    if (clipboard != null) {
-                        // Clip to the first occurrence of \r or \n
-                        int newLineIndex1 = clipboard.indexOf("\r");
-                        int newLineIndex2 = clipboard.indexOf("\n");
-                        if (newLineIndex1 >= 0 && newLineIndex2 >= 0) {
-                            clipboard = clipboard.substring(0, Math.min(newLineIndex1, newLineIndex2));
-                        } else if (newLineIndex1 >= 0) {
-                            clipboard = clipboard.substring(0, newLineIndex1);
-                        } else if (newLineIndex2 >= 0) {
-                            clipboard = clipboard.substring(0, newLineIndex2);
-                        }
-
-                        // Filter the string
-                        clipboard = SharedConstants.filterText(clipboard);
-                        if (!clipboard.isEmpty()) {
-                            // Clip to 512 characters and queue the event
-                            if (clipboard.length() > 512) clipboard = clipboard.substring(0, 512);
-                            input.queueEvent("paste", new Object[]{clipboard});
-                        }
-
-                        return true;
-                    }
-            }
-        }
-
-        if (key >= 0 && terminateTimer < 0 && rebootTimer < 0 && shutdownTimer < 0) {
-            // Queue the "key" event and add to the down set
-            boolean repeat = keysDown.get(key);
-            keysDown.set(key);
-            input.keyDown(key, repeat);
-        }
-
-        return true;
+    public final void removed() {
+        super.removed();
+        minecraft.keyboardHandler.setSendRepeatsToGui(false);
     }
 
     @Override
-    public boolean keyReleased(int key, int scancode, int modifiers) {
-        // Queue the "key_up" event and remove from the down set
-        if (key >= 0 && keysDown.get(key)) {
-            keysDown.set(key, false);
-            input.keyUp(key);
-        }
-
-        switch (key) {
-            case GLFW.GLFW_KEY_T:
-                terminateTimer = -1;
-                break;
-            case GLFW.GLFW_KEY_R:
-                rebootTimer = -1;
-                break;
-            case GLFW.GLFW_KEY_S:
-                shutdownTimer = -1;
-                break;
-            case GLFW.GLFW_KEY_LEFT_CONTROL:
-            case GLFW.GLFW_KEY_RIGHT_CONTROL:
-                terminateTimer = rebootTimer = shutdownTimer = -1;
-                break;
-        }
-
-        return true;
+    public boolean mouseScrolled(double pMouseX, double pMouseY, double pDelta) {
+        minecraft.player.getInventory().swapPaint(pDelta);
+        return super.mouseScrolled(pMouseX, pMouseY, pDelta);
     }
 
     @Override
-    public boolean mouseClicked(double mouseX, double mouseY, int button) {
-        input.mouseClick(button + 1, (int) mouseX, (int) mouseY);
-
-        lastMouseButton = button;
-        lastMouseX = (int) mouseX;
-        lastMouseY = (int) mouseY;
-
-        return true;
+    public void onClose() {
+        // Don't allow closing using standard keys like E. Closing using ESCAPE is still possible due to the keyPressed method
     }
 
     @Override
-    public boolean mouseReleased(double mouseX, double mouseY, int button) {
-        if (lastMouseButton == button) {
-            input.mouseUp(lastMouseButton + 1, (int) mouseX, (int) mouseY);
-            lastMouseButton = -1;
-        }
-
+    public boolean isPauseScreen() {
         return false;
     }
 
     @Override
-    public boolean mouseDragged(double mouseX, double mouseY, int button, double v2, double v3) {
-        if (button == lastMouseButton && (mouseX != lastMouseX || mouseY != lastMouseY)) {
-            input.mouseDrag(button + 1, (int) mouseX, (int) mouseY);
-            lastMouseX = (int) mouseX;
-            lastMouseY = (int) mouseY;
+    public final boolean keyPressed(int key, int scancode, int modifiers) {
+        if (key == GLFW.GLFW_KEY_ESCAPE) {
+            super.onClose();
+            return true;
+        }
+        // Forward the tab key to the terminal, rather than moving between controls.
+        if (key == GLFW.GLFW_KEY_TAB && getFocused() != null && getFocused() == terminal) {
+            return getFocused().keyPressed(key, scancode, modifiers);
         }
 
-        return false;
-    }
-
-    @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double delta) {
-        input.mouseScroll(delta < 0 ? 1 : -1, (int) mouseX, (int) mouseY);
-
-        lastMouseX = (int) mouseX;
-        lastMouseY = (int) mouseY;
-
-        return true;
+        return super.keyPressed(key, scancode, modifiers);
     }
 
+    // We prevent jei by increasing the image size, even if we don't render it
     @Override
     public int getSizeX() {
-        return 256;
+        return 4096;
     }
 
     @Override
     public int getSizeY() {
-        return 256;
+        return 4096;
     }
 
     @Override

src/main/java/de/srendi/advancedperipherals/common/container/base/BaseContainer.java

@@ -10,6 +10,7 @@
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.SlotItemHandler;
 import net.minecraftforge.items.wrapper.InvWrapper;
@@ -23,8 +24,16 @@ public abstract class BaseContainer extends AbstractContainerMenu {
     protected BaseContainer(@Nullable MenuType<?> type, int id, Inventory inventory, BlockPos pos, Level world) {
         super(type, id);
         this.inventory = new InvWrapper(inventory);
-        if (world != null)
-            this.tileEntity = (PeripheralBlockEntity<?>) world.getBlockEntity(pos);
+        if (world != null) {
+            BlockEntity blockEntity = world.getBlockEntity(pos);
+            // for player containers, pos is the position of the player
+            // We don't actual need a block entity for player containers
+            // But if a player stands for example on a mekanism cable, setting the tileEntity by casting and without a check
+            // would prevent opening the screen
+            if (blockEntity instanceof PeripheralBlockEntity<?> peripheralBlockEntity) {
+                tileEntity = peripheralBlockEntity;
+            }
+        }
     }
 
     @Override