diff --git a/build.gradle b/build.gradle index 53540e3..89a0c8e 100644 --- a/build.gradle +++ b/build.gradle @@ -72,7 +72,7 @@ tasks.withType(JavaCompile).configureEach { it.options.release = 21 } -tasks.withType(Jar) { +tasks.withType(Jar).configureEach { exclude('META-INF/maven/**') } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cd07752..bafc8b8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,12 @@ # The latest versions are available at https://quiltmc.org/en/usage/latest-versions [versions] -minecraft = "1.21.4" -yarn_mappings="1.21.4+build.8" +minecraft = "1.21.11" +yarn_mappings="1.21.11+build.4" -fabric_loom = "1.9-SNAPSHOT" +fabric_loom = "1.15-SNAPSHOT" # check these on https://modmuss50.me/fabric.html -fabric_loader = "0.16.10" -fabric_version = "0.115.0+1.21.4" +fabric_loader = "0.18.4" +fabric_version = "0.141.3+1.21.11" compression = "1.+" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2847c8..bad7c24 100644 --- 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.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/ru/bitheaven/donpayinteg/DonPayInteg.java b/src/main/java/ru/bitheaven/donpayinteg/DonPayInteg.java index ef3997a..d1386a3 100644 --- a/src/main/java/ru/bitheaven/donpayinteg/DonPayInteg.java +++ b/src/main/java/ru/bitheaven/donpayinteg/DonPayInteg.java @@ -40,7 +40,7 @@ public class DonPayInteg implements ModInitializer { if(j.getAndIncrement() % (20 * ConfigHandler.load().getCmdCooldown()) == 0) { if (!commands.isEmpty()) { - world.getCommandManager().executeWithPrefix(world.getCommandSource(), commands.getFirst()); + world.getCommandManager().parseAndExecute(world.getCommandSource(), commands.getFirst()); commands.removeFirst(); } } diff --git a/src/main/java/ru/bitheaven/donpayinteg/command/DPI.java b/src/main/java/ru/bitheaven/donpayinteg/command/DPI.java index 963379b..46ee57d 100644 --- a/src/main/java/ru/bitheaven/donpayinteg/command/DPI.java +++ b/src/main/java/ru/bitheaven/donpayinteg/command/DPI.java @@ -1,6 +1,5 @@ package ru.bitheaven.donpayinteg.command; -import com.mojang.brigadier.arguments.IntegerArgumentType; import com.mojang.brigadier.arguments.StringArgumentType; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.minecraft.server.command.CommandManager; @@ -14,22 +13,19 @@ public class DPI { } public static void register() { CommandRegistrationCallback.EVENT.register((((dispatcher, registryAccess, environment) -> - { dispatcher.register(CommandManager.literal("dpi") - .then(CommandManager.literal("set_token") - .then(CommandManager.argument("token", StringArgumentType.string()) - .executes(context -> { - String token = StringArgumentType.getString(context, "token"); + .then(CommandManager.literal("set_token") + .then(CommandManager.argument("token", StringArgumentType.string()) + .executes(context -> { + String token = StringArgumentType.getString(context, "token"); - Config config = ConfigHandler.load(); - config.setDonpayToken(token); - ConfigHandler.save(config); + Config config = ConfigHandler.load(); + config.setDonpayToken(token); + ConfigHandler.save(config); - context.getSource().sendFeedback(() -> Text.literal("DonatePay token set!"), false); + context.getSource().sendFeedback(() -> Text.literal("DonatePay token set!"), false); - return 1; - }))) - ); - }))); + return 1; + }))))))); } } diff --git a/src/main/java/ru/bitheaven/donpayinteg/config/ConfigHandler.java b/src/main/java/ru/bitheaven/donpayinteg/config/ConfigHandler.java index 072ea0c..108f29f 100644 --- a/src/main/java/ru/bitheaven/donpayinteg/config/ConfigHandler.java +++ b/src/main/java/ru/bitheaven/donpayinteg/config/ConfigHandler.java @@ -6,7 +6,6 @@ import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.Constructor; -import org.yaml.snakeyaml.inspector.TagInspector; import ru.bitheaven.donpayinteg.DonPayInteg; import java.io.*;