From 1b49bfe21fff38990127b489d33d454494d9968d Mon Sep 17 00:00:00 2001 From: gnembon Date: Fri, 21 May 2021 04:45:23 -0300 Subject: [PATCH] updates --- .../java/carpet/script/annotation/FunctionsTestClass.java | 3 ++- src/main/java/carpet/script/annotation/OutputConverter.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/carpet/script/annotation/FunctionsTestClass.java b/src/main/java/carpet/script/annotation/FunctionsTestClass.java index 8f81ff6c..31461015 100644 --- a/src/main/java/carpet/script/annotation/FunctionsTestClass.java +++ b/src/main/java/carpet/script/annotation/FunctionsTestClass.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Optional; - +/* There is no worse example to use for 1.17 compatibility import static net.minecraft.network.packet.s2c.play.TitleS2CPacket.Action; public class FunctionsTestClass { @@ -58,3 +58,4 @@ public class FunctionsTestClass { return targets.size(); } } +*/ \ No newline at end of file diff --git a/src/main/java/carpet/script/annotation/OutputConverter.java b/src/main/java/carpet/script/annotation/OutputConverter.java index 22bd7954..da4f64ee 100644 --- a/src/main/java/carpet/script/annotation/OutputConverter.java +++ b/src/main/java/carpet/script/annotation/OutputConverter.java @@ -5,6 +5,7 @@ import java.util.Map; import java.util.Objects; import java.util.function.Function; +import net.minecraft.nbt.NbtElement; import org.apache.commons.lang3.ClassUtils; import carpet.script.LazyValue; @@ -17,7 +18,6 @@ import carpet.script.value.Value; import carpet.script.value.ValueConversions; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.Tag; import net.minecraft.text.Text; import net.minecraft.util.Identifier; import net.minecraft.util.dynamic.GlobalPos; @@ -48,7 +48,7 @@ public final class OutputConverter registerToValue(String.class, StringValue::new); registerToValue(Entity.class, EntityValue::new); registerToValue(Text.class, FormattedTextValue::new); - registerToValue(Tag.class, NBTSerializableValue::new); + registerToValue(NbtElement.class, NBTSerializableValue::new); registerToValue(BlockPos.class, ValueConversions::of); registerToValue(Vec3d.class, ValueConversions::of); registerToValue(ItemStack.class, ValueConversions::of);