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>

1 files changed, 16 insertions, 8 deletions

diff --git a/lwjgl/build.gradle.kts b/lwjgl/build.gradle.kts
index fcc5511..925fb4d 100644
--- a/lwjgl/build.gradle.kts
+++ b/lwjgl/build.gradle.kts
@@ -16,7 +16,7 @@ val mod_name: String by project
 val mod_version: String by project
 val mod_id: String by project
 
-version = "1.0.0-alpha5"
+version = "1.0.0-alpha8"
 
 repositories {
     maven("https://repo.polyfrost.cc/releases")
@@ -50,19 +50,27 @@ dependencies {
         shadeRuntimeOnly("org.lwjgl:lwjgl:$lwjgl:natives-macos")
         shadeRuntimeOnly("org.lwjgl:lwjgl-stb:$lwjgl:natives-macos")
         shadeRuntimeOnly("org.lwjgl:lwjgl-tinyfd:$lwjgl:natives-macos")
+        shadeRuntimeOnly("org.lwjgl:lwjgl:$lwjgl:natives-macos-arm64")
+        shadeRuntimeOnly("org.lwjgl:lwjgl-stb:$lwjgl:natives-macos-arm64")
+        shadeRuntimeOnly("org.lwjgl:lwjgl-tinyfd:$lwjgl:natives-macos-arm64")
     }
 
     shadeCompileOnly("org.lwjgl:lwjgl-nanovg:$lwjgl") {
-        isTransitive = platform.isLegacyForge
+        isTransitive = false
     }
     shadeRuntimeOnly("org.lwjgl:lwjgl-nanovg:$lwjgl:natives-windows") {
-        isTransitive = platform.isLegacyForge
+        isTransitive = false
     }
     shadeRuntimeOnly("org.lwjgl:lwjgl-nanovg:$lwjgl:natives-linux") {
-        isTransitive = platform.isLegacyForge
+        isTransitive = false
     }
     shadeRuntimeOnly("org.lwjgl:lwjgl-nanovg:$lwjgl:natives-macos") {
-        isTransitive = platform.isLegacyForge
+        isTransitive = false
+    }
+    // force 3.3.1 for this, because
+    // if the user is actually running M1+, LWJGL must be 3.3.0+
+    shadeRuntimeOnly("org.lwjgl:lwjgl-nanovg:3.3.1:natives-macos-arm64") {
+        isTransitive = false
     }
 }
 
@@ -70,10 +78,10 @@ tasks {
     named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
         archiveClassifier.set("")
         configurations = listOf(shadeCompileOnly, shadeRuntimeOnly)
-        exclude("META-INF/versions/**")
-        exclude("**/module-info.class")
-        exclude("**/package-info.class")
         if (platform.isLegacyForge) {
+            exclude("META-INF/versions/**")
+            exclude("**/module-info.class")
+            exclude("**/package-info.class")
             relocate("org.lwjgl", "org.lwjgl3") {
                 include("org.lwjgl.PointerBuffer")
                 include("org.lwjgl.BufferUtils")