HUD Improvements, 1.16 port, fix NanoVG with ARM (#52)

* egg 1

* separate Hud from background stuff

* 1984

This reverts commit 9ae517d57bbd495d30d35cb1cbfe81a03556e6bd.

* hitboxes woo!!!!!

* Revert "hitboxes woo!!!!!"

This reverts commit 405d32d17df3c83f2e79eddf0de853f7279767a6.

* padding

* allow position to go slightly off the screen

* stop using ints for ABSOLUTELY EVERYTHING, DIAMOND ...
fix vigilance compat not setting color

* start on new pos system

* some stuff

* finish new position system

* api momento

* 1.16.2 fabric port

* start on hud gui

* temp remove 1.16.2 fabric since it doesn't compile

* fix fabric build

* hud gui stuff

* apiDump

* fix fabric build 2

* so true

* selecting stuff

* scaling + other small things

* More protecting

* fix nanovg not working with macOS ARM
move OneConfig.preLaunch to OneConfigInit

* clean up OneUIScreen
make kotlin version of TestNanoVGGui

* make keybinds have runnable by default

* rollback keybind things

* merge master into hud-improvements (#55)

* Release workflow (#53)

* release workflow

* update normal version to hash

* fix

* fix naming

* fix some stuff

* fix version thing

* switch to number from hash

* Release workflow (#54)

* release workflow

* update normal version to hash

* fix

* fix naming

* fix some stuff

* fix version thing

* switch to number from hash

* Maybe epic fixo

* gotta love those Java principles

* Revert "gotta love those Java principles", wrong branch

This reverts commit 333d8b2ad8941790c13c4bfe0777fbd203d463e5.

* start on snapping

* Finish snapping

* stop including mixin by default on legacy versions
this breaks builds if the mod itself does not use mixin

* merge draw and drawExample

* fix gradle publish

* Some fixes

* Api DUmpidy

* Help subcommand impovments (#59)

* Made the overall look of the "help" subcommand better + added the ability to change the colour for the command overall + each individual SubCommand

* Made the alliases show batter + added support for to show subcommand aliasses

* mr deliverer didnt reply but whatever, added a space between command/subcommand and alliasses

Co-authored-by: pinkulu <pinkulumc@gmail.com>

* fix file not overwriting
toJavaColor

* Fix full shadow not scaling correctly

Co-authored-by: DeDiamondPro <67508414+DeDiamondPro@users.noreply.github.com>
Co-authored-by: nxtdaydelivery <12willettsh@gmail.com>
Co-authored-by: pinkulu <56201697+pinkulu@users.noreply.github.com>
Co-authored-by: pinkulu <pinkulumc@gmail.com>

2 files changed, 12 insertions, 28 deletions

diff --git a/src/main/java/cc/polyfrost/oneconfig/utils/gui/GuiUtils.java b/src/main/java/cc/polyfrost/oneconfig/utils/gui/GuiUtils.java
index 63203e4..969654e 100644
--- a/src/main/java/cc/polyfrost/oneconfig/utils/gui/GuiUtils.java
+++ b/src/main/java/cc/polyfrost/oneconfig/utils/gui/GuiUtils.java
@@ -24,7 +24,6 @@ public final class GuiUtils {
      * Displays a screen after a tick, preventing mouse sync issues.
      *
      * @param screen the screen to display.
-     * @deprecated Not actually deprecated, but should not be used.
      */
     @Deprecated
     public static void displayScreen(Object screen) {
diff --git a/src/main/java/cc/polyfrost/oneconfig/utils/gui/OneUIScreen.java b/src/main/java/cc/polyfrost/oneconfig/utils/gui/OneUIScreen.java
index 2dd961e..6a64251 100644
--- a/src/main/java/cc/polyfrost/oneconfig/utils/gui/OneUIScreen.java
+++ b/src/main/java/cc/polyfrost/oneconfig/utils/gui/OneUIScreen.java
@@ -37,16 +37,12 @@ public abstract class OneUIScreen extends UScreen implements GuiPause {
     }
 
     @Override
-    public void onDrawScreen(@NotNull UMatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) {
+    public final void onDrawScreen(@NotNull UMatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) {
         super.onDrawScreen(matrixStack, mouseX, mouseY, partialTicks);
         RenderManager.setupAndDraw(ignoreMinecraftScale(), vg -> draw(vg, partialTicks));
         mouseDown = Platform.getMousePlatform().isButtonDown(0);
     }
 
-    /**
-     * This method is called when the screen is first opened. You can use it to set variables, initialize things, etc.
-     */
-    public abstract void onScreenOpen();
 
     /**
      * Use this method to draw things on the screen. It is called every render tick, and has a handy <code>vg</code> (NanoVG context) that can be used with the {@link RenderManager} to draw things.
@@ -59,18 +55,7 @@ public abstract class OneUIScreen extends UScreen implements GuiPause {
     public abstract void draw(long vg, float partialTicks);
 
     /**
-     * This method is called when the screen is closed. You can use it to clean up things, etc.
-     */
-    @Override
-    public abstract void onScreenClose();
-
-    @Override
-    public void initScreen(int width, int height) {
-        onScreenOpen();
-    }
-
-    /**
-     * Use this method to set weather or not to use the Minecraft scale on the GUI. Its default is true, and that is recommended for the NanoVG rendering.
+     * Use this method to set whether to use the Minecraft scale on the GUI. Its default is true, and that is recommended for the NanoVG rendering.
      */
     public boolean ignoreMinecraftScale() {
         return true;
@@ -79,42 +64,37 @@ public abstract class OneUIScreen extends UScreen implements GuiPause {
     /**
      * Get the current x position of the mouse.
      */
-    public int getMouseX() {
+    protected float getMouseX() {
         return InputUtils.mouseX();
     }
 
     /**
      * Get the current y position of the mouse.
      */
-    public int getMouseY() {
+    protected float getMouseY() {
         return InputUtils.mouseY();
     }
 
-    @Override
-    public void onMouseClicked(double mouseX, double mouseY, int mouseButton) {
-        super.onMouseClicked(mouseX, mouseY, mouseButton);
-    }
-
     /**
      * Retrieve the click status of the mouse. This method uses a boolean to store the status of the mouse, so it will only return true once per click. (very useful)
      *
      * @param ignoreBlockClicks whether to ignore the current click blocker.
      */
-    public boolean isClicked(boolean ignoreBlockClicks) {
+    protected boolean isClicked(boolean ignoreBlockClicks) {
         return mouseDown && !Platform.getMousePlatform().isButtonDown(0) && (!blockClicks || ignoreBlockClicks);
     }
 
     /**
      * Retrieve the click status of the mouse. This method uses a boolean to store the status of the mouse, so it will only return true once per click. (very useful)
      */
-    public boolean isClicked() {
+    protected boolean isClicked() {
         return isClicked(false);
     }
 
     /**
      * Retrieve weather or not the mouse is currently down. Will constantly return true if its clicked. See {@link #isClicked()} for a method that only executes once per tick.
      */
-    public boolean isMouseDown() {
+    protected boolean isMouseDown() {
         return Platform.getMousePlatform().isButtonDown(0);
     }
 
@@ -131,4 +111,9 @@ public abstract class OneUIScreen extends UScreen implements GuiPause {
     public boolean isBlockingClicks() {
         return blockClicks;
     }
+
+    @Override
+    public boolean doesGuiPauseGame() {
+        return false;
+    }
 }