chore: update deps

Author: chsbuffer

.gitattributes

@@ -0,0 +1,9 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# Linux start script should use lf
+/gradlew        text eol=lf
+
+# These are Windows script files and should use crlf
+*.bat           text eol=crlf
+

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.4-SNAPSHOT'
+    id 'fabric-loom' version '1.7-SNAPSHOT'
     id 'maven-publish'
 }
 
@@ -20,6 +20,18 @@ repositories {
     maven { url "https://maven.shedaniel.me/" }
 }
 
+loom {
+    splitEnvironmentSourceSets()
+
+    mods {
+        "notebetterfabric" {
+            sourceSet sourceSets.main
+            sourceSet sourceSets.client
+        }
+    }
+
+}
+
 dependencies {
     // To change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
@@ -29,11 +41,6 @@ dependencies {
     // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-    // Uncomment the following line to enable the deprecated Fabric API modules.
-    // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time.
-
-    // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
-
     //* Cloth Config https://www.curseforge.com/minecraft/mc-mods/cloth-config
     modApi("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_version}") {
         exclude(group: "net.fabricmc.fabric-api")
@@ -71,7 +78,8 @@ jar {
 // configure the maven publication
 publishing {
     publications {
-        mavenJava(MavenPublication) {
+        create("mavenJava", MavenPublication) {
+            artifactId = project.archives_base_name
             from components.java
         }
     }

gradle.properties

@@ -6,14 +6,14 @@ org.gradle.parallel=true
 # check these on https://fabricmc.net/develop
 minecraft_version=1.19.4
 yarn_mappings=1.19.4+build.2
-loader_version=0.14.22
+loader_version=0.16.3
 
 # Mod Properties
 mod_version=1.0
 maven_group=com.gmail.gorayan3838
 archives_base_name=NoteBetterFabric
 
 # Dependencies
-fabric_version=0.87.0+1.19.4
+fabric_version=0.87.2+1.19.4
 #* check this on https://www.curseforge.com/minecraft/mc-mods/cloth-config/files
 cloth_version=10.1.105

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -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/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+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
@@ -145,15 +148,15 @@ 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
     case $MAX_FD in  #(
       '' | 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
@@ -202,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" \

gradlew

@@ -13,6 +13,8 @@
 @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
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 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
 
@@ -57,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
 

gradlew.bat

@@ -1,36 +1,38 @@
-package com.gmail.gorayan3838.notebetterfabric;
+package com.gmail.gorayan3838.notebetterfabric.client;
 
 import com.gmail.gorayan3838.notebetterfabric.config.SoundConfig;
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import me.shedaniel.autoconfig.AutoConfig;
 import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
-import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
-import net.minecraft.server.command.CommandManager;
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.minecraft.text.Text;
 
-public class NoteBetterFabric implements ModInitializer {
+@Environment(EnvType.CLIENT)
+public class NoteBetterFabricClient implements ClientModInitializer {
 
     public static final String modID = "notebetterfabric";
 
     public static SoundConfig CONFIG;
 
     @Override
-    public void onInitialize() {
+    public void onInitializeClient() {
         AutoConfig.register(SoundConfig.class, GsonConfigSerializer::new);
         CONFIG = AutoConfig.getConfigHolder(SoundConfig.class).get();
         registerCommand();
     }
 
     public void registerCommand() {
-        CommandRegistrationCallback.EVENT.register((dispatcher, b) -> {
-            LiteralArgumentBuilder builder = CommandManager.literal("notebetter")
+        ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> {
+            var builder = ClientCommandManager.literal("notebetter")
                     .requires(serverCommandSource -> serverCommandSource.hasPermissionLevel(2))
-                    .then(CommandManager.literal("reload")
+                    .then(ClientCommandManager.literal("reload")
                             .executes(context -> {
                                 AutoConfig.getConfigHolder(SoundConfig.class).load();
                                 CONFIG = AutoConfig.getConfigHolder(SoundConfig.class).get();
-                                context.getSource().sendFeedback(Text.translatable("commands.notebetterfabric.reload.success"), true);
+                                context.getSource().sendFeedback(Text.translatable("commands.notebetterfabric.reload.success"));
                                 return 1;
                             })
                     );

…8/notebetterfabric/NoteBetterFabric.java …abric/client/NoteBetterFabricClient.javasrc/main/java/com/gmail/gorayan3838/notebetterfabric/NoteBetterFabric.java renamed to src/client/java/com/gmail/gorayan3838/notebetterfabric/client/NoteBetterFabricClient.java src/main/java/com/gmail/gorayan3838/notebetterfabric/NoteBetterFabric.java renamed to src/client/java/com/gmail/gorayan3838/notebetterfabric/client/NoteBetterFabricClient.java

@@ -1,11 +1,11 @@
 package com.gmail.gorayan3838.notebetterfabric.config;
 
-import com.gmail.gorayan3838.notebetterfabric.NoteBetterFabric;
+import com.gmail.gorayan3838.notebetterfabric.client.NoteBetterFabricClient;
 import me.shedaniel.autoconfig.ConfigData;
 import me.shedaniel.autoconfig.annotation.Config;
 import me.shedaniel.autoconfig.annotation.ConfigEntry;
 
-@Config(name = NoteBetterFabric.modID)
+@Config(name = NoteBetterFabricClient.modID)
 public class SoundConfig implements ConfigData {
 
     @ConfigEntry.Gui.CollapsibleObject

…notebetterfabric/config/SoundConfig.java …notebetterfabric/config/SoundConfig.javasrc/main/java/com/gmail/gorayan3838/notebetterfabric/config/SoundConfig.java renamed to src/client/java/com/gmail/gorayan3838/notebetterfabric/config/SoundConfig.java src/main/java/com/gmail/gorayan3838/notebetterfabric/config/SoundConfig.java renamed to src/client/java/com/gmail/gorayan3838/notebetterfabric/config/SoundConfig.java

@@ -1,8 +1,7 @@
 package com.gmail.gorayan3838.notebetterfabric.mixin;
 
-import com.gmail.gorayan3838.notebetterfabric.NoteBetterFabric;
+import com.gmail.gorayan3838.notebetterfabric.client.NoteBetterFabricClient;
 import com.gmail.gorayan3838.notebetterfabric.config.SoundConfig;
-import net.minecraft.block.Block;
 import net.minecraft.block.NoteBlock;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.registry.entry.RegistryEntry;
@@ -26,7 +25,7 @@ public class NoteBlockMixin {
     @Redirect(method = "onSyncedBlockEvent", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;playSound(Lnet/minecraft/entity/player/PlayerEntity;DDDLnet/minecraft/registry/entry/RegistryEntry;Lnet/minecraft/sound/SoundCategory;FFJ)V"))
     private void injected(World world, @Nullable PlayerEntity player, double x, double y, double z, RegistryEntry<SoundEvent> sound, SoundCategory category, float volume, float pitch, long seed) {
         BlockPos pos = new BlockPos((int) Math.floor(x), (int) Math.floor(y), (int) Math.floor(z));
-        SoundConfig.Mapping[] mappings = NoteBetterFabric.CONFIG.getMappings();
+        SoundConfig.Mapping[] mappings = NoteBetterFabricClient.CONFIG.getMappings();
         List<SoundConfig.Mapping> filteredMappings = Arrays.stream(mappings)
                 .filter(mapping -> world.getBlockState(pos.down()).getBlock().equals(Registries.BLOCK.get(new Identifier(mapping.getBlock()))))
                 .toList();