Merge branch 'master' into 1.15

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

@@ -77,6 +77,11 @@ public class MapValue extends AbstractListValue implements ContainerValueInterfa
         map = other;
     }
 
+    public static MapValue wrap(Map<Value,Value> other)
+    {
+        return new MapValue(other);
+    }
+
     @Override
     public Value add(Value o)
     {

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

@@ -82,6 +82,8 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa
 
     public static String nameFromRegistryId(Identifier id)
     {
+        if (id == null) // should be Value.NULL
+            return "";
         if (id.getNamespace().equals("minecraft"))
             return id.getPath();
         return id.toString();