Merge branch 'master' into port/neoforge

# Conflicts:
#	build.gradle
#	gradle.properties

Author: ishland

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'dev.architectury.loom' version '1.11-SNAPSHOT'
+	id 'dev.architectury.loom' version '1.13-SNAPSHOT'
 	id 'maven-publish'
 }
 

gradle.properties

@@ -4,14 +4,14 @@ org.gradle.jvmargs=-Xmx2G
 loom.platform=neoforge
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.10
-yarn_mappings=1.21.10+build.1
+minecraft_version=1.21.11
+yarn_mappings=1.21.11+build.1
 # neoforge version, latest version can be found on https://projects.neoforged.net/neoforged/neoforge
-forge_version=21.10.1-beta
+forge_version=21.11.0-beta
 # https://github.com/architectury/architectury-loom/issues/230
 yarn_mappings_patch_neoforge_version=1.21+build.4
 
 # Mod Properties
-mod_version = 1.1.10
+mod_version = 1.1.12
 maven_group = com.ishland
 archives_base_name = rsls-neoforge

src/main/java/com/ishland/fabric/rsls/mixin/MixinClientPlayNetworkHandler.java

@@ -33,6 +33,7 @@ private <T extends PacketListener> void handleSoundsAsync(Packet<T> packet, T li
                                                               @Share("rsls$originalOp") LocalRef<Operation<Void>> rsls$originalOperation) {
         // no-op as we don't want this to be executed sync
         rsls$originalOperation.set(original);
+        rsls$thirdParam.set(thirdParam);
     }
 
     @Dynamic

src/main/java/com/ishland/fabric/rsls/mixin/MixinMusicTracker.java

@@ -6,7 +6,6 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.sound.MusicInstance;
 import net.minecraft.client.sound.MusicTracker;
 import net.minecraft.client.sound.SoundExecutor;
 import net.minecraft.client.sound.SoundManager;
@@ -17,6 +16,7 @@
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Coerce;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
@@ -31,23 +31,19 @@ public class MixinMusicTracker {
     @Unique
     private CompletableFuture<Void> rsls$playFuture;
 
-    @Inject(method = "play", at = @At("HEAD"), cancellable = true)
-    private void prePlay(MusicInstance instance, CallbackInfo ci) {
+    @WrapMethod(method = {"method_4858(Lnet/minecraft/class_10383;)V", "play"})
+    private void wrapPlay(@Coerce Object instance, Operation<Void> original) {
         CompletableFuture<Void> rsls$playFuture1 = this.rsls$playFuture;
-        if (rsls$playFuture1 == null || rsls$playFuture1.isDone()) {
-            ci.cancel();
+        if (rsls$playFuture1 != null && !rsls$playFuture1.isDone()) {
+            return;
         }
-    }
-
-    @WrapMethod(method = "play")
-    private void wrapPlay(MusicInstance instance, Operation<Void> original) {
         SoundManager soundManager = this.client.getSoundManager();
         SoundSystem soundSystem = ((ISoundManager) soundManager).getSoundSystem();
         SoundExecutor taskQueue = ((ISoundSystem) soundSystem).getTaskQueue();
         this.rsls$playFuture = CompletableFuture.runAsync(() -> original.call(instance), taskQueue).orTimeout(15, TimeUnit.SECONDS);
     }
 
-    @WrapOperation(method = "play", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/toast/ToastManager;onMusicTrackStart()V"))
+    @WrapOperation(method = {"method_4858(Lnet/minecraft/class_10383;)V", "play"}, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/toast/ToastManager;onMusicTrackStart()V"))
     private void wrapPlayListener(ToastManager instance, Operation<Void> original) {
         this.client.execute(() -> original.call(instance));
     }

src/main/java/com/ishland/fabric/rsls/mixin/versions/sndmgr/patch_1/MixinSoundManager1_21_9.java

@@ -2,6 +2,8 @@
 
 import com.ishland.fabric.rsls.common.SoundManagerDuck;
 import com.ishland.fabric.rsls.mixin.access.ISoundSystem;
+import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import net.minecraft.client.sound.SoundManager;
 import net.minecraft.client.sound.SoundSystem;
 import net.minecraft.sound.SoundCategory;
@@ -16,19 +18,15 @@
 @Mixin(SoundManager.class)
 public abstract class MixinSoundManager1_21_9 {
 
-    @Shadow
-    public abstract void updateSoundVolume(SoundCategory category);
-
     @Shadow
     @Final
     private SoundSystem soundSystem;
 
     @Dynamic
-    @Inject(method = "updateSoundVolume", at = @At("HEAD"), cancellable = true)
-    private void onUpdateSoundVolume(SoundCategory category, CallbackInfo ci) {
+    @WrapMethod(method = {"method_4865(Lnet/minecraft/class_3419;)V", "refreshSoundVolumes"})
+    private void onUpdateSoundVolume(SoundCategory category, Operation<Void> original) {
         if (((SoundManagerDuck) this).rsls$shouldRunOffthread()) {
-            ci.cancel();
-            ((ISoundSystem) this.soundSystem).getTaskQueue().execute(() -> this.updateSoundVolume(category));
+            ((ISoundSystem) this.soundSystem).getTaskQueue().execute(() -> original.call(category));
         }
     }