fix loading old worlds (#647)

OpenCubicChunks · Mar 30, 2021 · dc16fef · dc16fef
1 parent c7c8389
commit dc16fef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/...va/io/github/opencubicchunks/cubicchunks/api/world/storage/StorageFormatProviderBase.java b/...va/io/github/opencubicchunks/cubicchunks/api/world/storage/StorageFormatProviderBase.java
@@ -45,12 +45,13 @@ public static void init() {
                 .create();
     }
 
-    public static ResourceLocation defaultStorageFormatProviderName(ResourceLocation fallback) {
+    public static ResourceLocation defaultStorageFormatProviderName(String fallback) {
         ResourceLocation[] providersThatCanBeDefault = REGISTRY.getValuesCollection().stream()
                 .filter(StorageFormatProviderBase::canBeDefault)
                 .map(StorageFormatProviderBase::getRegistryName)
                 .toArray(ResourceLocation[]::new);
-        return providersThatCanBeDefault.length == 1 ? providersThatCanBeDefault[0] : fallback;
+        return providersThatCanBeDefault.length == 1 ? providersThatCanBeDefault[0] :
+                fallback.isEmpty() ? DEFAULT : new ResourceLocation(fallback);
     }
 
     public ResourceLocation registryName;

diff --git a/...main/java/io/github/opencubicchunks/cubicchunks/core/world/WorldSavedCubicChunksData.java b/...main/java/io/github/opencubicchunks/cubicchunks/core/world/WorldSavedCubicChunksData.java
@@ -49,7 +49,7 @@ public WorldSavedCubicChunksData(String name, boolean isCC, int minHeight, int m
             this.maxHeight = maxHeight;
             isCubicChunks = true;
             compatibilityGeneratorType = new ResourceLocation(CubicChunksConfig.compatibilityGeneratorType);
-            storageFormat = StorageFormatProviderBase.defaultStorageFormatProviderName(new ResourceLocation(CubicChunksConfig.storageFormat));
+            storageFormat = StorageFormatProviderBase.defaultStorageFormatProviderName(CubicChunksConfig.storageFormat);
         }
     }
 
@@ -65,7 +65,7 @@ public void readFromNBT(NBTTagCompound nbt) {
         if(nbt.hasKey("storageFormat"))
             storageFormat = new ResourceLocation(nbt.getString("storageFormat"));
         else
-            storageFormat = StorageFormatProviderBase.defaultStorageFormatProviderName(new ResourceLocation(CubicChunksConfig.storageFormat));
+            storageFormat = StorageFormatProviderBase.defaultStorageFormatProviderName(CubicChunksConfig.storageFormat);
     }
 
     @Override