diff --git a/gradle.properties b/gradle.properties index 3b3ded9..a3090cb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ mapping_version=2023.09.03-1.20.1 mod_id=sccore mod_name=SnowyCrescentCore mod_license=GNU AGPL 3.0 -mod_version=1.20.1-0.1.1.3 +mod_version=1.20.1-0.1.1.4 mod_group_id=com.linearpast mod_authors=LostInLinearPast mod_description=A lib about capability and player animator. diff --git a/src/main/java/com/linearpast/sccore/animation/command/argument/AnimationArgument.java b/src/main/java/com/linearpast/sccore/animation/command/argument/AnimationArgument.java index 773395c..31f7b5f 100644 --- a/src/main/java/com/linearpast/sccore/animation/command/argument/AnimationArgument.java +++ b/src/main/java/com/linearpast/sccore/animation/command/argument/AnimationArgument.java @@ -6,13 +6,10 @@ import com.linearpast.sccore.animation.register.RawAnimationRegistry; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.arguments.ArgumentType; import com.mojang.brigadier.context.CommandContext; -import com.mojang.brigadier.exceptions.CommandSyntaxException; -import com.mojang.brigadier.exceptions.DynamicCommandExceptionType; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.SharedSuggestionProvider; -import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -28,9 +25,6 @@ import java.util.function.Supplier; public class AnimationArgument implements ArgumentType { private static final Supplier> EXAMPLES = AnimationArgument::getAnimationNames; - private static final DynamicCommandExceptionType UNKNOWN_TYPE = new DynamicCommandExceptionType( - animation -> Component.literal("Unknow animation : " + animation.toString()) - ); private static Supplier> animationNames; public AnimationArgument() { @@ -96,17 +90,12 @@ public class AnimationArgument implements ArgumentType { return EXAMPLES.get(); } - public String parse(StringReader reader) throws CommandSyntaxException { + public String parse(StringReader reader) { int start = reader.getCursor(); while (reader.canRead() && canRead(reader.peek())) { reader.skip(); } - String s = reader.getString().substring(start, reader.getCursor()); - if (!animationNames.get().contains(s)) { - throw UNKNOWN_TYPE.create(s); - } else { - return s; - } + return reader.getString().substring(start, reader.getCursor()); } private static boolean canRead(char peek) { diff --git a/src/main/resources/sccore.mixins.json b/src/main/resources/sccore.mixins.json index b25d9ec..79ee70e 100644 --- a/src/main/resources/sccore.mixins.json +++ b/src/main/resources/sccore.mixins.json @@ -16,8 +16,5 @@ ], "injectors": { "defaultRequire": 1 - }, - "overwrites": { - "requireAnnotations": true } }