MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Server crash hotfix

Browse source
This commit is contained in:
paulevsGitch 2020-12-20 23:26:52 +03:00
parent 5947e154ff
commit 2b4612d196
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -8,7 +8,7 @@
loader_version=0.10.8 loader_version=0.10.8
# Mod Properties # Mod Properties
mod_version = 0.8.1-beta mod_version = 0.8.2-beta
maven_group = ru.betterend maven_group = ru.betterend
archives_base_name = better-end archives_base_name = better-end

20
src/main/java/ru/betterend/integration/byg/OldBulbisGardens.java
View file

@ -2,10 +2,13 @@ package ru.betterend.integration.byg;
import java.util.List; import java.util.List;
import net.fabricmc.api.EnvType;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.entity.SpawnGroup; import net.minecraft.entity.SpawnGroup;
import net.minecraft.particle.ParticleTypes; import net.minecraft.particle.ParticleTypes;
import net.minecraft.sound.SoundEvent; import net.minecraft.sound.SoundEvent;
import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.BiomeEffects;
import net.minecraft.world.biome.SpawnSettings.SpawnEntry; import net.minecraft.world.biome.SpawnSettings.SpawnEntry;
import net.minecraft.world.gen.GenerationStep.Feature; import net.minecraft.world.gen.GenerationStep.Feature;
import ru.betterend.integration.Integrations; import ru.betterend.integration.Integrations;
@ -20,10 +23,7 @@ public class OldBulbisGardens extends EndBiome {
private static BiomeDefinition makeDef() { private static BiomeDefinition makeDef() {
Biome biome = Integrations.BYG.getBiome("bulbis_gardens"); Biome biome = Integrations.BYG.getBiome("bulbis_gardens");
SoundEvent loop = biome.getLoopSound().get(); BiomeEffects effects = biome.getEffects();
SoundEvent music = biome.getMusic().get().getSound();
SoundEvent additions = biome.getAdditionsSound().get().getSound();
SoundEvent mood = biome.getMoodSound().get().getSound();
BiomeDefinition def = new BiomeDefinition("old_bulbis_gardens") BiomeDefinition def = new BiomeDefinition("old_bulbis_gardens")
.setFogColor(215, 132, 207) .setFogColor(215, 132, 207)
@ -32,10 +32,6 @@ public class OldBulbisGardens extends EndBiome {
.setFoliageColor(122, 17, 155) .setFoliageColor(122, 17, 155)
.setParticles(ParticleTypes.REVERSE_PORTAL, 0.002F) .setParticles(ParticleTypes.REVERSE_PORTAL, 0.002F)
.setSurface(Integrations.BYG.getBlock("ivis_phylium")) .setSurface(Integrations.BYG.getBlock("ivis_phylium"))
.setLoop(loop)
.setMusic(music)
.setAdditions(additions)
.setMood(mood)
.addFeature(EndFeatures.END_LAKE_RARE) .addFeature(EndFeatures.END_LAKE_RARE)
.addFeature(BYGFeatures.OLD_BULBIS_TREE) .addFeature(BYGFeatures.OLD_BULBIS_TREE)
.addFeature(Feature.VEGETAL_DECORATION, BYGFeatures.BULBIS_TREES) .addFeature(Feature.VEGETAL_DECORATION, BYGFeatures.BULBIS_TREES)
@ -48,6 +44,14 @@ public class OldBulbisGardens extends EndBiome {
.addFeature(BYGFeatures.BULBIS_ODDITY) .addFeature(BYGFeatures.BULBIS_ODDITY)
.addFeature(BYGFeatures.PURPLE_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()) { for (SpawnGroup group: SpawnGroup.values()) {
List<SpawnEntry> list = biome.getSpawnSettings().getSpawnEntry(group); List<SpawnEntry> list = biome.getSpawnSettings().getSpawnEntry(group);
list.forEach((entry) -> { list.forEach((entry) -> {