Merge branch 'refs/heads/1.20.2' into 1.20.1

# Conflicts:
#	gradle.properties

CHANGELOG.md

@@ -5,6 +5,4 @@ Make sure to clear this after each release
 Put changelog here:
 
 -----------------
-- Added `Config.onSync()`
-  - Allows configs to have special post-sync behavior
-- Fixed licenses in Kotlin files
+- Configs now save after the game loads to ensure they're loaded properly.

build.gradle.kts

@@ -1,6 +1,7 @@
 import groovy.xml.XmlSlurper
 import org.codehaus.groovy.runtime.ResourceGroovyMethods
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.kohsuke.github.GHReleaseBuilder
 import org.kohsuke.github.GitHub
@@ -20,7 +21,7 @@ buildscript {
 }
 
 plugins {
-	id("fabric-loom") version("+")
+	id("fabric-loom") version("1.6.+")
 	id("org.ajoberstar.grgit") version("+")
 	id("org.quiltmc.gradle.licenser") version("+")
 	id("com.modrinth.minotaur") version("+")
@@ -30,7 +31,7 @@ plugins {
     idea
     `java-library`
     java
-    kotlin("jvm") version("1.9.23")
+    kotlin("jvm") version("2.0.0")
 }
 
 val minecraft_version: String by project
@@ -345,7 +346,11 @@ tasks {
     }
 
     withType(KotlinCompile::class) {
-        compilerOptions.jvmTarget = JvmTarget.JVM_17
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+            languageVersion.set(KotlinVersion.KOTLIN_1_9)
+            apiVersion.set(KotlinVersion.KOTLIN_1_9)
+        }
     }
 
     withType(Test::class) {

gradle.properties

@@ -15,23 +15,23 @@
 	minecraft_version=1.20.1
 	quilt_mappings=1.20.1+build.23
 	parchment_mappings=1.20.1:2023.09.03
-	loader_version=0.15.10
+	loader_version=0.15.11
     min_loader_version=0.15.10
 
 # Mod Properties
-	mod_version = 1.7.2
+	mod_version = 1.7.3
 	mod_loader = Fabric
 	maven_group = net.frozenblock
 	archives_base_name = FrozenLib
 
 # Dependencies
 	fabric_api_version=0.92.1+1.20.1
-    fabric_kotlin_version=1.10.19+kotlin.1.9.23
+    fabric_kotlin_version=1.11.0+kotlin.2.0.0
     toml4j_version=0.7.2
     jankson_version=1.2.3
-    xjs_data_version=0.5
+    xjs_data_version=0.6
     xjs_compat_version=0.8
-    fresult_version=3.0
+    fresult_version=3.1
 
 # External Mods
 	modmenu_version=7.2.2

src/main/java/net/frozenblock/lib/FrozenMain.java

@@ -21,6 +21,8 @@
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents;
 import net.fabricmc.loader.api.ModContainer;
+import net.frozenblock.lib.config.api.instance.Config;
+import net.frozenblock.lib.config.api.registry.ConfigRegistry;
 import net.frozenblock.lib.config.frozenlib_config.FrozenLibConfig;
 import net.frozenblock.lib.config.impl.ConfigCommand;
 import net.frozenblock.lib.core.impl.DataPackReloadMarker;
@@ -141,6 +143,12 @@ public void onInitialize(String modId, ModContainer container) {
 			if (!allRegistries) return;
 			ModIntegrations.initialize();
 		});
+
+		RegistryFreezeEvents.END_REGISTRY_FREEZE.register((registry, allRegistries) -> {
+			for (Config<?> config : ConfigRegistry.getAllConfigs()) {
+				config.save();
+			}
+		});
 	}
 
 	@Contract("_ -> new")

src/main/java/net/frozenblock/lib/config/api/registry/ConfigRegistry.java

@@ -35,7 +35,6 @@
 import org.jetbrains.annotations.Unmodifiable;
 
 public class ConfigRegistry {
-
 	private static final List<Config<?>> CONFIG_REGISTRY = new ObjectArrayList<>();
 	private static final Map<String, List<Config<?>>> MOD_CONFIG_REGISTRY = new Object2ObjectOpenHashMap<>();