From 168a204a6a776cb213c5792db901870f2e8a32e3 Mon Sep 17 00:00:00 2001 From: Fabrizio La Rosa Date: Thu, 6 Aug 2020 18:04:25 +0200 Subject: [PATCH] Restore biome generation on pre-1.16 --- .../world/generator/VoidGenerator.java | 42 +++++++++---------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/songoda/skyblock/world/generator/VoidGenerator.java b/src/main/java/com/songoda/skyblock/world/generator/VoidGenerator.java index 672cc9fa..87ab3db6 100644 --- a/src/main/java/com/songoda/skyblock/world/generator/VoidGenerator.java +++ b/src/main/java/com/songoda/skyblock/world/generator/VoidGenerator.java @@ -29,28 +29,26 @@ public class VoidGenerator extends ChunkGenerator { final Configuration configLoad = plugin.getFileManager().getConfig(new File(plugin.getDataFolder(), "config.yml")).getFileConfiguration(); final ConfigurationSection worldSection = configLoad.getConfigurationSection("Island.World"); - if(ServerVersion.isServerVersionAtLeast(ServerVersion.V1_16)) { - Biome biome; - - switch (world.getEnvironment()) { - case NORMAL: - biome = CompatibleBiome.valueOf(configLoad.getString("Island.Biome.Default.Type", "PLAINS").toUpperCase()).getBiome(); - break; - case NETHER: - biome = CompatibleBiome.NETHER_WASTES.getBiome(); - break; - case THE_END: - biome = CompatibleBiome.THE_END.getBiome(); - break; - default: - throw new IllegalStateException("Unexpected value: " + world.getEnvironment()); - } - - if(ServerVersion.isServerVersionAtLeast(ServerVersion.V1_16)) { // TODO Should be 1.15 but it works fine there - setChunkBiome3D(biome, biomeGrid, world); - } else { - setChunkBiome2D(biome, biomeGrid); - } + Biome biome; + + switch (world.getEnvironment()) { + case NORMAL: + biome = CompatibleBiome.valueOf(configLoad.getString("Island.Biome.Default.Type", "PLAINS").toUpperCase()).getBiome(); + break; + case NETHER: + biome = CompatibleBiome.NETHER_WASTES.getBiome(); + break; + case THE_END: + biome = CompatibleBiome.THE_END.getBiome(); + break; + default: + throw new IllegalStateException("Unexpected value: " + world.getEnvironment()); + } + + if(ServerVersion.isServerVersionAtLeast(ServerVersion.V1_16)) { // TODO Should be 1.15 but it works fine there + setChunkBiome3D(biome, biomeGrid, world); + } else { + setChunkBiome2D(biome, biomeGrid); } for (IslandWorld worldList : IslandWorld.values()) {