feat: get random song in tag

ModFest · Nov 26, 2024 · 1371974 · 1371974
1 parent 8f333f4
commit 1371974
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 25 deletions.
diff --git a/src/client/java/symbolics/division/meret/mixin/client/MinecraftMixin.java b/src/client/java/symbolics/division/meret/mixin/client/MinecraftMixin.java
@@ -5,6 +5,8 @@
 import dev.doublekekse.area_lib.data.AreaSavedData;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.core.Holder;
+import net.minecraft.core.HolderSet;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
@@ -17,6 +19,8 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+import java.util.Optional;
+
 @Mixin(Minecraft.class)
 public class MinecraftMixin {
     @Shadow public LocalPlayer player;
@@ -26,16 +30,26 @@ public class MinecraftMixin {
             at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/Optionull;map(Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;")
     )
     public void modifyGetSituationalMusic(CallbackInfoReturnable<Music> ci) {
-        if (this.player != null) {
-            AreaSavedData.IdentifiableArea potentialArea = AreaClientData.getClientLevelData().find(this.player.level(), this.player.position());
-            Registry<JukeboxSong> songRegistry = this.player.level().registryAccess().registry(Registries.JUKEBOX_SONG).get();
+        if (this.player == null) return;
+
+        AreaSavedData.IdentifiableArea potentialArea = AreaClientData.getClientLevelData()
+                .find(this.player.level(), this.player.position());
+
+        if (potentialArea == null) return;
+
+        Registry<JukeboxSong> songRegistry =  this.player.level().registryAccess().registry(Registries.JUKEBOX_SONG).orElse(null);
+
+        if (songRegistry == null) return;
+
+        TagKey<JukeboxSong> musicTag = TagKey.create(
+                Registries.JUKEBOX_SONG,
+                potentialArea.id()
+        );
 
-            // I have this
-            ResourceLocation musicTypeTag = potentialArea.id();
-            // I need to get a random jukebox sound tagged with this
+        HolderSet.Named<JukeboxSong> taggedHolders = songRegistry.getOrCreateTag(musicTag);
+        Holder<JukeboxSong> song = taggedHolders.getRandomElement(this.player.getRandom()).orElse(null);
+        if (song == null) return;
 
 
-
-        }
     }
 }
diff --git a/src/client/resources/meret.client.mixins.json b/src/client/resources/meret.client.mixins.json
@@ -3,7 +3,7 @@
 	"package": "symbolics.division.meret.mixin.client",
 	"compatibilityLevel": "JAVA_21",
 	"client": [
-		"ExampleClientMixin"
+		"MinecraftMixin"
 	],
 	"injectors": {
 		"defaultRequire": 1

diff --git a/src/main/java/symbolics/division/meret/mixin/ExampleMixin.java b/src/main/java/symbolics/division/meret/mixin/ExampleMixin.java
diff --git a/src/main/resources/meret.mixins.json b/src/main/resources/meret.mixins.json
@@ -3,7 +3,6 @@
 	"package": "symbolics.division.meret.mixin",
 	"compatibilityLevel": "JAVA_21",
 	"mixins": [
-		"ExampleMixin"
 	],
 	"injectors": {
 		"defaultRequire": 1