remove custom argument type

tristankechlo · Oct 17, 2024 · 1f21578 · 1f21578
1 parent ab13ecd
commit 1f21578
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 91 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### Version 1.20.1 - 2.1.3
+
+- remove custom argument type, which caused some incompatibilities with other mods
+
 ### Version 1.20.1 - 2.1.1
 
 - fix potential render error that would make snail-shells invisible with some shaders

diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ import groovy.json.JsonOutput
 import groovy.json.JsonSlurper
 
 plugins {
-    id 'fabric-loom' version '1.6-SNAPSHOT' apply(false)
+    id 'fabric-loom' version '1.8-SNAPSHOT' apply(false)
     id 'net.minecraftforge.gradle' version '[6.0,6.2)' apply(false)
     id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT' apply(false)
     id("org.spongepowered.mixin") version "0.7-SNAPSHOT" apply(false)

diff --git a/common/src/main/java/com/tristankechlo/livingthings/commands/LivingThingsCommand.java b/common/src/main/java/com/tristankechlo/livingthings/commands/LivingThingsCommand.java
@@ -18,13 +18,17 @@ public final class LivingThingsCommand {
 
     public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
         LiteralArgumentBuilder<CommandSourceStack> command = literal(LivingThings.MOD_ID)
-                .then(argument("type", ProjectLinksArgumentType.get()).executes(LivingThingsCommand::execute));
+                .then(literal("github").executes((context) -> display(context, ProjectLinks.GITHUB)))
+                .then(literal("issue").executes((context) -> display(context, ProjectLinks.GITHUB_ISSUES)))
+                .then(literal("wiki").executes((context) -> display(context, ProjectLinks.GITHUB_WIKI)))
+                .then(literal("discord").executes((context) -> display(context, ProjectLinks.DISCORD)))
+                .then(literal("curseforge").executes((context) -> display(context, ProjectLinks.CURSEFORGE)))
+                .then(literal("modrinth").executes((context) -> display(context, ProjectLinks.MODRINTH)));
         dispatcher.register(command);
         LivingThings.LOGGER.info("Command '/{}' registered", LivingThings.MOD_ID);
     }
 
-    private static int execute(CommandContext<CommandSourceStack> context) {
-        ProjectLinks type = context.getArgument("type", ProjectLinks.class);
+    private static int display(CommandContext<CommandSourceStack> context, ProjectLinks type) {
         CommandSourceStack source = context.getSource();
         Component link = clickableLink(type.getUrl());
         Component message = Component.literal(type.getMessage()).withStyle(ChatFormatting.WHITE).append(link);

diff --git a/common/src/main/java/com/tristankechlo/livingthings/commands/ProjectLinksArgumentType.java b/common/src/main/java/com/tristankechlo/livingthings/commands/ProjectLinksArgumentType.java
diff --git a/common/src/main/java/com/tristankechlo/livingthings/mixin/ArgumentTypesMixin.java b/common/src/main/java/com/tristankechlo/livingthings/mixin/ArgumentTypesMixin.java
diff --git a/common/src/main/resources/livingthings.mixins.json b/common/src/main/resources/livingthings.mixins.json
@@ -4,7 +4,6 @@
     "compatibilityLevel": "JAVA_17",
     "minVersion": "0.8",
     "mixins": [
-        "ArgumentTypesMixin",
         "PlayerMixin",
         "SpawnPlacementsInvoker",
         "entity.MobAccessor",

diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,7 @@ forge_loader_range=[47,)
 
 # Fabric
 fabric_version=0.92.2+1.20.1
-fabric_loader_version=0.15.11
+fabric_loader_version=0.16.5
 fabric_loader_min=0.14
 fabric_range_min_inclusive=1.20.1
 fabric_range_max_exclusive=1.20.2
@@ -22,7 +22,7 @@ fabric_range_max_exclusive=1.20.2
 mod_name=LivingThings
 mod_author=Buecher_wurm
 mod_id=livingthings
-mod_version=2.1.1
+mod_version=2.1.3
 
 # Other Mods
 modmenu_version=7.2.2

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists