diff --git a/gradle.properties b/gradle.properties index 59ec905..3abfb1d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.11.3 # Mod Properties - mod_version = 1.16.5-1.0.0 + mod_version = 1.16.5-1.0.1 maven_group = me.bionicbeanie.mods.savecoords archives_base_name = save-coordinates diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/impl/FileStore.java b/src/main/java/me/bionicbeanie/mods/savecoords/impl/FileStore.java index 399c933..40d1079 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/impl/FileStore.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/impl/FileStore.java @@ -13,6 +13,7 @@ import org.apache.commons.lang3.StringUtils; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.ibm.icu.impl.locale.LocaleDistance.Data; import me.bionicbeanie.mods.savecoords.IFileStore; import me.bionicbeanie.mods.savecoords.model.ConfigData; @@ -52,8 +53,7 @@ class FileStore implements IFileStore { public ConfigData readConfigData() throws IOException { ModData data = load(); - ConfigData ret = data.getConfigData(); - return ret != null ? ret : new ConfigData(); + return data.getConfigData(); } @@ -117,12 +117,32 @@ class FileStore implements IFileStore { private ModData load() throws IOException { List lines = Files.readAllLines(saveFilePath); try { - return gson.fromJson(String.join("", lines), ModData.class); + ModData data = gson.fromJson(String.join("", lines), ModData.class); + + if(data == null) { + data = new ModData(); + } + + if(data.getDefaultWorldName() == null) { + data.setDefaultWorldName(""); + } + + if(data.getPositions() == null) { + data.setPositions(new PlayerPosition[] {}); + } + + if(data.getConfigData() == null) { + data.setConfigData(new ConfigData()); + } + + return data; + } catch (Exception e) { // Fallback for old versions ModData data = new ModData(); data.setDefaultWorldName(""); data.setPositions(gson.fromJson(String.join("", lines), PlayerPosition[].class)); + data.setConfigData(new ConfigData()); dump(data); diff --git a/src/main/resources/data/savecoords/end.png b/src/main/resources/data/savecoords/end.png deleted file mode 100644 index ffa304d..0000000 Binary files a/src/main/resources/data/savecoords/end.png and /dev/null differ