diff --git a/build.gradle b/build.gradle index 3287309..c6b722b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,33 +1,33 @@ plugins { - id 'fabric-loom' version '1.9-SNAPSHOT' - id 'maven-publish' + id 'fabric-loom' version '1.9-SNAPSHOT' + id 'maven-publish' } version = project.mod_version group = project.maven_group base { - archivesName = project.archives_base_name + archivesName = project.archives_base_name } dependencies { - // To change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + // To change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - // Fabric API. This is technically optional, but you probably want it anyway. - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + // Fabric API. This is technically optional, but you probably want it anyway. + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" - // Cloth Config - modApi("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") { + // Cloth Config + modApi("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") { exclude(group: "net.fabricmc.fabric-api") } - // Modmenu - modApi("com.terraformersmc:modmenu:${project.mod_menu_version}") { - exclude(group: "net.fabricmc.fabric-api") - } + // Modmenu + modApi("com.terraformersmc:modmenu:${project.mod_menu_version}") { + exclude(group: "net.fabricmc.fabric-api") + } } repositories { @@ -37,56 +37,61 @@ repositories { // See https://docs.gradle.org/current/userguide/declaring_repositories.html // for more information about repositories. - maven { url "https://maven.fabricmc.net/" } - maven { url "https://maven.shedaniel.me/" } // Cloth Config - maven { - name = "ModMenu" - url = "https://maven.terraformersmc.com/releases/" - } - mavenCentral() + maven { url "https://maven.fabricmc.net/" } + maven { url "https://maven.shedaniel.me/" } // Cloth Config + maven { + name = "ModMenu" + url = "https://maven.terraformersmc.com/releases/" + } + mavenCentral() } processResources { - inputs.property "version", project.version - - filesMatching("fabric.mod.json") { - expand "version": project.version - } + filesMatching("fabric.mod.json") { + expand( + mod_id: project.property("archives_base_name"), + mod_version: project.property("mod_version"), + minecraft_version: project.property("minecraft_version"), + loader_version: project.property("loader_version"), + fabric_api_version: project.property("fabric_api_version"), + cloth_config_version: project.property("cloth_config_version") + ) + } } tasks.withType(JavaCompile).configureEach { - it.options.release = 21 + it.options.release = 21 } java { - // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task - // if it is present. - // If you remove this line, sources will not be generated. - withSourcesJar() + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() sourceCompatibility = JavaVersion.VERSION_21 targetCompatibility = JavaVersion.VERSION_21 } jar { - from("LICENSE") { - rename { "${it}_${base.archivesBaseName}"} - } + from("LICENSE") { + rename { "${it}_${base.archivesBaseName}" } + } } // configure the maven publication publishing { - publications { - mavenJava(MavenPublication) { - from components.java - } - } + publications { + mavenJava(MavenPublication) { + from components.java + } + } - // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. - repositories { - // Add repositories to publish to here. - // Notice: This block does NOT have the same function as the block in the top level. - // The repositories here will be used for publishing your artifact, not for - // retrieving dependencies. - } + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } } diff --git a/gradle.properties b/gradle.properties index 8f64bd3..f22c746 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,12 +8,12 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.16.10 # Mod Properties - mod_version=1.1.11 - maven_group=net.chatsounds + mod_version=1.2.0 + maven_group=io.github.alurienflame.chatsounds archives_base_name=chatsounds # Dependencies - fabric_version=0.115.0+1.21.4 + fabric_api_version=0.115.0+1.21.4 mod_menu_version=13.0.1 cloth_config_version=17.0.144 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..a4b76b9 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 2cfa17a..e2847c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists \ No newline at end of file +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index aeb74cb..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -83,7 +85,9 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -130,10 +134,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. @@ -141,7 +148,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -149,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -198,11 +205,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/gradlew.bat b/gradlew.bat index 107acd3..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/src/main/java/net/chatsounds/Chatsounds.java b/src/main/java/io/github/alurienflame/chatsounds/Chatsounds.java similarity index 95% rename from src/main/java/net/chatsounds/Chatsounds.java rename to src/main/java/io/github/alurienflame/chatsounds/Chatsounds.java index 4e6f144..874d695 100644 --- a/src/main/java/net/chatsounds/Chatsounds.java +++ b/src/main/java/io/github/alurienflame/chatsounds/Chatsounds.java @@ -1,4 +1,4 @@ -package net.chatsounds; +package io.github.alurienflame.chatsounds; import me.shedaniel.autoconfig.AutoConfig; import me.shedaniel.autoconfig.ConfigHolder; diff --git a/src/main/java/net/chatsounds/ChatsoundsConfig.java b/src/main/java/io/github/alurienflame/chatsounds/ChatsoundsConfig.java similarity index 99% rename from src/main/java/net/chatsounds/ChatsoundsConfig.java rename to src/main/java/io/github/alurienflame/chatsounds/ChatsoundsConfig.java index a873fe0..465bb80 100644 --- a/src/main/java/net/chatsounds/ChatsoundsConfig.java +++ b/src/main/java/io/github/alurienflame/chatsounds/ChatsoundsConfig.java @@ -1,12 +1,12 @@ -package net.chatsounds; +package io.github.alurienflame.chatsounds; import me.shedaniel.autoconfig.ConfigData; import me.shedaniel.autoconfig.annotation.Config; import me.shedaniel.autoconfig.annotation.ConfigEntry; import net.minecraft.client.sound.PositionedSoundInstance; -import net.minecraft.sound.SoundCategory; import net.minecraft.client.sound.SoundInstance; import net.minecraft.registry.entry.RegistryEntry; +import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvent; import net.minecraft.sound.SoundEvents; import net.minecraft.util.Identifier; diff --git a/src/main/java/net/chatsounds/ModMenuIntegration.java b/src/main/java/io/github/alurienflame/chatsounds/ModMenuIntegration.java similarity index 90% rename from src/main/java/net/chatsounds/ModMenuIntegration.java rename to src/main/java/io/github/alurienflame/chatsounds/ModMenuIntegration.java index 36884e2..683f4eb 100644 --- a/src/main/java/net/chatsounds/ModMenuIntegration.java +++ b/src/main/java/io/github/alurienflame/chatsounds/ModMenuIntegration.java @@ -1,8 +1,8 @@ -package net.chatsounds; +package io.github.alurienflame.chatsounds; -import me.shedaniel.autoconfig.AutoConfig; import com.terraformersmc.modmenu.api.ConfigScreenFactory; import com.terraformersmc.modmenu.api.ModMenuApi; +import me.shedaniel.autoconfig.AutoConfig; public class ModMenuIntegration implements ModMenuApi { @Override diff --git a/src/main/java/net/chatsounds/mixin/ChatsoundsMixin.java b/src/main/java/io/github/alurienflame/chatsounds/mixin/ChatsoundsMixin.java similarity index 95% rename from src/main/java/net/chatsounds/mixin/ChatsoundsMixin.java rename to src/main/java/io/github/alurienflame/chatsounds/mixin/ChatsoundsMixin.java index f181194..a41e3ee 100644 --- a/src/main/java/net/chatsounds/mixin/ChatsoundsMixin.java +++ b/src/main/java/io/github/alurienflame/chatsounds/mixin/ChatsoundsMixin.java @@ -1,18 +1,16 @@ -package net.chatsounds.mixin; - -import net.chatsounds.ChatsoundsConfig; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +package io.github.alurienflame.chatsounds.mixin; +import io.github.alurienflame.chatsounds.ChatsoundsConfig; import me.shedaniel.autoconfig.AutoConfig; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.hud.ChatHud; import net.minecraft.text.Text; import net.minecraft.text.TextContent; import net.minecraft.text.TranslatableTextContent; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; // FIXME: Conflicts with ReplayMod, AdvancedChatHUD @Mixin(ChatHud.class) diff --git a/src/main/resources/chatsounds.mixins.json b/src/main/resources/chatsounds.mixins.json index c019d30..53f7bed 100644 --- a/src/main/resources/chatsounds.mixins.json +++ b/src/main/resources/chatsounds.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "net.chatsounds.mixin", + "package": "io.github.alurienflame.chatsounds.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ ], diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 3dacb3d..97533da 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,8 +1,7 @@ { "schemaVersion": 1, - "id": "chatsounds", - "version": "1.1.11", - + "id": "${mod_id}", + "version": "${mod_version}", "name": "Chat Sounds", "description": "Plays a sound whenever a chat message is received.", "authors": [ @@ -15,36 +14,37 @@ "contact": { "sources": "https://github.com/AlurienFlame/chatsounds" }, - "license": "MIT", "icon": "assets/chatsounds/icon.png", - "environment": "client", "entrypoints": { "client": [ - "net.chatsounds.Chatsounds" + "io.github.alurienflame.chatsounds.Chatsounds" ], "modmenu": [ - "net.chatsounds.ModMenuIntegration" + "io.github.alurienflame.chatsounds.ModMenuIntegration" ] }, "mixins": [ "chatsounds.mixins.json" ], "depends": { - "fabricloader": ">=0.15.11", - "fabric": ">=0.100.7", - "minecraft": ">=1.21", + "fabricloader": "^${loader_version}", + "fabric-api": "^${fabric_api_version}", + "minecraft": ">=${minecraft_version}", "java": ">=21", - "modmenu": ">=11.0.0", - "cloth-config2": ">=15.0.127" + "modmenu": "*", + "cloth-config2": "^${cloth_config_version}" }, "conflicts": { "replaymod": "*" }, "custom": { "mc-publish": { - "loaders": ["fabric", "quilt"] + "loaders": [ + "fabric", + "quilt" + ] } } }