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>

4 files changed, 43 insertions, 15 deletions

diff --git a/src/main/java/cc/polyfrost/oneconfig/utils/commands/CommandManager.java b/src/main/java/cc/polyfrost/oneconfig/utils/commands/CommandManager.java
index 16a2f8d..14a40c1 100644
--- a/src/main/java/cc/polyfrost/oneconfig/utils/commands/CommandManager.java
+++ b/src/main/java/cc/polyfrost/oneconfig/utils/commands/CommandManager.java
@@ -1,5 +1,6 @@
 package cc.polyfrost.oneconfig.utils.commands;
 
+import cc.polyfrost.oneconfig.libs.universal.ChatColor;
 import cc.polyfrost.oneconfig.utils.commands.annotations.Command;
 import cc.polyfrost.oneconfig.utils.commands.annotations.Main;
 import cc.polyfrost.oneconfig.utils.commands.annotations.SubCommand;
@@ -63,7 +64,8 @@ public class CommandManager {
         if (clazz.isAnnotationPresent(Command.class)) {
             final Command annotation = clazz.getAnnotation(Command.class);
 
-            final InternalCommand root = new InternalCommand(annotation.value(), annotation.aliases(), annotation.description().trim().isEmpty() ? "Main command for " + annotation.value() : annotation.description(), null);
+            final InternalCommand root = new InternalCommand(annotation.value(), annotation.aliases(), annotation.description().trim().isEmpty()
+                    ? "Main command for " + annotation.value() : annotation.description(), annotation.color(),  null);
             for (Method method : clazz.getDeclaredMethods()) {
                 if (method.isAnnotationPresent(Main.class) && method.getParameterCount() == 0) {
                     root.invokers.add(new InternalCommand.InternalCommandInvoker(annotation.value(), annotation.aliases(), method, root));
@@ -79,7 +81,7 @@ public class CommandManager {
         for (Class<?> clazz : classes) {
             if (clazz.isAnnotationPresent(SubCommand.class)) {
                 SubCommand annotation = clazz.getAnnotation(SubCommand.class);
-                InternalCommand command = new InternalCommand(annotation.value(), annotation.aliases(), annotation.description(), parent);
+                InternalCommand command = new InternalCommand(annotation.value(), annotation.aliases(), annotation.description(), annotation.color() == ChatColor.RESET ? parent.color : annotation.color(), parent);
                 for (Method method : clazz.getDeclaredMethods()) {
                     if (method.isAnnotationPresent(Main.class)) {
                         command.invokers.add(new InternalCommand.InternalCommandInvoker(annotation.value(), annotation.aliases(), method, command));
@@ -103,15 +105,17 @@ public class CommandManager {
         public final String name;
         public final String[] aliases;
         public final String description;
+        public final ChatColor color;
         public final ArrayList<InternalCommandInvoker> invokers = new ArrayList<>();
         public final InternalCommand parent;
         public final ArrayList<InternalCommand> children = new ArrayList<>();
 
-        public InternalCommand(String name, String[] aliases, String description, InternalCommand parent) {
+        public InternalCommand(String name, String[] aliases, String description, ChatColor color, InternalCommand parent) {
             this.name = name;
             this.aliases = aliases;
             this.description = description;
             this.parent = parent;
+            this.color = color;
         }
 
         public boolean isValid(String name, boolean tabCompletion) {
diff --git a/src/main/java/cc/polyfrost/oneconfig/utils/commands/PlatformCommandManager.java b/src/main/java/cc/polyfrost/oneconfig/utils/commands/PlatformCommandManager.java
index 1ab356c..617694c 100644
--- a/src/main/java/cc/polyfrost/oneconfig/utils/commands/PlatformCommandManager.java
+++ b/src/main/java/cc/polyfrost/oneconfig/utils/commands/PlatformCommandManager.java
@@ -13,18 +13,19 @@ public abstract class PlatformCommandManager {
     //TODO: someone make the help command actually look nice lmao
     protected String sendHelpCommand(CommandManager.InternalCommand root) {
         StringBuilder builder = new StringBuilder();
-        builder.append(ChatColor.GOLD).append("Help for ").append(ChatColor.BOLD).append(root.name).append(ChatColor.RESET).append(ChatColor.GOLD).append(":\n");
-        if (!root.description.isEmpty()) {
-            builder.append("\n").append(ChatColor.GOLD).append("Description: ").append(ChatColor.BOLD).append(root.description);
-        }
-        for (CommandManager.InternalCommand command : root.children) {
-            runThroughCommandsHelp(root.name, command, builder);
-        }
-        builder.append("\n").append(ChatColor.GOLD).append("Aliases: ").append(ChatColor.BOLD);
+        builder.append(root.color).append("Help for ").append(ChatColor.BOLD).append(root.name).append(ChatColor.RESET).append(root.color);
         int index = 0;
         for (String alias : root.aliases) {
+            if(index == 0) builder.append(" (");
             ++index;
-            builder.append(alias).append(index < root.aliases.length ? ", " : "");
+            builder.append("/").append(alias).append(index < root.aliases.length ? ", " : ")");
+        }
+        builder.append(":\n");
+       if (!root.description.isEmpty()) {
+           builder.append("\n").append(root.color).append("/").append(root.name).append(": ").append(ChatColor.BOLD).append(root.description);
+       }
+        for (CommandManager.InternalCommand command : root.children) {
+            runThroughCommandsHelp(root.name, command, builder);
         }
         builder.append("\n");
         return builder.toString();
@@ -36,12 +37,12 @@ public abstract class PlatformCommandManager {
             if (declaringClass.isAnnotationPresent(SubCommand.class)) {
                 String description = declaringClass.getAnnotation(SubCommand.class).description();
                 if (!description.isEmpty()) {
-                    builder.append("\n").append(ChatColor.GOLD).append("Description: ").append(ChatColor.BOLD).append(description);
+                    builder.append("\n");
                 }
             }
         }
         for (CommandManager.InternalCommand.InternalCommandInvoker invoker : command.invokers) {
-            builder.append("\n").append(ChatColor.GOLD).append("/").append(append).append(" ").append(command.name);
+            builder.append("\n").append(command.color).append("/").append(append).append(" ").append(command.name);
             for (Parameter parameter : invoker.method.getParameters()) {
                 String name = parameter.getName();
                 if (parameter.isAnnotationPresent(Name.class)) {
@@ -49,8 +50,14 @@ public abstract class PlatformCommandManager {
                 }
                 builder.append(" <").append(name).append(">");
             }
+            int index = 0;
+            for (String alias : command.aliases) {
+                if(index == 0) builder.append(" (");
+                ++index;
+                builder.append(alias).append(index < command.aliases.length ? ", " : ")");
+            }
             if (!command.description.trim().isEmpty()) {
-                builder.append(": ").append(ChatColor.BOLD).append(command.description);
+                builder.append(": ").append(ChatColor.BOLD).append(command.color).append(command.description);
             }
         }
         for (CommandManager.InternalCommand subCommand : command.children) {
diff --git a/src/main/java/cc/polyfrost/oneconfig/utils/commands/annotations/Command.java b/src/main/java/cc/polyfrost/oneconfig/utils/commands/annotations/Command.java
index 41909c0..2bbf0bd 100644
--- a/src/main/java/cc/polyfrost/oneconfig/utils/commands/annotations/Command.java
+++ b/src/main/java/cc/polyfrost/oneconfig/utils/commands/annotations/Command.java
@@ -1,6 +1,7 @@
 package cc.polyfrost.oneconfig.utils.commands.annotations;
 
 import cc.polyfrost.oneconfig.internal.command.OneConfigCommand;
+import cc.polyfrost.oneconfig.libs.universal.ChatColor;
 import cc.polyfrost.oneconfig.utils.commands.CommandManager;
 import cc.polyfrost.oneconfig.utils.commands.arguments.ArgumentParser;
 
@@ -108,6 +109,13 @@ public @interface Command {
     String description() default "";
 
     /**
+     * The color of the command.
+     *
+     * @return The color of the command.
+     */
+    ChatColor color() default ChatColor.GOLD;
+
+    /**
      * Whether the command generates a help command.
      */
     boolean helpCommand() default true;
diff --git a/src/main/java/cc/polyfrost/oneconfig/utils/commands/annotations/SubCommand.java b/src/main/java/cc/polyfrost/oneconfig/utils/commands/annotations/SubCommand.java
index 1bfbd53..eddca3c 100644
--- a/src/main/java/cc/polyfrost/oneconfig/utils/commands/annotations/SubCommand.java
+++ b/src/main/java/cc/polyfrost/oneconfig/utils/commands/annotations/SubCommand.java
@@ -1,5 +1,7 @@
 package cc.polyfrost.oneconfig.utils.commands.annotations;
 
+import cc.polyfrost.oneconfig.libs.universal.ChatColor;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -34,4 +36,11 @@ public @interface SubCommand {
      * @return The description of the command.
      */
     String description() default "";
+
+    /**
+     * The color of the command.
+     *
+     * @return The color of the command.
+     */
+    ChatColor color() default ChatColor.RESET;
 }