build: 1.1.11, 1.21.11 support

Author: ishland

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.11-SNAPSHOT'
+	id 'fabric-loom' version '1.13-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -52,6 +52,9 @@ test {
 
 loom {
 	accessWidenerPath = file("src/main/resources/rsls.accesswidener")
+    mixin {
+        useLegacyMixinAp = true
+    }
 }
 
 processResources {

gradle.properties

@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.9-rc1
-yarn_mappings=1.21.9-rc1+build.1
+minecraft_version=1.21.11-rc2
+yarn_mappings=1.21.11-rc2+build.1
 loader_version=0.17.2
 
 #Fabric api
-fabric_version=0.133.13+1.21.9
+fabric_version=0.139.4+1.21.11
 
 # Mod Properties
-mod_version = 1.1.10
+mod_version = 1.1.11
 maven_group = com.ishland
 archives_base_name = rsls

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,16 +31,12 @@ 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 = "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();

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 = {"Lnet/minecraft/class_1144;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));
         }
     }