Merge branch 'master' into dev

README.md

@@ -52,7 +52,7 @@ With the new config system, block tags and custom blockstates can be used to mas
 ![players sitting on a vast range of blocks](https://github.com/Oth3r/oth3r.github.io/blob/main/mod_data/Sit!/media/desc/custom_blocks.gif?raw=true)
 
 ### ⌨️ Keybinds
-Don't want to sit with the **just** the hand? Use a keybind or type a command to sit instead!
+Don't want to sit with **just** the hand? Use a keybind or type a command to sit instead!
 
 ![setting keybinds for the sit mod, and sitting by using them](https://github.com/Oth3r/oth3r.github.io/blob/main/mod_data/Sit!/media/desc/keybinds.gif?raw=true)
 

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version "1.10-SNAPSHOT"
+	id 'fabric-loom' version "1.11-SNAPSHOT"
 	id 'maven-publish'
 	id "me.modmuss50.mod-publish-plugin" version "0.8.4"
 	id 'co.uzzu.dotenv.gradle' version '4.0.0'

changelog.md

@@ -1,3 +1,9 @@
+# v1.2.4.7
+* fixed legacy file updater causing a stack overflow crash
+
+# v1.2.4.6
+* fixed max otterlib version (1.21.8)
+
 # v1.2.4.5
 * bumped OtterLib version to `0.2.1.0`
   * fixed default languages files not being able to be loaded

gradle.properties

@@ -4,23 +4,23 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-min_minecraft_version=1.21.7
-max_minecraft_version=1.21.7
-minecraft_versions=1.21.7
+min_minecraft_version=1.21.8
+max_minecraft_version=1.21.8
+minecraft_versions=1.21.8
 
-minecraft_version=1.21.7
-yarn_mappings=1.21.7+build.1
+minecraft_version=1.21.8
+yarn_mappings=1.21.8+build.1
 loader_version=0.16.14
 
 # Mod Properties
-mod_version=1.2.4.5+1.21.7
+mod_version=1.2.4.7+1.21.8
 maven_group=one.oth3r
 file_name=sit!
 
 # Dependencies
-fabric_version=0.128.1+1.21.7
-otterlib_version=0.2.1.0+1.21.7-fabric
-otterlib_max_version=0.3.0.0+1.21.7-fabric
+fabric_version=0.129.0+1.21.8
+otterlib_version=0.2.2.0+1.21.8-fabric
+otterlib_max_version=0.3.0.0+1.21.8-fabric
 
 modmenu_version=15.0.0-beta.1
 devauth_version=1.2.1

src/main/java/one/oth3r/sit/file/ServerConfig.java

@@ -345,6 +345,11 @@ public class ServerConfig implements CustomFile<ServerConfig> {
             } catch (Exception e) {
                 Data.LOGGER.error("Failed to delete the old Sit! config.");
             }
+
+            // save the updated configs
+            FileData.saveFiles();
+
+            // continue loading as normal...
         }
 
         /**
@@ -494,8 +499,6 @@ public class ServerConfig implements CustomFile<ServerConfig> {
 
                 FileData.setServerConfig(serverConfig);
                 FileData.setSittingConfig(sittingConfig);
-                serverConfig.save();
-                sittingConfig.save();
             } catch (Exception e) {
                 Data.LOGGER.error("Error loading legacy config: %s", e.getMessage());
             }