From e4ebeda1d0464f1961251486c3d56f73350752a6 Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 5 May 2021 01:44:05 -0300 Subject: [PATCH] mapping --- gradle.properties | 4 ++-- src/main/java/carpet/script/command/CommandArgument.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 09acba33..12c8d678 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,9 +5,9 @@ org.gradle.jvmargs=-Xmx1G # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html minecraft_version=21w17a - yarn_mappings=21w17a+build.2 + yarn_mappings=21w17a+build.19 loader_version=0.11.3 - fabric_version=0.33.3+1.17 + fabric_version=0.34.0+1.17 # Mod Properties mod_version = 1.4.34 diff --git a/src/main/java/carpet/script/command/CommandArgument.java b/src/main/java/carpet/script/command/CommandArgument.java index f2cb3996..a0278f0c 100644 --- a/src/main/java/carpet/script/command/CommandArgument.java +++ b/src/main/java/carpet/script/command/CommandArgument.java @@ -54,7 +54,7 @@ import net.minecraft.command.argument.ItemSlotArgumentType; import net.minecraft.command.argument.ItemStackArgumentType; import net.minecraft.command.argument.MessageArgumentType; import net.minecraft.command.argument.StatusEffectArgumentType; -import net.minecraft.command.argument.NbtCompoundTagArgumentType; +import net.minecraft.command.argument.NbtCompoundArgumentType; import net.minecraft.command.argument.NbtPathArgumentType; import net.minecraft.command.argument.NbtElementArgumentType; import net.minecraft.command.argument.NumberRangeArgumentType; @@ -691,20 +691,20 @@ public abstract class CommandArgument boolean mapRequired; private TagArgument() { - super("tag", NbtCompoundTagArgumentType.nbtCompound().getExamples(), false); + super("tag", NbtCompoundArgumentType.nbtCompound().getExamples(), false); mapRequired = true; } @Override protected ArgumentType getArgumentType() { - return mapRequired?NbtCompoundTagArgumentType.nbtCompound(): NbtElementArgumentType.nbtElement(); + return mapRequired?NbtCompoundArgumentType.nbtCompound(): NbtElementArgumentType.nbtElement(); } @Override protected Value getValueFromContext(CommandContext context, String param) throws CommandSyntaxException { if (mapRequired) - return new NBTSerializableValue(NbtCompoundTagArgumentType.getNbtCompound(context, param)); + return new NBTSerializableValue(NbtCompoundArgumentType.getNbtCompound(context, param)); else return new NBTSerializableValue(NbtElementArgumentType.getNbtElement(context, param)); }