fix scenario music

TeamMoegMC · Jan 29, 2025 · bf2fa25 · bf2fa25
1 parent d76d113
commit bf2fa25
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/main/java/com/teammoeg/frostedheart/content/scenario/client/FHScenarioClient.java b/src/main/java/com/teammoeg/frostedheart/content/scenario/client/FHScenarioClient.java
@@ -46,9 +46,11 @@ public static ResourceLocation getPathOf(ResourceLocation orig,String path) {
     }
     public static <T> Optional<Holder<T>> getPathFrom(IForgeRegistry<T> registry,ResourceLocation orig,String path) {
     	ResourceLocation rl= new ResourceLocation(orig.getNamespace(),path+ClientUtils.mc().getLanguageManager().getSelected()+"/"+orig.getPath());
+    	System.out.println(rl);
     	if(registry.containsKey(rl)) {
     		return registry.getHolder(rl);
     	}
+    	System.out.println(new ResourceLocation(orig.getNamespace(),path+orig.getPath()));
     	return registry.getHolder(new ResourceLocation(orig.getNamespace(),path+orig.getPath()));
     }
     public static void register(Class<?> clazz) {

diff --git a/src/main/java/com/teammoeg/frostedheart/content/scenario/commands/client/ClientControl.java b/src/main/java/com/teammoeg/frostedheart/content/scenario/commands/client/ClientControl.java
@@ -54,6 +54,7 @@
 import dev.ftb.mods.ftbquests.quest.task.Task;
 import dev.latvian.mods.itemfilters.api.ItemFiltersAPI;
 import net.minecraft.sounds.Music;
+import net.minecraft.sounds.SoundEvent;
 import net.minecraft.client.resources.sounds.SoundInstance;
 import net.minecraft.client.resources.sounds.SoundInstance.Attenuation;
 import net.minecraft.nbt.ListTag;
@@ -284,10 +285,13 @@ public void freeLayer(IClientScene runner,@Param("n")@Param("name")String name)
 	public void bgm(IClientScene runner,@Param("n")@Param("name")String name) {
 		//ISound sound=SimpleSound.music();
 		ClientUtils.mc().getMusicManager().stopPlaying();
-		FHScenarioClient.getPathFrom(ForgeRegistries.SOUND_EVENTS,new ResourceLocation(name),"")
+		//ForgeRegistries.SOUND_EVENTS.getKeys().forEach(System.out::println);
+		/*FHScenarioClient.getPathFrom(ForgeRegistries.SOUND_EVENTS,new ResourceLocation(name),"")
 		.ifPresentOrElse(t->ClientUtils.mc().getMusicManager().startPlaying(new Music(t, 0, 0, true)), ()->{
 			FHMain.LOGGER.error("[FHScenario] Music "+name+" Not found");
-		});
+		});*/
+		ClientUtils.mc().getSoundManager().play(SimpleSoundInstance.forMusic(SoundEvent.createVariableRangeEvent(new ResourceLocation(name))));
+
 
 
 	}