diff --git a/build.gradle.kts b/build.gradle.kts index 1d843eb..4df05cc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ subprojects { plugins.apply("java-library") group = "ru.bk.oharass.freedomchat" - version = "1.7.6" + version = "1.7.7" description = "Liberate your server from the chat-reporting bourgeoisie! Disable chat signing server-side." tasks { diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts index 67e46c9..5381909 100644 --- a/fabric/build.gradle.kts +++ b/fabric/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("dev.architectury.loom") version "1.11-SNAPSHOT" - id("com.gradleup.shadow") version "8.3.9" + id("fabric-loom") version "1.14-SNAPSHOT" + id("com.gradleup.shadow") version "9.3.0" } val shade: Configuration by configurations.creating @@ -13,22 +13,26 @@ repositories { } dependencies { - minecraft(group = "com.mojang", name = "minecraft", version = "1.21.9") - mappings(group = "net.fabricmc", name = "yarn", version = "1.21.9+build.1", classifier = "v2") - modImplementation(group = "net.fabricmc", name = "fabric-loader", version = "0.17.2") - modImplementation(group = "net.fabricmc.fabric-api", name = "fabric-api", version = "0.133.14+1.21.9") + minecraft(group = "com.mojang", name = "minecraft", version = "1.21.11") + mappings(group = "net.fabricmc", name = "yarn", version = "1.21.11+build.1", classifier = "v2") + modImplementation(group = "net.fabricmc", name = "fabric-loader", version = "0.18.3") + modImplementation(group = "net.fabricmc.fabric-api", name = "fabric-api", version = "0.140.0+1.21.11") shade(implementation(group = "org.spongepowered", name = "configurate-yaml", version = "4.2.0")) } tasks { processResources { filesMatching("fabric.mod.json") { + // Fixed: expand expects a map expand( - "version" to project.version, - "description" to project.description, + mapOf( + "version" to project.version, + "description" to project.description + ) ) } } + shadowJar { // Relocate configurate & its dependencies relocate("org.spongepowered.configurate", "ru.bk.oharass.freedomchat.lib.org.spongepowered.configurate") @@ -37,6 +41,7 @@ tasks { configurations = listOf(shade) archiveClassifier.set("dev") } + remapJar { inputFile.set(shadowJar.get().archiveFile) } diff --git a/fabric/src/main/java/ru/bk/oharass/freedomchat/FreedomChat.java b/fabric/src/main/java/ru/bk/oharass/freedomchat/FreedomChat.java index 2a9af2a..9c583ca 100644 --- a/fabric/src/main/java/ru/bk/oharass/freedomchat/FreedomChat.java +++ b/fabric/src/main/java/ru/bk/oharass/freedomchat/FreedomChat.java @@ -23,8 +23,8 @@ public class FreedomChat implements ModInitializer { public void onInitialize() { ServerLifecycleEvents.SERVER_STARTED.register(server -> { this.server = server; - if (!Boolean.getBoolean("im.evan.freedomchat.bypassprotocolcheck") && SharedConstants.getProtocolVersion() != 773) { - logger.warn("This version of FreedomChat only supports protocol version 773 (1.21.9). Please use the appropriate version of FreedomChat for your server"); + if (!Boolean.getBoolean("im.evan.freedomchat.bypassprotocolcheck") && SharedConstants.getProtocolVersion() != 774) { + logger.warn("This version of FreedomChat only supports protocol version 774 (1.21.11). Please use the appropriate version of FreedomChat for your server"); logger.warn("If you know what you are doing, set the im.evan.freedomchat.bypassprotocolcheck system property to true to bypass this check"); return; } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55..f8e1ee3 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3735f26..8a84887 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip +distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 23d15a9..adff685 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" diff --git a/gradlew.bat b/gradlew.bat index 5eed7ee..e509b2d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts index 8684737..d90d965 100644 --- a/paper/build.gradle.kts +++ b/paper/build.gradle.kts @@ -6,12 +6,12 @@ plugins { paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION dependencies { - paperweight.paperDevBundle("1.21.9-R0.1-SNAPSHOT") + paperweight.paperDevBundle("1.21.11-R0.1-SNAPSHOT") } tasks { runServer { - minecraftVersion("1.21.9") + minecraftVersion("1.21.11") } processResources { diff --git a/paper/src/main/java/ru/bk/oharass/freedomchat/FreedomChat.java b/paper/src/main/java/ru/bk/oharass/freedomchat/FreedomChat.java index dae4ac4..361d305 100644 --- a/paper/src/main/java/ru/bk/oharass/freedomchat/FreedomChat.java +++ b/paper/src/main/java/ru/bk/oharass/freedomchat/FreedomChat.java @@ -15,8 +15,8 @@ public class FreedomChat extends JavaPlugin implements Listener { @Override public void onEnable() { - if (!Boolean.getBoolean("im.evan.freedomchat.bypassprotocolcheck") && this.getServer().getUnsafe().getProtocolVersion() != 773) { - getLogger().warning("This version of FreedomChat only supports protocol version 773 (1.21.9). Please use the appropriate version of FreedomChat for your server"); + if (!Boolean.getBoolean("im.evan.freedomchat.bypassprotocolcheck") && this.getServer().getUnsafe().getProtocolVersion() != 774) { + getLogger().warning("This version of FreedomChat only supports protocol version 774 (1.21.11). Please use the appropriate version of FreedomChat for your server"); getLogger().warning("If you know what you are doing, set the im.evan.freedomchat.bypassprotocolcheck system property to true to bypass this check"); this.getServer().getPluginManager().disablePlugin(this); return; diff --git a/settings.gradle.kts b/settings.gradle.kts index e083d33..561b1f5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,20 +1,15 @@ -import org.gradle.configurationcache.extensions.capitalized - pluginManagement { repositories { gradlePluginPortal() maven("https://repo.papermc.io/repository/maven-public/") maven("https://maven.fabricmc.net/") - maven("https://maven.architectury.dev/") } } rootProject.name = "FreedomChat" -sequenceOf( - "paper", - "fabric" -).forEach { - include("${rootProject.name}-${it.capitalized()}") - project(":${rootProject.name}-${it.capitalized()}").projectDir = file(it) +sequenceOf("paper", "fabric").forEach { + val capitalized = it.replaceFirstChar { c -> c.titlecase() } + include("${rootProject.name}-$capitalized") + project(":${rootProject.name}-$capitalized").projectDir = file(it) }