Fix intentionally_empty & missing main menu music

Author: Ampflower

gradle.properties

@@ -14,10 +14,10 @@ modId=meret
 modName=Meret
 modDescription=Soundtrack areas for mapmakers. Powered by Area Lib.
 authors=hama, Tomate0613
-contributors=Sisby folk
+contributors=Sisby folk, Ampflower
 license=CC0-1.0
 # Mod Version
-baseVersion=0.2.0
+baseVersion=0.2.1
 # Branch Metadata
 branch=1.21.7
 tagBranch=1.21.7

src/main/java/symbolics/division/meret/client/MeretClient.java

@@ -1,15 +1,12 @@
 package symbolics.division.meret.client;
 
-import com.mojang.authlib.minecraft.client.MinecraftClient;
 import dev.doublekekse.area_lib.Area;
 import dev.doublekekse.area_lib.data.AreaClientData;
 import dev.doublekekse.area_lib.data.AreaSavedData;
 import net.fabricmc.api.ClientModInitializer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.core.Holder;
 import net.minecraft.sounds.Music;
-import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,7 +16,6 @@
 import java.util.Optional;
 
 public class MeretClient implements ClientModInitializer {
-	public static final Music EMPTY = new Music(Holder.direct(SoundEvents.EMPTY), 10, 10, false);
 	public static final Logger LOGGER = LoggerFactory.getLogger(Meret.ID);
 
 	@Override

src/main/java/symbolics/division/meret/mixin/client/MinecraftMixin.java

@@ -1,21 +1,41 @@
 package symbolics.division.meret.mixin.client;
 
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.client.sounds.MusicInfo;
+import net.minecraft.sounds.Music;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import symbolics.division.meret.Meret;
 import symbolics.division.meret.client.MeretClient;
 
+import java.util.Optional;
+
 @Mixin(Minecraft.class)
 public class MinecraftMixin {
-	@ModifyExpressionValue(
+	@Shadow
+	private LocalPlayer player;
+
+	@Inject(
 		method = "getSituationalMusic",
-		at = @At(value = "INVOKE", target = "Lnet/minecraft/Optionull;map(Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;")
+		at = @At(
+			value = "INVOKE",
+			target = "Lnet/minecraft/client/player/LocalPlayer;level()Lnet/minecraft/world/level/Level;",
+			shift = At.Shift.BEFORE),
+		cancellable = true
 	)
-	public Object meretSituationalMusic(Object original) {
-		if (original != null) return original; // Preserve screen music.
-		Minecraft self = (Minecraft) (Object) this;
-		return MeretClient.getOverride(self.player).orElse(Meret.CONFIG.overrideAll ? MeretClient.EMPTY : null);
+	private void meretSituationalMusic(CallbackInfoReturnable<MusicInfo> cir) {
+		final Optional<Music> music = MeretClient.getOverride(this.player);
+
+		// overrideAll prevents the regular level music from playing.
+		if (music.isPresent() || Meret.CONFIG.overrideAll) {
+			// A null music instance is safe.
+			// The 1.21.6+ MusicManager shorts circuits null as a no-op, max time 100 frames,
+			// and the same check has been mimicked in Music Moods.
+			cir.setReturnValue(new MusicInfo(music.orElse(null)));
+		}
 	}
 }