From 25026eb98678e7fe9c5c135de51aa3fdf34c6c19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Wed, 30 Dec 2020 19:17:34 +0100
Subject: [PATCH] Moved controls to left of terminal screen.

---
 .../li/cil/oc2/client/gui/TerminalScreen.java |  51 ++++++++++--------
 .../oc2/textures/gui/screen/terminal.png      | Bin 6082 -> 4886 bytes
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/main/java/li/cil/oc2/client/gui/TerminalScreen.java b/src/main/java/li/cil/oc2/client/gui/TerminalScreen.java
index 9f9ebfd7..5e30600e 100644
--- a/src/main/java/li/cil/oc2/client/gui/TerminalScreen.java
+++ b/src/main/java/li/cil/oc2/client/gui/TerminalScreen.java
@@ -28,6 +28,8 @@ public final class TerminalScreen extends Screen {
     private static final ResourceLocation BACKGROUND_TERMINAL_FOCUSED = new ResourceLocation(API.MOD_ID, "textures/gui/screen/terminal_focused.png");
     private static final int TEXTURE_SIZE = 512;
 
+    private static final Sprite CONTROLS_BACKGROUND = new Sprite(BACKGROUND, TEXTURE_SIZE, 19, 34, 82, 244);
+
     private static final Sprite CAPTURE_INPUT_BASE = new Sprite(BACKGROUND, TEXTURE_SIZE, 12, 12, 15, 241);
     private static final Sprite CAPTURE_INPUT_PRESSED = new Sprite(BACKGROUND, TEXTURE_SIZE, 12, 12, 29, 241);
     private static final Sprite CAPTURE_INPUT_ACTIVE = new Sprite(BACKGROUND, TEXTURE_SIZE, 12, 12, 1, 241);
@@ -37,11 +39,12 @@ public final class TerminalScreen extends Screen {
     private static final Sprite POWER_ACTIVE = new Sprite(BACKGROUND, TEXTURE_SIZE, 12, 12, 1, 255);
 
     private static final int SCREEN_WIDTH = 336;
-    private static final int SCREEN_HEIGHT = 228;
+    private static final int SCREEN_HEIGHT = 208;
     private static final int TERMINAL_AREA_X = 8;
     private static final int TERMINAL_AREA_Y = 8;
     private static final int TERMINAL_AREA_WIDTH = 80 * 8 / 2;
     private static final int TERMINAL_AREA_HEIGHT = 24 * 16 / 2;
+    private static final int CONTROLS_TOP = 8;
 
     private static boolean enableInputCapture;
 
@@ -72,6 +75,8 @@ public final class TerminalScreen extends Screen {
         requireNonNull(minecraft).getTextureManager().bindTexture(BACKGROUND);
         blit(matrixStack, windowLeft, windowTop, 0, 0, windowWidth, windowHeight, TEXTURE_SIZE, TEXTURE_SIZE);
 
+        CONTROLS_BACKGROUND.draw(matrixStack, windowLeft - CONTROLS_BACKGROUND.width, windowTop + CONTROLS_TOP);
+
         if (shouldCaptureInput()) {
             requireNonNull(minecraft).getTextureManager().bindTexture(BACKGROUND_TERMINAL_FOCUSED);
             blit(matrixStack, windowLeft, windowTop, 0, 0, windowWidth, windowHeight, TEXTURE_SIZE, TEXTURE_SIZE);
@@ -169,27 +174,8 @@ public final class TerminalScreen extends Screen {
         requireNonNull(minecraft).keyboardListener.enableRepeatEvents(true);
 
         addButton(new ToggleImageButton(
-                this, windowLeft + 104, windowTop + 212, 12, 12,
-                new TranslationTextComponent(Constants.COMPUTER_SCREEN_CAPTURE_INPUT_CAPTION),
-                new TranslationTextComponent(Constants.COMPUTER_SCREEN_CAPTURE_INPUT_DESCRIPTION),
-                CAPTURE_INPUT_BASE,
-                CAPTURE_INPUT_PRESSED,
-                CAPTURE_INPUT_ACTIVE
-        ) {
-            @Override
-            public void onPress() {
-                super.onPress();
-                enableInputCapture = !enableInputCapture;
-            }
-
-            @Override
-            public boolean isToggled() {
-                return enableInputCapture;
-            }
-        });
-
-        addButton(new ToggleImageButton(
-                this, windowLeft + 220, windowTop + 212, 12, 12,
+                this, windowLeft - CONTROLS_BACKGROUND.width + 4, windowTop + CONTROLS_TOP + 4,
+                12, 12,
                 new TranslationTextComponent(Constants.COMPUTER_SCREEN_POWER_CAPTION),
                 new TranslationTextComponent(Constants.COMPUTER_SCREEN_POWER_DESCRIPTION),
                 POWER_BASE,
@@ -208,6 +194,27 @@ public final class TerminalScreen extends Screen {
                 return tileEntity.isRunning();
             }
         });
+
+        addButton(new ToggleImageButton(
+                this, windowLeft - CONTROLS_BACKGROUND.width + 4, windowTop + CONTROLS_TOP + 18,
+                12, 12,
+                new TranslationTextComponent(Constants.COMPUTER_SCREEN_CAPTURE_INPUT_CAPTION),
+                new TranslationTextComponent(Constants.COMPUTER_SCREEN_CAPTURE_INPUT_DESCRIPTION),
+                CAPTURE_INPUT_BASE,
+                CAPTURE_INPUT_PRESSED,
+                CAPTURE_INPUT_ACTIVE
+        ) {
+            @Override
+            public void onPress() {
+                super.onPress();
+                enableInputCapture = !enableInputCapture;
+            }
+
+            @Override
+            public boolean isToggled() {
+                return enableInputCapture;
+            }
+        });
     }
 
     ///////////////////////////////////////////////////////////////////
diff --git a/src/main/resources/assets/oc2/textures/gui/screen/terminal.png b/src/main/resources/assets/oc2/textures/gui/screen/terminal.png
index 2a0c656051ca3a1eb0a7ea0de4dd282e1f6ad082..40c0db4368dabf0f419acaa09099712d195f205c 100644
GIT binary patch
delta 2514
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

delta 3716
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
V0y$4^DOR>}`jr342KT71{{y2x<MRLj