1.21.8

.gitignore

@@ -1,11 +1,14 @@
 .idea/
+.vscode/
 *.iml
 *.ipr
 *.iws
 lib/
 run/
 out/
+bin/
 build/
 .gradle/
 classes/
-lombok.config
+lombok.config
+extra.properties

build.gradle

@@ -1,13 +1,19 @@
 plugins {
-	id 'fabric-loom' version '1.0-SNAPSHOT'
-	id 'maven-publish'
-	id "io.freefair.lombok" version "6.0.0-m2"
+	id "fabric-loom" version "1.11-SNAPSHOT"
+	id "maven-publish"
+	id "io.freefair.lombok" version "8.10"
 }
 
-apply from: 'https://raw.githubusercontent.com/DarkKronicle/GradleScripts/main/gradle/publish.gradle'
+java {
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(21)
+	}
+}
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+// apply from: 'https://raw.githubusercontent.com/DarkKronicle/GradleScripts/main/gradle/publish.gradle'
+
+sourceCompatibility = JavaVersion.VERSION_21
+targetCompatibility = JavaVersion.VERSION_21
 
 archivesBaseName = project.archives_base_name
 version = "${project.minecraft_version}-${project.mod_version}"
@@ -29,10 +35,14 @@ dependencies {
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
-	modImplementation "fi.dy.masa.malilib:malilib-fabric-1.20.2:${project.malilib_version}"
-	//modImplementation "com.github.DarkKronicle:AdvancedChatCore:${project.advancedchat_version}"
-	modImplementation "io.github.darkkronicle:AdvancedChatCore:1.20.4-1.5.10" // only used to build the mod locally
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+	modImplementation "com.github.sakura-ryoko:malilib:${project.malilib_version}"
+	// modImplementation "com.github.DarkKronicle:AdvancedChatCore:${project.advancedchat_version}"
+	modImplementation "io.github.darkkronicle:AdvancedChatCore:${project.minecraft_version}-${project.mod_version}"
+	// modImplementation files("libs/AdvancedChatCore-${project.advancedchat_version}.jar")
+
+	modImplementation "com.github.DarkKronicle.Konstruct:addons:${project.konstruct_version}"
+	modImplementation "com.github.DarkKronicle.Konstruct:core:${project.konstruct_version}"
 
 }
 
@@ -46,14 +56,15 @@ processResources {
 
 tasks.withType(JavaCompile).configureEach {
 	it.options.encoding = "UTF-8"
-	it.options.release = 17
+	it.options.release = 21
 }
 
 // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
 // if it is present.
 // If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-	classifier = "sources"
+tasks.register('sourcesJar', Jar) {
+	dependsOn classes
+	archiveClassifier.set('sources')
 	from sourceSets.main.allSource
 }
 
@@ -78,6 +89,6 @@ publishing {
 	// select the repositories you want to publish to
 	repositories {
 		// uncomment to publish to the local maven
-		// mavenLocal()
+		mavenLocal()
 	}
 }

gradle.properties

@@ -1,15 +1,19 @@
-minecraft_version=1.20.4
-yarn_mappings=1.20.4+build.3
-loader_version=0.15.3
-fabric_api_version=0.92.0+1.20.4
+org.gradle.jvmargs=-Xmx1G
+org.gradle.parallel=true
+
+minecraft_version=1.21.8
+yarn_mappings=1.21.8+build.1
+loader_version=0.17.2
+loom_version=1.11-SNAPSHOT
 
-mod_version=1.3.8
+fabric_version=0.132.0+1.21.8
+
+mod_version=1.8.0
 maven_group=io.github.darkkronicle
 archives_base_name=AdvancedChatHUD
 
-malilib_version = 0.17.0
-org.gradle.jvmargs=-Xmx1G
-advancedchat_version=v1.5.10
+malilib_version=1.21.8-0.25.5-sakura.4
+konstruct_version=2.0.3-build1
 
 # Uploading data
 curseforge_slug=advancedchathud
@@ -26,4 +30,4 @@ project_logo=https://raw.githubusercontent.com/Prospector/images/master/modmenu-
 project_color=0x134bff
 changelog_hide_unimportant_commits=true
 changelog_max_commit_search=200
-discord_webhook_changelog_line_limit=10
+discord_webhook_changelog_line_limit=10

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

src/main/java/io/github/darkkronicle/advancedchathud/config/HudConfigStorage.java

@@ -306,7 +306,10 @@ public static void loadFromFile() {
                 }
 
                 ConfigStorage.readOptions(
-                        root, General.NAME, (List<SaveableConfig<?>>) General.OPTIONS);
+                        root,
+                        General.NAME,
+                        (List<SaveableConfig<?>>) (List<?>) General.OPTIONS
+                    );
 
                 int version = JsonUtils.getIntegerOrDefault(root, "configVersion", 0);
             }
@@ -321,7 +324,10 @@ public static void saveFromFile() {
             JsonObject root = new JsonObject();
 
             ConfigStorage.writeOptions(
-                    root, General.NAME, (List<SaveableConfig<?>>) General.OPTIONS);
+                root,
+                General.NAME,
+                (List<SaveableConfig<?>>) (List<?>) General.OPTIONS
+            );
 
             root.add("maintab", tabJson.save(MAIN_TAB));
 
@@ -419,9 +425,9 @@ private static String translate(String key) {
 
         Visibility(String configString) {
             this.texture =
-                    new Identifier(
-                            AdvancedChatHud.MOD_ID,
-                            "textures/gui/chatwindow/" + configString + ".png");
+                Identifier.of(
+                    AdvancedChatHud.MOD_ID,
+                    "textures/gui/chatwindow/" + configString + ".png");
             this.configString = configString;
         }