v1.2.1-rc3

KingContaria · Aug 9, 2022 · 3fd05ff · 3fd05ff
1 parent ebb4d9d
commit 3fd05ff
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -8,6 +8,6 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.13.3
 
 # Mod Properties
-	mod_version = 1.2.1-rc2+1.16.1
+	mod_version = 1.2.1-rc3+1.16.1
 	maven_group = com.kingcontaria.standardsettings
 	archives_base_name = standardsettings
diff --git a/src/main/java/com/kingcontaria/standardsettings/StandardSettings.java b/src/main/java/com/kingcontaria/standardsettings/StandardSettings.java
@@ -26,7 +26,7 @@
 @Environment(value= EnvType.CLIENT)
 public class StandardSettings {
 
-    public static final int[] version = new int[]{1,2,1,-998};
+    public static final int[] version = new int[]{1,2,1,-997};
     public static final Logger LOGGER = LogManager.getLogger();
     public static final MinecraftClient client = MinecraftClient.getInstance();
     public static final GameOptions options = client.options;
@@ -70,7 +70,7 @@ public static void load() {
                 LOGGER.info("Reloading & caching StandardSettings...");
                 standardoptionsTxtLastModified = standardoptionsFile.lastModified();
                 List<String> lines = Files.readLines(standardoptionsFile, StandardCharsets.UTF_8);
-                if (lines.size() == 0) {
+                if (lines == null || lines.size() == 0) {
                     LOGGER.error("standardoptions.txt is empty");
                     return;
                 }

diff --git a/src/main/java/com/kingcontaria/standardsettings/mixins/MinecraftClientMixin.java b/src/main/java/com/kingcontaria/standardsettings/mixins/MinecraftClientMixin.java
@@ -67,7 +67,7 @@ private void initializeStandardSettings(RunArgs args, CallbackInfo ci) {
             if (StandardSettings.compareVersions(fileVersion, globalFileVersion)) {
                 fileVersion = globalFileVersion;
                 try {
-                    view.write("standardsettings", Charset.defaultCharset().encode(System.lineSeparator() + String.join(".", Arrays.stream(globalFileVersion).mapToObj(String::valueOf).toArray(String[]::new))));
+                    view.write("standardsettings", Charset.defaultCharset().encode(String.join(".", Arrays.stream(globalFileVersion).mapToObj(String::valueOf).toArray(String[]::new))));
                 } catch (IOException e) {
                     StandardSettings.LOGGER.error("Failed to adjust standardoptions.txt version to global file version", e);
                 }
@@ -77,7 +77,7 @@ private void initializeStandardSettings(RunArgs args, CallbackInfo ci) {
         try {
             String[] linesToAdd = StandardSettings.checkVersion(fileVersion);
             if (linesToAdd != null) {
-                com.google.common.io.Files.append(String.join(System.lineSeparator(), linesToAdd), globalFile != null ? globalFile : StandardSettings.standardoptionsFile, Charset.defaultCharset());
+                com.google.common.io.Files.append(System.lineSeparator() + String.join(System.lineSeparator(), linesToAdd), globalFile != null ? globalFile : StandardSettings.standardoptionsFile, Charset.defaultCharset());
                 StandardSettings.LOGGER.info("Finished updating standardoptions.txt");
             }
             if (StandardSettings.compareVersions(fileVersion, StandardSettings.version)) {