Skip to content

Commit 8bba31d

Browse files
committed
fix: 1.21.11 port
1 parent 58391aa commit 8bba31d

4 files changed

Lines changed: 8 additions & 7 deletions

File tree

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx2G
33

44
# Fabric Properties
55
# check these on https://fabricmc.net/develop
6-
minecraft_version=1.21.11-rc2
7-
yarn_mappings=1.21.11-rc2+build.1
8-
loader_version=0.17.2
6+
minecraft_version=1.21.11
7+
yarn_mappings=1.21.11+build.1
8+
loader_version=0.18.2
99

1010
#Fabric api
1111
fabric_version=0.139.4+1.21.11
1212

1313
# Mod Properties
14-
mod_version = 1.1.11
14+
mod_version = 1.1.12
1515
maven_group = com.ishland
1616
archives_base_name = rsls

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ private <T extends PacketListener> void handleSoundsAsync(Packet<T> packet, T li
3333
@Share("rsls$originalOp") LocalRef<Operation<Void>> rsls$originalOperation) {
3434
// no-op as we don't want this to be executed sync
3535
rsls$originalOperation.set(original);
36+
rsls$thirdParam.set(thirdParam);
3637
}
3738

3839
@Dynamic

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class MixinMusicTracker {
3131
@Unique
3232
private CompletableFuture<Void> rsls$playFuture;
3333

34-
@WrapMethod(method = {"Lnet/minecraft/class_1142;method_4858(Lnet/minecraft/class_10383;)V", "play"})
34+
@WrapMethod(method = {"method_4858(Lnet/minecraft/class_10383;)V", "play"})
3535
private void wrapPlay(@Coerce Object instance, Operation<Void> original) {
3636
CompletableFuture<Void> rsls$playFuture1 = this.rsls$playFuture;
3737
if (rsls$playFuture1 != null && !rsls$playFuture1.isDone()) {
@@ -43,7 +43,7 @@ private void wrapPlay(@Coerce Object instance, Operation<Void> original) {
4343
this.rsls$playFuture = CompletableFuture.runAsync(() -> original.call(instance), taskQueue).orTimeout(15, TimeUnit.SECONDS);
4444
}
4545

46-
@WrapOperation(method = {"Lnet/minecraft/class_1142;method_4858(Lnet/minecraft/class_10383;)V", "play"}, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/toast/ToastManager;onMusicTrackStart()V"))
46+
@WrapOperation(method = {"method_4858(Lnet/minecraft/class_10383;)V", "play"}, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/toast/ToastManager;onMusicTrackStart()V"))
4747
private void wrapPlayListener(ToastManager instance, Operation<Void> original) {
4848
this.client.execute(() -> original.call(instance));
4949
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public abstract class MixinSoundManager1_21_9 {
2323
private SoundSystem soundSystem;
2424

2525
@Dynamic
26-
@WrapMethod(method = {"Lnet/minecraft/class_1144;method_4865(Lnet/minecraft/class_3419;)V", "refreshSoundVolumes"})
26+
@WrapMethod(method = {"method_4865(Lnet/minecraft/class_3419;)V", "refreshSoundVolumes"})
2727
private void onUpdateSoundVolume(SoundCategory category, Operation<Void> original) {
2828
if (((SoundManagerDuck) this).rsls$shouldRunOffthread()) {
2929
((ISoundSystem) this.soundSystem).getTaskQueue().execute(() -> original.call(category));

0 commit comments

Comments
 (0)