Merge branch 'master' into 1.15

src/main/java/carpet/script/value/NBTSerializableValue.java

@@ -21,6 +21,7 @@ import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.StringNbtReader;
 import net.minecraft.nbt.StringTag;
 import net.minecraft.nbt.Tag;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 
 import java.util.Collection;
@@ -71,6 +72,13 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa
         return Value.NULL;
     }
 
+    public static String nameFromRegistryId(Identifier id)
+    {
+        if (id.getNamespace().equals("minecraft"))
+            return id.getPath();
+        return id.toString();
+    }
+
     public static NBTSerializableValue parseString(String nbtString)
     {
         Tag tag;