1.20.6, untestet

medisant · Jul 12, 2024 · 7b2237f · 7b2237f
1 parent f38f9f8
commit 7b2237f
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 19 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,19 @@
 plugins {
-	id 'fabric-loom' version '1.0-SNAPSHOT'
+	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
-	id "io.freefair.lombok" version "6.0.0-m2"
+	id "io.freefair.lombok" version "8.6"
+}
+
+java {
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(21)
+	}
 }
 
 apply from: 'https://raw.githubusercontent.com/DarkKronicle/GradleScripts/main/gradle/publish.gradle'
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.VERSION_21
+targetCompatibility = JavaVersion.VERSION_21
 
 archivesBaseName = project.archives_base_name
 version = "${project.minecraft_version}-${project.mod_version}"
@@ -31,7 +37,7 @@ dependencies {
 	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 "fi.dy.masa.malilib:malilib-fabric-1.20.6:${project.malilib_version}"
 	modCompileOnly "com.terraformersmc:modmenu:${project.modmenu_version}"
 
 	implementation "com.github.DarkKronicle.Konstruct:addons:${project.konstruct_version}"
@@ -67,14 +73,21 @@ processResources {
 
 tasks.withType(JavaCompile).configureEach {
 	it.options.encoding = "UTF-8"
-	it.options.release = 17
+	it.options.release = 21
 }
 
-task sourcesJar(type: Jar, dependsOn: classes) {
-	classifier = "sources"
+//task sourcesJar(type: Jar, dependsOn: classes) {
+//	classifier = "sources"
+//	from sourceSets.main.allSource
+//}
+
+tasks.register('sourcesJar', Jar) {
+	dependsOn classes
+	archiveClassifier.set('sources')
 	from sourceSets.main.allSource
 }
 
+
 jar {
 	from "LICENSE.txt"
 }

diff --git a/gradle.properties b/gradle.properties
@@ -1,19 +1,20 @@
 org.gradle.jvmargs=-Xmx1G
 
-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
+minecraft_version=1.20.6
+yarn_mappings=1.20.6+build.3
+loader_version=0.15.11
+fabric_api_version=0.100.0+1.20.6
 
 mod_version=1.5.10
 maven_group=io.github.darkkronicle
 archives_base_name=AdvancedChatCore
 
-malilib_version=0.17.0
+malilib_version=0.19.0
 konstruct_version=2.0.3-build1
 mxparser_version=4.4.2
 owo_version=2.0.0
-modmenu_version=7.1.0
+modmenu_version=10.0.0
+# modmenu_version=7.1.0
 
 # Uploading data
 curseforge_slug=advancedchatcore

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Sun Jun 16 00:47:33 CEST 2024
 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.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/io/github/darkkronicle/advancedchatcore/chat/ChatHistoryProcessor.java b/src/main/java/io/github/darkkronicle/advancedchatcore/chat/ChatHistoryProcessor.java
@@ -31,7 +31,7 @@ public class ChatHistoryProcessor implements IMessageProcessor {
     private static boolean sendToHud(Text text, @Nullable MessageSignatureData signature, MessageIndicator indicator) {
         if (AdvancedChatCore.FORWARD_TO_HUD) {
             ((MixinChatHudInvoker) MinecraftClient.getInstance().inGameHud.getChatHud()).invokeAddMessage(
-                    text, signature, MinecraftClient.getInstance().inGameHud.getTicks(), indicator, false);
+                    text, signature, indicator);
             return true;
         }
         return false;

diff --git a/src/main/java/io/github/darkkronicle/advancedchatcore/mixin/MixinChatHudInvoker.java b/src/main/java/io/github/darkkronicle/advancedchatcore/mixin/MixinChatHudInvoker.java
@@ -18,5 +18,5 @@
 @Mixin(ChatHud.class)
 public interface MixinChatHudInvoker {
     @Invoker
-    void invokeAddMessage(Text message, @Nullable MessageSignatureData signature, int ticks, @Nullable MessageIndicator indicator, boolean refresh);
+    void invokeAddMessage(Text message, @Nullable MessageSignatureData signature, @Nullable MessageIndicator indicator);
 }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -28,9 +28,9 @@
     "advancedchatcore.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.14.18",
+    "fabricloader": ">=0.15.11",
     "fabric": "*",
-    "minecraft": ">=1.20",
+    "minecraft": ">=1.20.6",
     "malilib": ">=0.16.0"
   },
   "custom": {