From 8b0a7d422a39cb42b66f2d652e2cc9509ad09c4f Mon Sep 17 00:00:00 2001 From: dfsek Date: Mon, 23 Nov 2020 21:57:09 -0700 Subject: [PATCH] do the populator shuffle B) --- .../com/dfsek/terra/generation/TerraChunkGenerator.java | 4 +++- src/main/java/com/dfsek/terra/population/OrePopulator.java | 4 ++-- .../java/com/dfsek/terra/population/SnowPopulator.java | 7 +++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java b/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java index 0bcd6b426..dc1fd894f 100644 --- a/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java +++ b/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java @@ -57,7 +57,9 @@ public class TerraChunkGenerator extends GaeaChunkGenerator { public TerraChunkGenerator(ConfigPack c) { super(ChunkInterpolator.InterpolationType.TRILINEAR); this.configPack = c; + popMan.attach(new OrePopulator()); popMan.attach(new TreePopulator()); + popMan.attach(new FloraPopulator()); popMan.attach(new SnowPopulator()); } @@ -226,7 +228,7 @@ public class TerraChunkGenerator extends GaeaChunkGenerator { @Override public @NotNull List getDefaultPopulators(@NotNull World world) { - return Arrays.asList(new CavePopulator(), new StructurePopulator(), new OrePopulator(), new FloraPopulator(), popMan); + return Arrays.asList(new CavePopulator(), new StructurePopulator(), popMan); } @Override diff --git a/src/main/java/com/dfsek/terra/population/OrePopulator.java b/src/main/java/com/dfsek/terra/population/OrePopulator.java index 8b66f71a9..417d6fa62 100644 --- a/src/main/java/com/dfsek/terra/population/OrePopulator.java +++ b/src/main/java/com/dfsek/terra/population/OrePopulator.java @@ -9,20 +9,20 @@ import com.dfsek.terra.event.OreVeinGenerateEvent; import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.World; -import org.bukkit.generator.BlockPopulator; import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; import org.polydev.gaea.biome.Biome; import org.polydev.gaea.generation.GenerationPhase; import org.polydev.gaea.math.MathUtil; import org.polydev.gaea.math.Range; +import org.polydev.gaea.population.GaeaBlockPopulator; import org.polydev.gaea.profiler.ProfileFuture; import org.polydev.gaea.util.FastRandom; import java.util.Map; import java.util.Random; -public class OrePopulator extends BlockPopulator { +public class OrePopulator extends GaeaBlockPopulator { @SuppressWarnings("try") @Override public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk chunk) { diff --git a/src/main/java/com/dfsek/terra/population/SnowPopulator.java b/src/main/java/com/dfsek/terra/population/SnowPopulator.java index 5e6860d37..9802fe5e1 100644 --- a/src/main/java/com/dfsek/terra/population/SnowPopulator.java +++ b/src/main/java/com/dfsek/terra/population/SnowPopulator.java @@ -70,13 +70,12 @@ public class SnowPopulator extends GaeaBlockPopulator { continue; if(blacklistSpawn.contains(b.getType()) || b.isPassable()) continue; boolean phys = biome.getSnow().doPhysics(); - b.getRelative(BlockFace.UP).setBlockData(DataUtil.SNOW, phys); if(!phys) { BlockData data = b.getBlockData(); - if(data instanceof Snowable) { - ((Snowable) data).setSnowy(true); - } + if(data instanceof Snowable) phys = true; } + b.getRelative(BlockFace.UP).setBlockData(DataUtil.SNOW, phys); + } } }