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, 122 insertions, 0 deletions

diff --git a/versions/1.16.2-fabric/src/main/java/cc/polyfrost/oneconfig/utils/commands/PlatformCommandManagerImpl.java b/versions/1.16.2-fabric/src/main/java/cc/polyfrost/oneconfig/utils/commands/PlatformCommandManagerImpl.java
new file mode 100644
index 0000000..674d7b9
--- /dev/null
+++ b/versions/1.16.2-fabric/src/main/java/cc/polyfrost/oneconfig/utils/commands/PlatformCommandManagerImpl.java
@@ -0,0 +1,122 @@
+package cc.polyfrost.oneconfig.utils.commands;
+
+import cc.polyfrost.oneconfig.libs.universal.ChatColor;
+import cc.polyfrost.oneconfig.libs.universal.UChat;
+import cc.polyfrost.oneconfig.utils.commands.annotations.Command;
+import cc.polyfrost.oneconfig.utils.commands.annotations.Greedy;
+import cc.polyfrost.oneconfig.utils.commands.arguments.ArgumentParser;
+import cc.polyfrost.oneconfig.utils.commands.arguments.Arguments;
+import com.mojang.brigadier.StringReader;
+import com.mojang.brigadier.arguments.ArgumentType;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.suggestion.Suggestions;
+import com.mojang.brigadier.suggestion.SuggestionsBuilder;
+import net.minecraft.server.command.ServerCommandSource;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Parameter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.concurrent.CompletableFuture;
+
+import static cc.polyfrost.oneconfig.utils.commands.CommandManager.METHOD_RUN_ERROR;
+
+public class PlatformCommandManagerImpl extends PlatformCommandManager {
+
+    final HashMap<Class<?>, Pair<ArgumentType<Object>, ArgumentType<Object>>> parsers = new HashMap<>(); // non-greedy, greedy
+
+    @Override
+    void createCommand(CommandManager.InternalCommand root, Command annotation) {
+        LiteralArgumentBuilder<ServerCommandSource> builder = net.minecraft.server.command.CommandManager.literal(annotation.value());
+        if (!root.invokers.isEmpty()) {
+            builder.executes((context ->
+            {
+                try {
+                    root.invokers.get(0).method.invoke(null);
+                    return 1;
+                } catch (IllegalAccessException | InvocationTargetException | IllegalArgumentException |
+                         ExceptionInInitializerError e) {
+                    UChat.chat(ChatColor.RED.toString() + ChatColor.BOLD + METHOD_RUN_ERROR);
+                    return 0;
+                }
+            }));
+        }
+        if (annotation.helpCommand()) {
+            builder.then(net.minecraft.server.command.CommandManager.literal("help").executes((context ->
+            {
+                UChat.chat(sendHelpCommand(root));
+                return 1;
+            })));
+        }
+        for (CommandManager.InternalCommand command : root.children) {
+            loopThroughChildren(command, builder, null);
+        }
+    }
+
+    private void loopThroughChildren(CommandManager.InternalCommand command, LiteralArgumentBuilder<ServerCommandSource> root, LiteralArgumentBuilder<ServerCommandSource> builder) {
+        if (command.invokers.isEmpty() || command.children.isEmpty()) return;
+        if (builder == null) {
+            builder = root.then(net.minecraft.server.command.CommandManager.literal(command.name));
+        } else {
+            builder = builder.then(net.minecraft.server.command.CommandManager.literal(command.name));
+        }
+        for (CommandManager.InternalCommand.InternalCommandInvoker invoker : command.invokers) {
+            for (Parameter parameter : invoker.method.getParameters()) {
+                Pair<ArgumentType<Object>, ArgumentType<Object>> pair = parsers.get(parameter.getType());
+                builder.then(net.minecraft.server.command.CommandManager.argument(parameter.getName(), parameter.isAnnotationPresent(Greedy.class) ? pair.getRight() : pair.getLeft()));
+            }
+            builder.executes((context ->
+            {
+                try {
+                    ArrayList<Object> args = new ArrayList<>(invoker.method.getParameterCount());
+                    for (Parameter parameter: invoker.method.getParameters()) {
+                        args.add(context.getArgument(parameter.getName(), Object.class));
+                    }
+                    invoker.method.invoke(null, args);
+                    return 1;
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    UChat.chat(ChatColor.RED.toString() + ChatColor.BOLD + METHOD_RUN_ERROR);
+                    return 0;
+                }
+            }));
+        }
+        for (CommandManager.InternalCommand child : command.children) {
+            loopThroughChildren(child, root, builder);
+        }
+    }
+
+    @Override
+    public void handleNewParser(ArgumentParser<?> parser, Class<?> clazz) {
+        parsers.put(clazz, new ImmutablePair<ArgumentType<Object>, ArgumentType<Object>>(new ArgumentType() {
+
+            @Override
+            public Object parse(StringReader reader) {
+                final String text = reader.getRemaining();
+                reader.setCursor(reader.getTotalLength());
+                return parser.parse(new Arguments(text.split("\\s+"), false));
+            }
+
+            @Override
+            public CompletableFuture<Suggestions> listSuggestions(CommandContext context, SuggestionsBuilder builder) {
+                return ArgumentType.super.listSuggestions(context, builder);
+            }
+        }, new ArgumentType() {
+
+            @Override
+            public Object parse(StringReader reader) {
+                final String text = reader.getRemaining();
+                reader.setCursor(reader.getTotalLength());
+                return parser.parse(new Arguments(text.split("\\s+"), true));
+            }
+
+            @Override
+            public CompletableFuture<Suggestions> listSuggestions(CommandContext context, SuggestionsBuilder builder) {
+                return ArgumentType.super.listSuggestions(context, builder);
+            }
+        }));
+    }
+}