From 36682bc04c498025dd3b7d7bdb6dc69947d35fb2 Mon Sep 17 00:00:00 2001 From: dfsek Date: Thu, 16 Jun 2022 22:02:08 -0700 Subject: [PATCH] add biome sound configs --- .../dfsek/terra/bukkit/nms/v1_18_R2/NMSBiomeInjector.java | 4 ++++ .../dfsek/terra/bukkit/nms/v1_19_R1/NMSBiomeInjector.java | 6 +++++- .../main/java/com/dfsek/terra/fabric/util/BiomeUtil.java | 6 +++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/NMSBiomeInjector.java b/platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/NMSBiomeInjector.java index 7ca26995a..3c69226d8 100644 --- a/platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/NMSBiomeInjector.java +++ b/platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/NMSBiomeInjector.java @@ -156,6 +156,10 @@ public class NMSBiomeInjector { effects.grassColorOverride(vanillaBiomeProperties.getGrassColor()); } + vanilla.getAmbientLoop().ifPresent(effects::ambientLoopSound); + vanilla.getAmbientAdditions().ifPresent(effects::ambientAdditionsSound); + vanilla.getAmbientMood().ifPresent(effects::ambientMoodSound); + vanilla.getBackgroundMusic().ifPresent(effects::backgroundMusic); vanilla.getAmbientParticle().ifPresent(effects::ambientParticle); builder.specialEffects(effects.build()); diff --git a/platforms/bukkit/nms/v1_19_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R1/NMSBiomeInjector.java b/platforms/bukkit/nms/v1_19_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R1/NMSBiomeInjector.java index 3121bfa2b..4ed328fff 100644 --- a/platforms/bukkit/nms/v1_19_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R1/NMSBiomeInjector.java +++ b/platforms/bukkit/nms/v1_19_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R1/NMSBiomeInjector.java @@ -149,7 +149,11 @@ public class NMSBiomeInjector { // grass effects.grassColorOverride(vanillaBiomeProperties.getGrassColor()); } - + + vanilla.getAmbientLoop().ifPresent(effects::ambientLoopSound); + vanilla.getAmbientAdditions().ifPresent(effects::ambientAdditionsSound); + vanilla.getAmbientMood().ifPresent(effects::ambientMoodSound); + vanilla.getBackgroundMusic().ifPresent(effects::backgroundMusic); vanilla.getAmbientParticle().ifPresent(effects::ambientParticle); builder.specialEffects(effects.build()); diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/BiomeUtil.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/BiomeUtil.java index 39f6901e9..421b321f4 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/BiomeUtil.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/BiomeUtil.java @@ -150,7 +150,11 @@ public final class BiomeUtil { builder.precipitation(vanilla.getPrecipitation()); } - + + vanilla.getLoopSound().ifPresent(effects::loopSound); + vanilla.getAdditionsSound().ifPresent(effects::additionsSound); + vanilla.getMoodSound().ifPresent(effects::moodSound); + vanilla.getMusic().ifPresent(effects::music); vanilla.getParticleConfig().ifPresent(effects::particleConfig); return builder