Merge branch 'master' into 1.17

# Conflicts:
#	gradle.properties

src/main/java/carpet/CarpetSettings.java

@@ -37,7 +37,7 @@ import static carpet.settings.RuleCategory.CLIENT;
 @SuppressWarnings("CanBeFinal")
 public class CarpetSettings
 {
-    public static final String carpetVersion = "1.4.22+v210113";
+    public static final String carpetVersion = "1.4.23+v210115";
     public static final Logger LOG = LogManager.getLogger("carpet");
     public static boolean skipGenerationChecks = false;
     public static boolean impendingFillSkipUpdates = false;

src/main/java/carpet/script/bundled/FileModule.java

@@ -76,9 +76,14 @@ public class FileModule extends Module
         }
         catch (IOException e)
         {
-            try
+            // Copy of NbtIo.read(File) because that's now client-side only
+            if (!file.exists())
             {
-                return NbtIo.read(file);
+                return null;
+            }
+            try (DataInputStream in = new DataInputStream(new FileInputStream(file)))
+            {
+                return NbtIo.read(in);
             }
             catch (IOException ioException)
             {

src/main/java/carpet/script/language/DataStructures.java

@@ -57,7 +57,7 @@ public class DataStructures {
             if (lv.size() == 1)
             {
                 hwat = lv.get(0);
-                delimiter = StringValue.EMPTY;
+                delimiter = null;
             }
             else if (lv.size() == 2)
             {

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

@@ -350,6 +350,11 @@ public class ListValue extends AbstractListValue implements ContainerValueInterf
     @Override
     public Value split(Value delimiter) {
         ListValue result = new ListValue();
+        if (delimiter == null)
+        {
+            this.forEach(item -> result.items.add(of(item)));
+            return result;
+        }
         int startIndex = 0;
         int index = 0;
         for (Value val : this.items)

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

@@ -193,7 +193,11 @@ public abstract class Value implements Comparable<Value>, Cloneable
     
     public Value split(Value delimiter)
     {
-    	try
+        if (delimiter == null)
+        {
+            delimiter = StringValue.EMPTY;
+        }
+        try
         {
             return ListValue.wrap(Arrays.stream(getString().split(delimiter.getString())).map(StringValue::new).collect(Collectors.toList()));
         }