fix: adjust signature of mixin constructor redirect

WiIIiam278 · Jun 17, 2024 · 187acc9 · 187acc9
1 parent 58d20a3
commit 187acc9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/fabric-1.20.1/src/main/java/net/william278/uniform/fabric/mixins/ArgumentNodeMixin.java b/fabric-1.20.1/src/main/java/net/william278/uniform/fabric/mixins/ArgumentNodeMixin.java
@@ -39,17 +39,18 @@
 public class ArgumentNodeMixin {
 
     @Invoker("<init>")
-    private static ArgumentNode createArgumentNode(String name, ArgumentSerializer.ArgumentTypeProperties<?> properties, @Nullable Identifier id) {
+    private static ArgumentNode createArgumentNode(String name, ArgumentSerializer.ArgumentTypeProperties<?> properties,
+                                                   @Nullable Identifier id) {
         throw new AssertionError();
     }
 
     @Redirect(method = "<init>(Lcom/mojang/brigadier/tree/ArgumentCommandNode;)V", at = @At("HEAD"))
-    private static <A> ArgumentNode onConstruct(ArgumentCommandNode<CommandSource, A> node) {
+    private static ArgumentNode onConstruct(ArgumentCommandNode<CommandSource, ?> node) {
         ArgumentSerializer.ArgumentTypeProperties<?> properties;
         try {
-            properties = ArgumentTypes.get(node.getType()).getArgumentTypeProperties(node.getType());
+            properties = ArgumentTypes.getArgumentTypeProperties(node.getType());
         } catch (IllegalArgumentException e) {
-            properties = ArgumentTypes.get(StringArgumentType.string()).getArgumentTypeProperties(StringArgumentType.string());
+            properties = ArgumentTypes.getArgumentTypeProperties(StringArgumentType.string());
         }
 
         return createArgumentNode(

diff --git a/fabric-1.20.6/src/main/java/net/william278/uniform/fabric/mixins/ArgumentNodeMixin.java b/fabric-1.20.6/src/main/java/net/william278/uniform/fabric/mixins/ArgumentNodeMixin.java
@@ -39,17 +39,18 @@
 public class ArgumentNodeMixin {
 
     @Invoker("<init>")
-    private static ArgumentNode createArgumentNode(String name, ArgumentSerializer.ArgumentTypeProperties<?> properties, @Nullable Identifier id) {
+    private static ArgumentNode createArgumentNode(String name, ArgumentSerializer.ArgumentTypeProperties<?> properties,
+                                                   @Nullable Identifier id) {
         throw new AssertionError();
     }
 
     @Redirect(method = "<init>(Lcom/mojang/brigadier/tree/ArgumentCommandNode;)V", at = @At("HEAD"))
-    private static <A> ArgumentNode onConstruct(ArgumentCommandNode<CommandSource, A> node) {
+    private static ArgumentNode onConstruct(ArgumentCommandNode<CommandSource, ?> node) {
         ArgumentSerializer.ArgumentTypeProperties<?> properties;
         try {
-            properties = ArgumentTypes.get(node.getType()).getArgumentTypeProperties(node.getType());
+            properties = ArgumentTypes.getArgumentTypeProperties(node.getType());
         } catch (IllegalArgumentException e) {
-            properties = ArgumentTypes.get(StringArgumentType.string()).getArgumentTypeProperties(StringArgumentType.string());
+            properties = ArgumentTypes.getArgumentTypeProperties(StringArgumentType.string());
         }
 
         return createArgumentNode(

diff --git a/gradle.properties b/gradle.properties
@@ -3,6 +3,6 @@ javaVersion=17
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
 org.gradle.daemon=true
 
-library_version=1.0.11
+library_version=1.0.12
 library_archive=uniform
 library_description=Cross-platform wrapper for making Brigadier commands, based on BrigadierWrapper by Tofaa2, itself inspired by emortalmcs command system.