Update to 1.21.7

Author: Tomate0613

gradle.properties

@@ -19,7 +19,7 @@ license=CC0-1.0
 # Mod Version
 baseVersion=0.1.5
 # Branch Metadata
-branch=1.21
-tagBranch=1.21
-compatibleVersions=1.21.1
+branch=1.21.7
+tagBranch=1.21.7
+compatibleVersions=1.21.7
 compatibleLoaders=fabric

gradle/wrapper/gradle-wrapper.properties

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

libs.versions.toml

@@ -1,15 +1,15 @@
 [versions]
-loom = "1.10.+"
+loom = "1.11.+"
 minotaur = "2.+"
 
 kaleidoConfig = "0.3.1+1.3.2"
 
-mc = "1.21.1"
-fl = "0.16.10"
-yarn = "1.21.1+build.3"
-fapi = "0.115.3+1.21.1"
+mc = "1.21.7"
+fl = "0.16.14"
+yarn = "1.21.7+build.2"
+fapi = "0.128.2+1.21.7"
 
-areaLib = "0.2.6"
+areaLib = "0.3.6+1.21.7"
 
 [plugins]
 loom = { id = "fabric-loom", version.ref = "loom" }

src/main/java/symbolics/division/meret/MeretCommands.java

@@ -67,7 +67,7 @@ public static void register(CommandDispatcher<CommandSourceStack> dispatcher, Co
 				.then(literal("set")
 					.then(argument("area", AreaArgument.area())
 						.then(argument("sound", ResourceLocationArgument.id())
-							.suggests(SuggestionProviders.AVAILABLE_SOUNDS)
+							.suggests(SuggestionProviders.cast(SuggestionProviders.AVAILABLE_SOUNDS))
 							.then(argument("minDelay", IntegerArgumentType.integer(0))
 								.then(argument("maxDelay", IntegerArgumentType.integer(0))
 									.then(argument("replaceCurrent", BoolArgumentType.bool())

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

@@ -1,7 +1,7 @@
 package symbolics.division.meret.mixin.client;
 
+import net.minecraft.client.sounds.MusicInfo;
 import net.minecraft.client.sounds.MusicManager;
-import net.minecraft.sounds.Music;
 import net.minecraft.util.Mth;
 import net.minecraft.util.RandomSource;
 import org.spongepowered.asm.mixin.Final;
@@ -13,11 +13,18 @@
 
 @Mixin(MusicManager.class)
 public class MusicManagerMixin {
-	@Shadow @Final private RandomSource random;
-	@Shadow private int nextSongDelay;
+	@Shadow
+	@Final
+	private RandomSource random;
+	@Shadow
+	private int nextSongDelay;
 
 	@Inject(method = "startPlaying", at = @At("HEAD"))
-	void startPlaying(Music music, CallbackInfo ci) {
-		nextSongDelay = Mth.nextInt(random, music.getMinDelay(), music.getMaxDelay());
+	void startPlaying(MusicInfo musicInfo, CallbackInfo ci) {
+		if (musicInfo.music() == null) {
+			return;
+		}
+
+		nextSongDelay = Mth.nextInt(random, musicInfo.music().minDelay(), musicInfo.music().maxDelay());
 	}
 }