[RC] Port to 1.21.8-rc1

* update dependencies
  - yarn mappings 1.21.8-rc1+build.2
  - fabric loader 0.16.14
  - fabric api 0.129.0+1.21.8
  - Gradle 8.14.3
  - SoundCategories

* new sounds
  - Happy Ghast's harnesses
  - Dried Ghast

* new module
  - `:versioned:es1.21.6`

* into versioned module
  - getSoundVolume in `logics.SoundManager`

Author: lonefelidae16

build.gradle

@@ -102,6 +102,8 @@ dependencies {
     // <editor-fold desc="Extra Sounds modules">
     compileOnly include(project(path: 'logics'))
     // 1.21 family
+//    compileOnly include(project(path: 'versioned:es1.21.9'))
+    compileOnly include(project(path: 'versioned:es1.21.6'))
     compileOnly include(project(path: 'versioned:es1.21.5'))
     compileOnly include(project(path: 'versioned:es1.21.4'))
     compileOnly include(project(path: 'versioned:es1.21.2'))

gradle.properties

@@ -3,11 +3,12 @@ org.gradle.jvmargs=-Xmx4G
 org.gradle.parallel=true
 # Fabric Properties
 # check these on https://fabricmc.net/develop/
-minecraft_version=1.21.5
-yarn_mappings=+build.1
-loader_version=0.16.10
+minecraft_version=1.21.8-rc1
+yarn_mappings=+build.2
+loader_version=0.16.14
+loom_version=1.11-SNAPSHOT
 #Fabric api
-fabric_api_version=0.119.5+1.21.5
+fabric_api_version=0.129.0+1.21.8
 # Java
 java_lang_version=17
 # Mod Properties

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -198,10 +198,10 @@ private void handleQuickMoveSound(Item item) {
     }
 
     public void playSound(VersionedSoundEventWrapper snd, float pitch, SoundCategory category, SoundCategory... optionalVolumes) {
-        float volume = this.getSoundVolume(Mixers.MASTER);
+        float volume = ExtraSounds.MAIN.getSoundVolume(Mixers.MASTER);
         if (optionalVolumes != null) {
             for (SoundCategory cat : optionalVolumes) {
-                volume = Math.min(this.getSoundVolume(cat), volume);
+                volume = Math.min(ExtraSounds.MAIN.getSoundVolume(cat), volume);
             }
         }
         if (volume == 0 || this.isMuted(category)) {
@@ -219,7 +219,7 @@ public void playSound(VersionedSoundEventWrapper snd, float pitch, SoundCategory
     }
 
     public void playSound(VersionedSoundEventWrapper snd, SoundType type, float volume, float pitch, BlockPos position) {
-        volume *= this.getSoundVolume(Mixers.MASTER);
+        volume *= ExtraSounds.MAIN.getSoundVolume(Mixers.MASTER);
         if (volume == 0 || this.isMuted(type.category)) {
             // skip reflection when volume is zero.
             if (DebugUtils.DEBUG) {
@@ -238,7 +238,7 @@ public boolean isMuted(SoundType type) {
     }
 
     private boolean isMuted(SoundCategory category) {
-        return this.getSoundVolume(category) == 0;
+        return ExtraSounds.MAIN.getSoundVolume(category) == 0;
     }
 
     private void logZeroVolume(VersionedSoundEventWrapper snd) {
@@ -293,10 +293,6 @@ public void stopSound(VersionedSoundEventWrapper e, SoundType type) {
         MinecraftClient.getInstance().getSoundManager().stopSounds(e.getId(), type.category);
     }
 
-    private float getSoundVolume(SoundCategory category) {
-        return MinecraftClient.getInstance().options.getSoundVolume(category);
-    }
-
     public VersionedSoundEventWrapper getSoundByItem(Item item, SoundType type) {
         var itemId = ExtraSounds.MAIN.getItemId(item);
         Identifier id = ExtraSounds.getClickId(itemId, type);

gradlew

@@ -10,6 +10,7 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
+import net.minecraft.sound.SoundCategory;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.collection.IndexedIterable;
 
@@ -51,4 +52,6 @@ public static VersionedMain newInstance() {
     public abstract void playSound(SoundInstance instance);
 
     public abstract boolean shouldIgnoreItemSound(Item cursorItem, Item slotItem, InventoryClickState state);
+
+    public abstract float getSoundVolume(SoundCategory soundCategory);
 }

gradlew.bat

@@ -44,7 +44,8 @@ private boolean isBrickItem(Item item) {
 
     private boolean isGearGoldenItem(Item item) {
         return item instanceof CompassItem ||
-                item instanceof SpyglassItem || item instanceof ShearsItem;
+                item instanceof SpyglassItem || item instanceof ShearsItem ||
+                this.getItemIdPath(item).endsWith("_harness");
     }
 
     private boolean isGearLeatherItem(Item item) {

logics/src/main/java/dev/stashy/extrasounds/logics/SoundManager.java

@@ -25,6 +25,7 @@
 import net.minecraft.util.Identifier;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.*;
 import java.nio.file.Files;
@@ -78,7 +79,7 @@ public static void init() {
             try {
                 namespace = container.getProvider().getMetadata().getId();
                 if (namespace == null || namespace.isBlank()) {
-                    throw new Exception("namespace is invalid: %s".formatted(namespace));
+                    throw new Exception("namespace is invalid: null or blank");
                 }
             } catch (Exception ex) {
                 LOGGER.error("Failed to read mod metadata, ignoring.", ex);
@@ -267,6 +268,7 @@ public boolean equals(Object obj) {
         }
 
         @Override
+        @NotNull
         public String toString() {
             final CharSequence[] data = new CharSequence[]{
                     String.valueOf(version), String.valueOf(itemCount), String.join(DELIMITER_MOD_INFO, modInfo)