diff --git a/gradle.properties b/gradle.properties index 65d2fd7b..c9b3174d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ loader_version=0.10.8 # Mod Properties - mod_version = 0.8.1-beta + mod_version = 0.8.2-beta maven_group = ru.betterend archives_base_name = better-end diff --git a/src/main/java/ru/betterend/integration/byg/OldBulbisGardens.java b/src/main/java/ru/betterend/integration/byg/OldBulbisGardens.java index 6fe80547..ebff48a8 100644 --- a/src/main/java/ru/betterend/integration/byg/OldBulbisGardens.java +++ b/src/main/java/ru/betterend/integration/byg/OldBulbisGardens.java @@ -2,10 +2,13 @@ package ru.betterend.integration.byg; import java.util.List; +import net.fabricmc.api.EnvType; +import net.fabricmc.loader.api.FabricLoader; import net.minecraft.entity.SpawnGroup; import net.minecraft.particle.ParticleTypes; import net.minecraft.sound.SoundEvent; import net.minecraft.world.biome.Biome; +import net.minecraft.world.biome.BiomeEffects; import net.minecraft.world.biome.SpawnSettings.SpawnEntry; import net.minecraft.world.gen.GenerationStep.Feature; import ru.betterend.integration.Integrations; @@ -20,10 +23,7 @@ public class OldBulbisGardens extends EndBiome { private static BiomeDefinition makeDef() { Biome biome = Integrations.BYG.getBiome("bulbis_gardens"); - SoundEvent loop = biome.getLoopSound().get(); - SoundEvent music = biome.getMusic().get().getSound(); - SoundEvent additions = biome.getAdditionsSound().get().getSound(); - SoundEvent mood = biome.getMoodSound().get().getSound(); + BiomeEffects effects = biome.getEffects(); BiomeDefinition def = new BiomeDefinition("old_bulbis_gardens") .setFogColor(215, 132, 207) @@ -32,10 +32,6 @@ public class OldBulbisGardens extends EndBiome { .setFoliageColor(122, 17, 155) .setParticles(ParticleTypes.REVERSE_PORTAL, 0.002F) .setSurface(Integrations.BYG.getBlock("ivis_phylium")) - .setLoop(loop) - .setMusic(music) - .setAdditions(additions) - .setMood(mood) .addFeature(EndFeatures.END_LAKE_RARE) .addFeature(BYGFeatures.OLD_BULBIS_TREE) .addFeature(Feature.VEGETAL_DECORATION, BYGFeatures.BULBIS_TREES) @@ -48,6 +44,14 @@ public class OldBulbisGardens extends EndBiome { .addFeature(BYGFeatures.BULBIS_ODDITY) .addFeature(BYGFeatures.PURPLE_BULBIS_ODDITY); + if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) { + SoundEvent loop = effects.getLoopSound().get(); + SoundEvent music = effects.getMusic().get().getSound(); + SoundEvent additions = effects.getAdditionsSound().get().getSound(); + SoundEvent mood = effects.getMoodSound().get().getSound(); + def.setLoop(loop).setMusic(music).setAdditions(additions).setMood(mood); + } + for (SpawnGroup group: SpawnGroup.values()) { List list = biome.getSpawnSettings().getSpawnEntry(group); list.forEach((entry) -> {