From 08c0422902a0a5e45f6e55e2cb950bbf5b0fb011 Mon Sep 17 00:00:00 2001 From: Sen Date: Tue, 5 Aug 2025 13:37:51 +0200 Subject: [PATCH] re-add alpha-like gen --- .../java/server/dimension/GeneratorData.java | 14 +-- .../java/server/init/UniverseRegistry.java | 66 ++++++++++---- .../src/main/java/server/network/Player.java | 2 +- .../java/server/world/NextTickListEntry.java | 88 +++++++------------ .../main/java/server/world/WorldServer.java | 18 ++-- .../server/worldgen/FeatureGenerator.java | 35 +++----- .../{ => component}/FeatureDungeons.java | 9 +- .../{ => component}/FeatureLakes.java | 2 +- .../{ => component}/FeatureLiquids.java | 2 +- .../worldgen/{ => component}/FeatureOres.java | 2 +- .../worldgen/feature/WorldGenIceSpike.java | 6 +- .../worldgen/foliage/WorldGenBigMushroom.java | 4 +- .../worldgen/foliage/WorldGenShrub.java | 4 +- .../{ => generator}/BiomeGenPerlin.java | 2 +- .../{ => generator}/ChunkGenerator.java | 3 +- .../{ => generator}/GeneratorCavern.java | 3 +- .../{ => generator}/GeneratorDestroyed.java | 3 +- .../{ => generator}/GeneratorFlat.java | 3 +- .../{ => generator}/GeneratorIsland.java | 3 +- .../{ => generator}/GeneratorPerlin.java | 61 +++++++------ .../{ => generator}/GeneratorSettings.java | 2 +- .../{ => generator}/GeneratorSimple.java | 27 +++--- .../server/worldgen/{ => layer}/Biome.java | 4 +- .../worldgen/{ => layer}/BiomeGenerator.java | 20 +---- .../worldgen/layer/GenLayerAddExtra.java | 2 - .../server/worldgen/layer/GenLayerBiome.java | 2 - .../worldgen/layer/GenLayerRiverMix.java | 1 - .../populator/PopulatorAlphaLike.java | 20 +++++ .../worldgen/populator/PopulatorBasic.java | 9 -- .../worldgen/populator/PopulatorHell.java | 2 +- .../worldgen/populator/PopulatorHills.java | 2 +- .../{ => replacer}/BlockReplacer.java | 3 +- .../{ => replacer}/ReplacerAltBiome.java | 8 +- .../{ => replacer}/ReplacerAltSimple.java | 3 +- .../{ => replacer}/ReplacerAltSurface.java | 3 +- .../{ => replacer}/ReplacerBiome.java | 3 +- .../worldgen/{ => replacer}/ReplacerMesa.java | 3 +- .../{ => replacer}/ReplacerTerranian.java | 3 +- .../{ => replacer}/ReplacerTopLayer.java | 3 +- .../worldgen/tree/WorldGenBaseTree.java | 6 +- .../server/worldgen/tree/WorldGenBigTree.java | 4 +- .../server/worldgen/tree/WorldGenBirch.java | 4 +- .../server/worldgen/tree/WorldGenDarkOak.java | 4 +- .../worldgen/tree/WorldGenHugeTree.java | 4 +- .../server/worldgen/tree/WorldGenJungle.java | 12 +-- .../server/worldgen/tree/WorldGenPine.java | 10 +-- .../server/worldgen/tree/WorldGenSavanna.java | 4 +- .../server/worldgen/tree/WorldGenSwamp.java | 8 +- .../server/worldgen/tree/WorldGenTaiga1.java | 4 +- .../server/worldgen/tree/WorldGenTaiga2.java | 4 +- .../server/worldgen/tree/WorldGenTree.java | 2 +- 51 files changed, 270 insertions(+), 246 deletions(-) rename server/src/main/java/server/worldgen/{ => component}/FeatureDungeons.java (96%) rename server/src/main/java/server/worldgen/{ => component}/FeatureLakes.java (99%) rename server/src/main/java/server/worldgen/{ => component}/FeatureLiquids.java (99%) rename server/src/main/java/server/worldgen/{ => component}/FeatureOres.java (99%) rename server/src/main/java/server/worldgen/{ => generator}/BiomeGenPerlin.java (95%) rename server/src/main/java/server/worldgen/{ => generator}/ChunkGenerator.java (80%) rename server/src/main/java/server/worldgen/{ => generator}/GeneratorCavern.java (98%) rename server/src/main/java/server/worldgen/{ => generator}/GeneratorDestroyed.java (92%) rename server/src/main/java/server/worldgen/{ => generator}/GeneratorFlat.java (93%) rename server/src/main/java/server/worldgen/{ => generator}/GeneratorIsland.java (98%) rename server/src/main/java/server/worldgen/{ => generator}/GeneratorPerlin.java (86%) rename server/src/main/java/server/worldgen/{ => generator}/GeneratorSettings.java (95%) rename server/src/main/java/server/worldgen/{ => generator}/GeneratorSimple.java (89%) rename server/src/main/java/server/worldgen/{ => layer}/Biome.java (93%) rename server/src/main/java/server/worldgen/{ => layer}/BiomeGenerator.java (92%) create mode 100644 server/src/main/java/server/worldgen/populator/PopulatorAlphaLike.java rename server/src/main/java/server/worldgen/{ => replacer}/BlockReplacer.java (83%) rename server/src/main/java/server/worldgen/{ => replacer}/ReplacerAltBiome.java (94%) rename server/src/main/java/server/worldgen/{ => replacer}/ReplacerAltSimple.java (95%) rename server/src/main/java/server/worldgen/{ => replacer}/ReplacerAltSurface.java (98%) rename server/src/main/java/server/worldgen/{ => replacer}/ReplacerBiome.java (93%) rename server/src/main/java/server/worldgen/{ => replacer}/ReplacerMesa.java (99%) rename server/src/main/java/server/worldgen/{ => replacer}/ReplacerTerranian.java (98%) rename server/src/main/java/server/worldgen/{ => replacer}/ReplacerTopLayer.java (97%) diff --git a/server/src/main/java/server/dimension/GeneratorData.java b/server/src/main/java/server/dimension/GeneratorData.java index 9b79809b..85cd4689 100644 --- a/server/src/main/java/server/dimension/GeneratorData.java +++ b/server/src/main/java/server/dimension/GeneratorData.java @@ -10,16 +10,16 @@ import common.init.BlockRegistry; import common.init.MetalType; import common.rng.WeightedList; import common.world.State; -import server.worldgen.BiomeGenerator; -import server.worldgen.BlockReplacer; -import server.worldgen.ChunkGenerator; -import server.worldgen.FeatureDungeons; -import server.worldgen.FeatureLakes; -import server.worldgen.FeatureLiquids; -import server.worldgen.FeatureOres; import server.worldgen.RngSpawn; import server.worldgen.caves.MapGenBase; +import server.worldgen.component.FeatureDungeons; +import server.worldgen.component.FeatureLakes; +import server.worldgen.component.FeatureLiquids; +import server.worldgen.component.FeatureOres; +import server.worldgen.generator.ChunkGenerator; +import server.worldgen.layer.BiomeGenerator; import server.worldgen.populator.Populator; +import server.worldgen.replacer.BlockReplacer; import server.worldgen.structure.MapGenStructure; public class GeneratorData { diff --git a/server/src/main/java/server/init/UniverseRegistry.java b/server/src/main/java/server/init/UniverseRegistry.java index 551d4460..a6b3275c 100755 --- a/server/src/main/java/server/init/UniverseRegistry.java +++ b/server/src/main/java/server/init/UniverseRegistry.java @@ -55,22 +55,18 @@ import server.dimension.Domain; import server.dimension.Galaxy; import server.dimension.GeneratorData; import server.dimension.Sector; -import server.worldgen.Biome; -import server.worldgen.BiomeGenerator; -import server.worldgen.FeatureDungeons; -import server.worldgen.GeneratorCavern; -import server.worldgen.GeneratorFlat; -import server.worldgen.GeneratorPerlin; -import server.worldgen.GeneratorSimple; -import server.worldgen.ReplacerAltBiome; -import server.worldgen.ReplacerAltSimple; -import server.worldgen.ReplacerAltSurface; -import server.worldgen.ReplacerMesa; -import server.worldgen.ReplacerTerranian; import server.worldgen.Scaling; import server.worldgen.caves.MapGenBigCaves; import server.worldgen.caves.MapGenCaves; import server.worldgen.caves.MapGenRavine; +import server.worldgen.component.FeatureDungeons; +import server.worldgen.generator.GeneratorCavern; +import server.worldgen.generator.GeneratorFlat; +import server.worldgen.generator.GeneratorPerlin; +import server.worldgen.generator.GeneratorSimple; +import server.worldgen.layer.Biome; +import server.worldgen.layer.BiomeGenerator; +import server.worldgen.populator.PopulatorAlphaLike; import server.worldgen.populator.PopulatorAsteroids; import server.worldgen.populator.PopulatorTerranian; import server.worldgen.populator.PopulatorBlackened; @@ -79,6 +75,11 @@ import server.worldgen.populator.PopulatorForest; import server.worldgen.populator.PopulatorHell; import server.worldgen.populator.PopulatorMesa; import server.worldgen.populator.PopulatorTian; +import server.worldgen.replacer.ReplacerAltBiome; +import server.worldgen.replacer.ReplacerAltSimple; +import server.worldgen.replacer.ReplacerAltSurface; +import server.worldgen.replacer.ReplacerMesa; +import server.worldgen.replacer.ReplacerTerranian; import server.worldgen.structure.MapGenBridge; import server.worldgen.structure.MapGenMineshaft; import server.worldgen.structure.MapGenScatteredFeature; @@ -513,7 +514,7 @@ public abstract class UniverseRegistry extends DimensionRegistry { registerSector("Solar", () -> { registerStar("Sol", 695508000, 274.0f, 5778.0f, () -> { registerPlanet("Terra", new Planet(6378136, 8766144L, 24000L, 28.0f, 9.81f, 259.15f, Blocks.stone.getState(), Blocks.water.getState(), 63), new GeneratorData() - .setGenerator(new GeneratorPerlin(true)) + .setGenerator(new GeneratorPerlin(false)) .setReplacer(new ReplacerTerranian(Blocks.grass.getState(), Blocks.dirt.getState(), Blocks.gravel.getState(), Blocks.sand.getState())) .setPopulator(new PopulatorTerranian()) .setBiomeGen(new BiomeGenerator(new Biome(8.0f, 80.0f), false, 4, 4, 6, 50, @@ -523,7 +524,7 @@ public abstract class UniverseRegistry extends DimensionRegistry { new Biome[] {new Biome(-20.0f, 50.0f, Scaling.PLAINS_LOW), new Biome(-20.0f, 50.0f, Scaling.PLAINS_LOW), new Biome(-20.0f, 50.0f, Scaling.PLAINS_LOW), new Biome(-40.0f, 40.0f, Scaling.PLAINS_MEDIUM), new Biome(-8.0f, 80.0f, Scaling.PLAINS_MEDIUM)})) .enableSnow() .addCaveGen(new MapGenCaves(Blocks.lava.getState()), new MapGenRavine(Blocks.lava.getState())) - .addFeature(new FeatureDungeons(8)) + .addFeature(new FeatureDungeons(8, 256)) .addLake(Blocks.water.getState(), null, Blocks.grass.getState(), 4, 0, 255, false) .addLake(Blocks.lava.getState(), Blocks.stone.getState(), null, 8, 8, 255, true) .addLiquid(Blocks.flowing_water.getState(), 50, 8, 255, false) @@ -619,7 +620,7 @@ public abstract class UniverseRegistry extends DimensionRegistry { registerPlanet("gharoth", "Elbenplanet Gharoth", new Planet(2806382, 4837386L, 52960L, 30.0f, 10.0f, 257.3f + 8.0f, Blocks.dirt.getState(), Blocks.water.getState(), 64), //TODO: check temp new GeneratorData().setGenerator(new GeneratorSimple(true)) .setReplacer(new ReplacerAltBiome(Blocks.grass.getState(), Blocks.dirt.getState(), Blocks.gravel.getState(), Blocks.sand.getState())) - .setPopulator(new PopulatorForest(4)).addCaveGen(new MapGenCaves(Blocks.air.getState())).addFeature(new FeatureDungeons(4)).enableSnow() + .setPopulator(new PopulatorForest(4)).addCaveGen(new MapGenCaves(Blocks.air.getState())).addFeature(new FeatureDungeons(4, 256)).enableSnow() .addLake(Blocks.water.getState(), null, Blocks.grass.getState(), 4, 0, 255, false) .addLake(Blocks.lava.getState(), null, null, 8, 8, 255, true) .addLiquid(Blocks.flowing_water.getState(), 50, 8, 255, false) @@ -634,11 +635,11 @@ public abstract class UniverseRegistry extends DimensionRegistry { .addSpawn(EntityElf.class, 12, 4, 16) .addSpawn(EntityFox.class, 3, 2, 5)); registerPlanet("transylvania", "Vampirplanet Transsylvanien", new Planet(8374921, 33850466L, 49760L, 20.0f, 10.0f, 255.5f, Blocks.rock.getState(), Blocks.water.getState(), 63), - new GeneratorData().setGenerator(new GeneratorPerlin(true)) + new GeneratorData().setGenerator(new GeneratorPerlin(false)) .setReplacer(new ReplacerAltSimple(Blocks.grass.getState(), Blocks.dirt.getState(), Blocks.gravel.getState())) .setBiomeGen(new BiomeGenerator(new Biome(8.0f, 80.0f), true, 5, 3, 3, 30)) .setPopulator(new PopulatorForest(3)).addCaveGen(new MapGenCaves(Blocks.lava.getState()), new MapGenRavine(Blocks.lava.getState())) - .addFeature(new FeatureDungeons(10)).enableSnow() + .addFeature(new FeatureDungeons(10, 256)).enableSnow() .addLake(Blocks.water.getState(), null, Blocks.grass.getState(), 4, 0, 255, false) .addLake(Blocks.lava.getState(), null, null, 8, 8, 255, true) .addLiquid(Blocks.flowing_water.getState(), 50, 8, 255, false) @@ -691,7 +692,7 @@ public abstract class UniverseRegistry extends DimensionRegistry { new GeneratorData().setGenerator(new GeneratorPerlin()) .setReplacer(new ReplacerAltSimple(Blocks.blackened_soil.getState(), Blocks.blackened_dirt.getState(), Blocks.blackened_cobble.getState())) .setPopulator(new PopulatorBlackened()) - .addCaveGen(new MapGenCaves(Blocks.air.getState())).addFeature(new FeatureDungeons(4)) + .addCaveGen(new MapGenCaves(Blocks.air.getState())).addFeature(new FeatureDungeons(4, 256)) .addLake(Blocks.goo.getState(), null, null, 8, 8, 255, true) // .addOre(Blocks.PLACEHOLDER_ore.getState(), 0, 2, 3, 0, 12, false) .addSpawn(EntityMetalhead.class, 50, 1, 1) @@ -699,6 +700,35 @@ public abstract class UniverseRegistry extends DimensionRegistry { }); }); }); + registerGalaxy("External", () -> { + registerSector("Internal", () -> { + registerStar("Caddy", 568413297, 296.0f, 6379.0f, () -> { + registerPlanet("alpha", "Alpha", new Planet(7620619, 8766144L, 24000L, 28.0f, 9.81f, 259.15f, Blocks.stone.getState(), Blocks.water.getState(), 64), + new GeneratorData().setGenerator(new GeneratorSimple(true, true)) + .setReplacer(new ReplacerAltBiome(Blocks.grass.getState(), Blocks.dirt.getState(), Blocks.gravel.getState(), Blocks.sand.getState())) + .setPopulator(new PopulatorAlphaLike()).addCaveGen(new MapGenCaves(Blocks.lava.getState())).addFeature(new FeatureDungeons(8, 128)).enableSnow() + .addLake(Blocks.water.getState(), null, Blocks.grass.getState(), 4, 0, 128, false) + .addLake(Blocks.lava.getState(), null, null, 8, 8, 128, true) + .addLiquid(Blocks.flowing_water.getState(), 50, 8, 128, false) + .addLiquid(Blocks.flowing_lava.getState(), 20, 8, 128, true) + .addOre(Blocks.dirt.getState(), 20, 0, 32, 0, 128, false) + .addOre(Blocks.gravel.getState(), 10, 0, 32, 0, 128, false) + .addOre(Blocks.coal_ore.getState(), 20, 0, 16, 0, 128, false) + .addOre(Blocks.iron_ore.getState(), 20, 0, 8, 0, 64, false) + .addOre(Blocks.gold_ore.getState(), 2, 0, 8, 0, 32, false) + .addOre(Blocks.diamond_ore.getState(), 1, 0, 7, 0, 16, false) + .addSpawn(EntitySheep.class, 12, 4, 4) + .addSpawn(EntityPig.class, 10, 4, 4) + .addSpawn(EntityChicken.class, 10, 4, 4) + .addSpawn(EntityCow.class, 8, 4, 4) + .addSpawn(EntityArachnoid.class, 100, 4, 4) + .addSpawn(EntityZombie.class, 100, 4, 4) + .addSpawn(EntityUndead.class, 100, 4, 4) + .addSpawn(EntitySlime.class, 100, 4, 4) + ); + }); + }); + }); GeneratorData warp = new GeneratorData().setGenerator(new GeneratorPerlin(1.0F, 2.0F)).setPopulator(new PopulatorChaos()) .addCaveGen(new MapGenCaves(Blocks.air.getState()), new MapGenBigCaves(), new MapGenRavine(Blocks.air.getState())).enableSnow() diff --git a/server/src/main/java/server/network/Player.java b/server/src/main/java/server/network/Player.java index 97927523..0476ed29 100755 --- a/server/src/main/java/server/network/Player.java +++ b/server/src/main/java/server/network/Player.java @@ -137,7 +137,7 @@ import server.vars.SVars; import server.world.ChunkServer; import server.world.Region; import server.world.WorldServer; -import server.worldgen.BiomeGenerator; +import server.worldgen.layer.BiomeGenerator; public class Player extends User implements Executor, IPlayer { diff --git a/server/src/main/java/server/world/NextTickListEntry.java b/server/src/main/java/server/world/NextTickListEntry.java index ce04bc8f..14ea8401 100755 --- a/server/src/main/java/server/world/NextTickListEntry.java +++ b/server/src/main/java/server/world/NextTickListEntry.java @@ -3,66 +3,46 @@ package server.world; import common.block.Block; import common.util.BlockPos; -public class NextTickListEntry implements Comparable -{ - /** The id number for the next tick entry */ - private static long nextTickEntryID; - private final Block block; - public final BlockPos position; +public class NextTickListEntry implements Comparable { + private static long nextId; - /** Time this tick is scheduled to occur at */ - public long scheduledTime; - public int priority; + private final Block block; + public final BlockPos position; + private final long id; + public long scheduledTime; + public int priority; - /** The id of the tick entry */ - private long tickEntryID; + public NextTickListEntry(BlockPos pos, Block block) { + this.id = nextId++; + this.position = pos; + this.block = block; + } - public NextTickListEntry(BlockPos positionIn, Block blockIn) - { - this.tickEntryID = (long)(nextTickEntryID++); - this.position = positionIn; - this.block = blockIn; - } + public boolean equals(Object obj) { + if(!(obj instanceof NextTickListEntry other)) + return false; + return this.position.equals(other.position) && this.block != null && this.block == other.block; + } - public boolean equals(Object p_equals_1_) - { - if (!(p_equals_1_ instanceof NextTickListEntry)) - { - return false; - } - else - { - NextTickListEntry nextticklistentry = (NextTickListEntry)p_equals_1_; - return this.position.equals(nextticklistentry.position) && this.block != null && this.block == nextticklistentry.block; - } - } + public int hashCode() { + return this.position.hashCode(); + } - public int hashCode() - { - return this.position.hashCode(); - } + public NextTickListEntry setScheduledTime(long time) { + this.scheduledTime = time; + return this; + } - /** - * Sets the scheduled time for this tick entry - */ - public NextTickListEntry setScheduledTime(long scheduledTimeIn) - { - this.scheduledTime = scheduledTimeIn; - return this; - } + public void setPriority(int priority) { + this.priority = priority; + } - public void setPriority(int priorityIn) - { - this.priority = priorityIn; - } + public int compareTo(NextTickListEntry other) { + return this.scheduledTime < other.scheduledTime ? -1 + : (this.scheduledTime > other.scheduledTime ? 1 : (this.priority != other.priority ? this.priority - other.priority : (this.id < other.id ? -1 : (this.id > other.id ? 1 : 0)))); + } - public int compareTo(NextTickListEntry p_compareTo_1_) - { - return this.scheduledTime < p_compareTo_1_.scheduledTime ? -1 : (this.scheduledTime > p_compareTo_1_.scheduledTime ? 1 : (this.priority != p_compareTo_1_.priority ? this.priority - p_compareTo_1_.priority : (this.tickEntryID < p_compareTo_1_.tickEntryID ? -1 : (this.tickEntryID > p_compareTo_1_.tickEntryID ? 1 : 0)))); - } - - public Block getBlock() - { - return this.block; - } + public Block getBlock() { + return this.block; + } } diff --git a/server/src/main/java/server/world/WorldServer.java b/server/src/main/java/server/world/WorldServer.java index 9a28e5ed..90dfe240 100755 --- a/server/src/main/java/server/world/WorldServer.java +++ b/server/src/main/java/server/world/WorldServer.java @@ -83,21 +83,21 @@ import server.network.Player; import server.rng.PerlinGen; import server.vars.SVars; import server.village.VillageCollection; -import server.worldgen.BiomeGenerator; -import server.worldgen.BlockReplacer; -import server.worldgen.ChunkGenerator; import server.worldgen.ChunkPrimer; -import server.worldgen.FeatureDungeons; import server.worldgen.FeatureGenerator; -import server.worldgen.FeatureLakes; -import server.worldgen.FeatureLiquids; -import server.worldgen.FeatureOres; -import server.worldgen.GeneratorDestroyed; -import server.worldgen.GeneratorFlat; import server.worldgen.RngSpawn; import server.worldgen.caves.MapGenBase; +import server.worldgen.component.FeatureDungeons; +import server.worldgen.component.FeatureLakes; +import server.worldgen.component.FeatureLiquids; +import server.worldgen.component.FeatureOres; import server.worldgen.foliage.WorldGenBigMushroom; +import server.worldgen.generator.ChunkGenerator; +import server.worldgen.generator.GeneratorDestroyed; +import server.worldgen.generator.GeneratorFlat; +import server.worldgen.layer.BiomeGenerator; import server.worldgen.populator.Populator; +import server.worldgen.replacer.BlockReplacer; import server.worldgen.structure.MapGenStructure; import server.worldgen.structure.MapGenVillage; import server.worldgen.tree.WorldGenBaseTree; diff --git a/server/src/main/java/server/worldgen/FeatureGenerator.java b/server/src/main/java/server/worldgen/FeatureGenerator.java index 95f63315..52bd234e 100755 --- a/server/src/main/java/server/worldgen/FeatureGenerator.java +++ b/server/src/main/java/server/worldgen/FeatureGenerator.java @@ -5,31 +5,20 @@ import common.util.BlockPos; import common.world.State; import server.world.WorldServer; -public abstract class FeatureGenerator -{ - private final boolean doBlockNotify; +public abstract class FeatureGenerator { + private final boolean notify; - public FeatureGenerator() - { - this(false); - } + public FeatureGenerator() { + this(false); + } - public FeatureGenerator(boolean notify) - { - this.doBlockNotify = notify; - } + public FeatureGenerator(boolean notify) { + this.notify = notify; + } - public abstract boolean generate(WorldServer worldIn, Random rand, BlockPos position); + public abstract boolean generate(WorldServer world, Random rand, BlockPos pos); - protected void setBlockAndNotifyAdequately(WorldServer worldIn, BlockPos pos, State state) - { - if (this.doBlockNotify) - { - worldIn.setState(pos, state, 3); - } - else - { - worldIn.setState(pos, state, 2); - } - } + protected final void setBlockNotify(WorldServer world, BlockPos pos, State state) { + world.setState(pos, state, this.notify ? 3 : 2); + } } diff --git a/server/src/main/java/server/worldgen/FeatureDungeons.java b/server/src/main/java/server/worldgen/component/FeatureDungeons.java similarity index 96% rename from server/src/main/java/server/worldgen/FeatureDungeons.java rename to server/src/main/java/server/worldgen/component/FeatureDungeons.java index d45c18bf..6bdd9e40 100755 --- a/server/src/main/java/server/worldgen/FeatureDungeons.java +++ b/server/src/main/java/server/worldgen/component/FeatureDungeons.java @@ -1,4 +1,4 @@ -package server.worldgen; +package server.worldgen.component; import java.lang.reflect.InvocationTargetException; @@ -20,22 +20,25 @@ import common.vars.Vars; import common.world.World; import server.vars.SVars; import server.world.WorldServer; +import server.worldgen.LootConstants; public class FeatureDungeons { private static final Class[] MOB_TYPES = new Class[] {EntityUndead.class, EntityZombie.class, EntityZombie.class, EntityArachnoid.class}; private final int chance; + private final int height; - public FeatureDungeons(int chance) { + public FeatureDungeons(int chance, int height) { this.chance = chance; + this.height = height < 1 ? 1 : height; } public boolean generate(WorldServer worldIn, Random rand, BlockPos position) { boolean flag = false; for(int z = 0; z < this.chance; z++) { - flag |= this.generateDungeon(worldIn, rand, position.add(rand.chOffset(), rand.zrange(256), rand.chOffset())); + flag |= this.generateDungeon(worldIn, rand, position.add(rand.chOffset(), rand.zrange(this.height), rand.chOffset())); } return flag; } diff --git a/server/src/main/java/server/worldgen/FeatureLakes.java b/server/src/main/java/server/worldgen/component/FeatureLakes.java similarity index 99% rename from server/src/main/java/server/worldgen/FeatureLakes.java rename to server/src/main/java/server/worldgen/component/FeatureLakes.java index f31d5bcf..265747c1 100755 --- a/server/src/main/java/server/worldgen/FeatureLakes.java +++ b/server/src/main/java/server/worldgen/component/FeatureLakes.java @@ -1,4 +1,4 @@ -package server.worldgen; +package server.worldgen.component; import common.block.Block; import common.block.Material; diff --git a/server/src/main/java/server/worldgen/FeatureLiquids.java b/server/src/main/java/server/worldgen/component/FeatureLiquids.java similarity index 99% rename from server/src/main/java/server/worldgen/FeatureLiquids.java rename to server/src/main/java/server/worldgen/component/FeatureLiquids.java index 69f58714..ab796c4d 100755 --- a/server/src/main/java/server/worldgen/FeatureLiquids.java +++ b/server/src/main/java/server/worldgen/component/FeatureLiquids.java @@ -1,4 +1,4 @@ -package server.worldgen; +package server.worldgen.component; import common.block.Block; import common.init.Blocks; diff --git a/server/src/main/java/server/worldgen/FeatureOres.java b/server/src/main/java/server/worldgen/component/FeatureOres.java similarity index 99% rename from server/src/main/java/server/worldgen/FeatureOres.java rename to server/src/main/java/server/worldgen/component/FeatureOres.java index bd61fc65..2b8607a7 100755 --- a/server/src/main/java/server/worldgen/FeatureOres.java +++ b/server/src/main/java/server/worldgen/component/FeatureOres.java @@ -1,4 +1,4 @@ -package server.worldgen; +package server.worldgen.component; import common.block.Block; import common.rng.Random; diff --git a/server/src/main/java/server/worldgen/feature/WorldGenIceSpike.java b/server/src/main/java/server/worldgen/feature/WorldGenIceSpike.java index 97d8efd3..e103a2cb 100755 --- a/server/src/main/java/server/worldgen/feature/WorldGenIceSpike.java +++ b/server/src/main/java/server/worldgen/feature/WorldGenIceSpike.java @@ -51,7 +51,7 @@ public class WorldGenIceSpike extends FeatureGenerator if (block == Blocks.air || block == Blocks.dirt || block == Blocks.snow || block == Blocks.ice) { - this.setBlockAndNotifyAdequately(worldIn, position.add(i1, k, j1), Blocks.packed_ice.getState()); + this.setBlockNotify(worldIn, position.add(i1, k, j1), Blocks.packed_ice.getState()); } if (k != 0 && l > 1) @@ -60,7 +60,7 @@ public class WorldGenIceSpike extends FeatureGenerator if (block == Blocks.air || block == Blocks.dirt || block == Blocks.snow || block == Blocks.ice) { - this.setBlockAndNotifyAdequately(worldIn, position.add(i1, -k, j1), Blocks.packed_ice.getState()); + this.setBlockNotify(worldIn, position.add(i1, -k, j1), Blocks.packed_ice.getState()); } } } @@ -100,7 +100,7 @@ public class WorldGenIceSpike extends FeatureGenerator break; } - this.setBlockAndNotifyAdequately(worldIn, blockpos, Blocks.packed_ice.getState()); + this.setBlockNotify(worldIn, blockpos, Blocks.packed_ice.getState()); blockpos = blockpos.down(); --j2; diff --git a/server/src/main/java/server/worldgen/foliage/WorldGenBigMushroom.java b/server/src/main/java/server/worldgen/foliage/WorldGenBigMushroom.java index 092dea27..eeaa2d26 100755 --- a/server/src/main/java/server/worldgen/foliage/WorldGenBigMushroom.java +++ b/server/src/main/java/server/worldgen/foliage/WorldGenBigMushroom.java @@ -193,7 +193,7 @@ public class WorldGenBigMushroom extends FeatureGenerator if (!worldIn.getState(blockpos).getBlock().isFullBlock()) { - this.setBlockAndNotifyAdequately(worldIn, blockpos, this.mushroomType.getState().withProperty(BlockHugeMushroom.VARIANT, dir)); + this.setBlockNotify(worldIn, blockpos, this.mushroomType.getState().withProperty(BlockHugeMushroom.VARIANT, dir)); } } } @@ -206,7 +206,7 @@ public class WorldGenBigMushroom extends FeatureGenerator if (!block2.isFullBlock()) { - this.setBlockAndNotifyAdequately(worldIn, position.up(i3), this.mushroomType.getState().withProperty(BlockHugeMushroom.VARIANT, BlockHugeMushroom.EnumType.STEM)); + this.setBlockNotify(worldIn, position.up(i3), this.mushroomType.getState().withProperty(BlockHugeMushroom.VARIANT, BlockHugeMushroom.EnumType.STEM)); } } diff --git a/server/src/main/java/server/worldgen/foliage/WorldGenShrub.java b/server/src/main/java/server/worldgen/foliage/WorldGenShrub.java index 5d1566a2..ea7790ca 100755 --- a/server/src/main/java/server/worldgen/foliage/WorldGenShrub.java +++ b/server/src/main/java/server/worldgen/foliage/WorldGenShrub.java @@ -37,7 +37,7 @@ public class WorldGenShrub extends WorldGenBaseTree if (block1 == Blocks.dirt || block1 == Blocks.grass) { position = position.up(); - this.setBlockAndNotifyAdequately(worldIn, position, this.woodMetadata); + this.setBlockNotify(worldIn, position, this.woodMetadata); for (int i = position.getY(); i <= position.getY() + 2; ++i) { @@ -58,7 +58,7 @@ public class WorldGenShrub extends WorldGenBaseTree if (!worldIn.getState(blockpos).getBlock().isFullBlock()) { - this.setBlockAndNotifyAdequately(worldIn, blockpos, BlockLeaves.getLeavesBlock(this.leavesMetadata, worldIn.getLeavesGen(blockpos)).getState().withProperty(BlockLeaves.DECAY, Boolean.valueOf(false))); + this.setBlockNotify(worldIn, blockpos, BlockLeaves.getLeavesBlock(this.leavesMetadata, worldIn.getLeavesGen(blockpos)).getState().withProperty(BlockLeaves.DECAY, Boolean.valueOf(false))); } } } diff --git a/server/src/main/java/server/worldgen/BiomeGenPerlin.java b/server/src/main/java/server/worldgen/generator/BiomeGenPerlin.java similarity index 95% rename from server/src/main/java/server/worldgen/BiomeGenPerlin.java rename to server/src/main/java/server/worldgen/generator/BiomeGenPerlin.java index 48f42e6b..1144c712 100755 --- a/server/src/main/java/server/worldgen/BiomeGenPerlin.java +++ b/server/src/main/java/server/worldgen/generator/BiomeGenPerlin.java @@ -1,4 +1,4 @@ -package server.worldgen; +package server.worldgen.generator; import common.rng.Random; import server.rng.PerlinGenOld; diff --git a/server/src/main/java/server/worldgen/ChunkGenerator.java b/server/src/main/java/server/worldgen/generator/ChunkGenerator.java similarity index 80% rename from server/src/main/java/server/worldgen/ChunkGenerator.java rename to server/src/main/java/server/worldgen/generator/ChunkGenerator.java index 032ac12d..5f3f34ec 100755 --- a/server/src/main/java/server/worldgen/ChunkGenerator.java +++ b/server/src/main/java/server/worldgen/generator/ChunkGenerator.java @@ -1,9 +1,10 @@ -package server.worldgen; +package server.worldgen.generator; import common.dimension.Dimension; import common.rng.Random; import server.dimension.GeneratorData; import server.world.WorldServer; +import server.worldgen.ChunkPrimer; public interface ChunkGenerator { public void generateChunk(WorldServer world, int x, int z, ChunkPrimer primer); diff --git a/server/src/main/java/server/worldgen/GeneratorCavern.java b/server/src/main/java/server/worldgen/generator/GeneratorCavern.java similarity index 98% rename from server/src/main/java/server/worldgen/GeneratorCavern.java rename to server/src/main/java/server/worldgen/generator/GeneratorCavern.java index 82e06070..8e56846e 100755 --- a/server/src/main/java/server/worldgen/GeneratorCavern.java +++ b/server/src/main/java/server/worldgen/generator/GeneratorCavern.java @@ -1,4 +1,4 @@ -package server.worldgen; +package server.worldgen.generator; import common.dimension.Dimension; import common.rng.Random; @@ -7,6 +7,7 @@ import common.world.State; import server.dimension.GeneratorData; import server.rng.OctaveGen; import server.world.WorldServer; +import server.worldgen.ChunkPrimer; public class GeneratorCavern implements ChunkGenerator { diff --git a/server/src/main/java/server/worldgen/GeneratorDestroyed.java b/server/src/main/java/server/worldgen/generator/GeneratorDestroyed.java similarity index 92% rename from server/src/main/java/server/worldgen/GeneratorDestroyed.java rename to server/src/main/java/server/worldgen/generator/GeneratorDestroyed.java index 28527400..ceea0dab 100755 --- a/server/src/main/java/server/worldgen/GeneratorDestroyed.java +++ b/server/src/main/java/server/worldgen/generator/GeneratorDestroyed.java @@ -1,4 +1,4 @@ -package server.worldgen; +package server.worldgen.generator; import common.dimension.Dimension; import common.init.Blocks; @@ -6,6 +6,7 @@ import common.rng.Random; import common.world.State; import server.dimension.GeneratorData; import server.world.WorldServer; +import server.worldgen.ChunkPrimer; public class GeneratorDestroyed implements ChunkGenerator { diff --git a/server/src/main/java/server/worldgen/GeneratorFlat.java b/server/src/main/java/server/worldgen/generator/GeneratorFlat.java similarity index 93% rename from server/src/main/java/server/worldgen/GeneratorFlat.java rename to server/src/main/java/server/worldgen/generator/GeneratorFlat.java index 82485745..e26b9298 100755 --- a/server/src/main/java/server/worldgen/GeneratorFlat.java +++ b/server/src/main/java/server/worldgen/generator/GeneratorFlat.java @@ -1,4 +1,4 @@ -package server.worldgen; +package server.worldgen.generator; import java.util.Arrays; import java.util.List; @@ -9,6 +9,7 @@ import common.rng.Random; import common.world.State; import server.dimension.GeneratorData; import server.world.WorldServer; +import server.worldgen.ChunkPrimer; public class GeneratorFlat implements ChunkGenerator { private State[] layers; diff --git a/server/src/main/java/server/worldgen/GeneratorIsland.java b/server/src/main/java/server/worldgen/generator/GeneratorIsland.java similarity index 98% rename from server/src/main/java/server/worldgen/GeneratorIsland.java rename to server/src/main/java/server/worldgen/generator/GeneratorIsland.java index 7bc89589..c27c9fe3 100755 --- a/server/src/main/java/server/worldgen/GeneratorIsland.java +++ b/server/src/main/java/server/worldgen/generator/GeneratorIsland.java @@ -1,4 +1,4 @@ -package server.worldgen; +package server.worldgen.generator; import common.dimension.Dimension; import common.rng.Random; @@ -7,6 +7,7 @@ import common.world.State; import server.dimension.GeneratorData; import server.rng.OctaveGen; import server.world.WorldServer; +import server.worldgen.ChunkPrimer; public class GeneratorIsland implements ChunkGenerator { diff --git a/server/src/main/java/server/worldgen/GeneratorPerlin.java b/server/src/main/java/server/worldgen/generator/GeneratorPerlin.java similarity index 86% rename from server/src/main/java/server/worldgen/GeneratorPerlin.java rename to server/src/main/java/server/worldgen/generator/GeneratorPerlin.java index 3bff3ba8..f28812d0 100755 --- a/server/src/main/java/server/worldgen/GeneratorPerlin.java +++ b/server/src/main/java/server/worldgen/generator/GeneratorPerlin.java @@ -1,4 +1,4 @@ -package server.worldgen; +package server.worldgen.generator; import java.util.Arrays; @@ -9,7 +9,9 @@ import common.world.State; import server.dimension.GeneratorData; import server.rng.NoiseGen; import server.rng.OctaveGen; +import server.rng.OctaveGenOld; import server.world.WorldServer; +import server.worldgen.ChunkPrimer; public class GeneratorPerlin implements ChunkGenerator { @@ -26,7 +28,8 @@ public class GeneratorPerlin implements ChunkGenerator } } - private final boolean biomes; + private final boolean biomes; + private final boolean farlands; private NoiseGen lowerNoiseGen; private NoiseGen upperNoiseGen; private NoiseGen mainNoiseGen; @@ -57,40 +60,48 @@ public class GeneratorPerlin implements ChunkGenerator private final float[] depths = new float[100]; private final float[] scales = new float[100]; - public GeneratorPerlin(float depth, float scale) { - this(new GeneratorSettings(), depth, scale); - } - - public GeneratorPerlin() { - this(new GeneratorSettings(), 0.1f, 0.2f); - } - - public GeneratorPerlin(boolean biomes) { - this(biomes, new GeneratorSettings()); - } - - public GeneratorPerlin(GeneratorSettings settings, float depth, float scale) { - this(false, settings); + // fixed biome values + public GeneratorPerlin(boolean farlands, GeneratorSettings settings, float depth, float scale) { + this(farlands, false, settings); Arrays.fill(this.depths, depth); Arrays.fill(this.scales, scale); } - public GeneratorPerlin(GeneratorSettings settings) { - this(true, settings); + public GeneratorPerlin(boolean farlands, float depth, float scale) { + this(farlands, new GeneratorSettings(), depth, scale); + } + + public GeneratorPerlin(float depth, float scale) { + this(false, depth, scale); } - public GeneratorPerlin(boolean biomes, GeneratorSettings settings) { - this(biomes, settings.coordinateScale, settings.heightScale, settings.upperLimitScale, settings.lowerLimitScale, + public GeneratorPerlin() { + this(0.1f, 0.2f); + } + + // biome values from generator + public GeneratorPerlin(boolean farlands, GeneratorSettings settings) { + this(farlands, true, settings); + } + + public GeneratorPerlin(boolean farlands) { + this(farlands, new GeneratorSettings()); + } + + // internal + private GeneratorPerlin(boolean farlands, boolean biomes, GeneratorSettings settings) { + this(farlands, biomes, settings.coordinateScale, settings.heightScale, settings.upperLimitScale, settings.lowerLimitScale, settings.depthNoiseScaleX, settings.depthNoiseScaleZ, settings.amplification, settings.mainNoiseScaleX, settings.mainNoiseScaleY, settings.mainNoiseScaleZ, settings.baseSize, settings.stretchY, settings.biomeDepthWeight, settings.biomeDepthOffset, settings.biomeScaleWeight, settings.biomeScaleOffset); } - private GeneratorPerlin(boolean biomes, float coordinateScale, float heightScale, float upperLimitScale, float lowerLimitScale, float depthNoiseScaleX, + private GeneratorPerlin(boolean farlands, boolean biomes, float coordinateScale, float heightScale, float upperLimitScale, float lowerLimitScale, float depthNoiseScaleX, float depthNoiseScaleZ, float amplification, float mainNoiseScaleX, float mainNoiseScaleY, float mainNoiseScaleZ, float baseSize, float stretchY, float biomeDepthWeight, float biomeDepthOffset, float biomeScaleWeight, float biomeScaleOffset) { this.biomes = biomes; + this.farlands = farlands; this.coordinateScale = coordinateScale; this.heightScale = heightScale; this.upperLimitScale = upperLimitScale; @@ -110,10 +121,10 @@ public class GeneratorPerlin implements ChunkGenerator } public void init(Random rand, Dimension dim, GeneratorData gen) { - this.lowerNoiseGen = /* farlands ? new OctaveGenOld(rand, 16) : */ new OctaveGen(rand, 16); - this.upperNoiseGen = /* farlands ? new OctaveGenOld(rand, 16) : */ new OctaveGen(rand, 16); - this.mainNoiseGen = /* farlands ? new OctaveGenOld(rand, 8) : */ new OctaveGen(rand, 8); - this.depthNoiseGen = /* farlands ? new OctaveGenOld(rand, 16) : */ new OctaveGen(rand, 16); + this.lowerNoiseGen = this.farlands ? new OctaveGenOld(rand, 16) : new OctaveGen(rand, 16); + this.upperNoiseGen = this.farlands ? new OctaveGenOld(rand, 16) : new OctaveGen(rand, 16); + this.mainNoiseGen = this.farlands ? new OctaveGenOld(rand, 8) : new OctaveGen(rand, 8); + this.depthNoiseGen = this.farlands ? new OctaveGenOld(rand, 16) : new OctaveGen(rand, 16); this.block = dim.getFiller(); this.liquid = dim.getLiquid(); } diff --git a/server/src/main/java/server/worldgen/GeneratorSettings.java b/server/src/main/java/server/worldgen/generator/GeneratorSettings.java similarity index 95% rename from server/src/main/java/server/worldgen/GeneratorSettings.java rename to server/src/main/java/server/worldgen/generator/GeneratorSettings.java index b205497f..79261112 100644 --- a/server/src/main/java/server/worldgen/GeneratorSettings.java +++ b/server/src/main/java/server/worldgen/generator/GeneratorSettings.java @@ -1,4 +1,4 @@ -package server.worldgen; +package server.worldgen.generator; public class GeneratorSettings { public float coordinateScale = 684.412F; diff --git a/server/src/main/java/server/worldgen/GeneratorSimple.java b/server/src/main/java/server/worldgen/generator/GeneratorSimple.java similarity index 89% rename from server/src/main/java/server/worldgen/GeneratorSimple.java rename to server/src/main/java/server/worldgen/generator/GeneratorSimple.java index f51b9267..764feb80 100755 --- a/server/src/main/java/server/worldgen/GeneratorSimple.java +++ b/server/src/main/java/server/worldgen/generator/GeneratorSimple.java @@ -1,4 +1,4 @@ -package server.worldgen; +package server.worldgen.generator; import common.dimension.Dimension; import common.rng.Random; @@ -6,11 +6,14 @@ import common.world.State; import server.dimension.GeneratorData; import server.rng.NoiseGen; import server.rng.OctaveGen; +import server.rng.OctaveGenOld; import server.world.WorldServer; +import server.worldgen.ChunkPrimer; public class GeneratorSimple implements ChunkGenerator { private final boolean biomes; + private final boolean farlands; private BiomeGenPerlin biomeGen; private NoiseGen lowerNoiseGen; private NoiseGen upperNoiseGen; @@ -28,18 +31,22 @@ public class GeneratorSimple implements ChunkGenerator private final double depthNoise[] = new double[25]; private final double[] factors = new double[256]; - public GeneratorSimple(boolean biomes) - { - this.biomes = biomes; - } + public GeneratorSimple(boolean farlands, boolean biomes) { + this.biomes = biomes; + this.farlands = farlands; + } + + public GeneratorSimple(boolean biomes) { + this(false, biomes); + } public void init(Random rand, Dimension dim, GeneratorData gen) { this.biomeGen = this.biomes ? new BiomeGenPerlin(rand.longv()) : null; - this.lowerNoiseGen = /* farlands ? new OctaveGenOld(rand, 16) : */ new OctaveGen(rand, 16); - this.upperNoiseGen = /* farlands ? new OctaveGenOld(rand, 16) : */ new OctaveGen(rand, 16); - this.mainNoiseGen = /* farlands ? new OctaveGenOld(rand, 8) : */ new OctaveGen(rand, 8); - this.biomeNoiseGen = /* farlands ? new OctaveGenOld(rand, 10) : */ new OctaveGen(rand, 10); - this.depthNoiseGen = /* farlands ? new OctaveGenOld(rand, 16) : */ new OctaveGen(rand, 16); + this.lowerNoiseGen = this.farlands ? new OctaveGenOld(rand, 16) : new OctaveGen(rand, 16); + this.upperNoiseGen = this.farlands ? new OctaveGenOld(rand, 16) : new OctaveGen(rand, 16); + this.mainNoiseGen = this.farlands ? new OctaveGenOld(rand, 8) : new OctaveGen(rand, 8); + this.biomeNoiseGen = this.farlands ? new OctaveGenOld(rand, 10) : new OctaveGen(rand, 10); + this.depthNoiseGen = this.farlands ? new OctaveGenOld(rand, 16) : new OctaveGen(rand, 16); this.filler = dim.getFiller(); this.liquid = dim.getLiquid(); } diff --git a/server/src/main/java/server/worldgen/Biome.java b/server/src/main/java/server/worldgen/layer/Biome.java similarity index 93% rename from server/src/main/java/server/worldgen/Biome.java rename to server/src/main/java/server/worldgen/layer/Biome.java index 5af15db4..54faac12 100644 --- a/server/src/main/java/server/worldgen/Biome.java +++ b/server/src/main/java/server/worldgen/layer/Biome.java @@ -1,4 +1,6 @@ -package server.worldgen; +package server.worldgen.layer; + +import server.worldgen.Scaling; public final class Biome { public final float temperature; diff --git a/server/src/main/java/server/worldgen/BiomeGenerator.java b/server/src/main/java/server/worldgen/layer/BiomeGenerator.java similarity index 92% rename from server/src/main/java/server/worldgen/BiomeGenerator.java rename to server/src/main/java/server/worldgen/layer/BiomeGenerator.java index 1525df34..153065f6 100755 --- a/server/src/main/java/server/worldgen/BiomeGenerator.java +++ b/server/src/main/java/server/worldgen/layer/BiomeGenerator.java @@ -1,27 +1,11 @@ -package server.worldgen; +package server.worldgen.layer; import java.util.List; import common.collect.Lists; import common.util.BlockPos; import common.util.LongHashMap; -import server.worldgen.layer.GenLayer; -import server.worldgen.layer.GenLayerAddAreas; -import server.worldgen.layer.GenLayerAddExtra; -import server.worldgen.layer.GenLayerAddSea; -import server.worldgen.layer.GenLayerAddSnow; -import server.worldgen.layer.GenLayerBase; -import server.worldgen.layer.GenLayerBiome; -import server.worldgen.layer.GenLayerEdge; -import server.worldgen.layer.GenLayerFuzzyZoom; -import server.worldgen.layer.GenLayerRemoveEmpty; -import server.worldgen.layer.GenLayerRiver; -import server.worldgen.layer.GenLayerRiverInit; -import server.worldgen.layer.GenLayerRiverMix; -import server.worldgen.layer.GenLayerSmooth; -import server.worldgen.layer.GenLayerVoronoiZoom; -import server.worldgen.layer.GenLayerZoom; -import server.worldgen.layer.IntCache; +import server.worldgen.Scaling; public class BiomeGenerator { private class CacheBlock diff --git a/server/src/main/java/server/worldgen/layer/GenLayerAddExtra.java b/server/src/main/java/server/worldgen/layer/GenLayerAddExtra.java index 70ca5f5c..fca2000e 100755 --- a/server/src/main/java/server/worldgen/layer/GenLayerAddExtra.java +++ b/server/src/main/java/server/worldgen/layer/GenLayerAddExtra.java @@ -1,7 +1,5 @@ package server.worldgen.layer; -import server.worldgen.Biome; - public class GenLayerAddExtra extends GenLayer { private final int[] biomes; diff --git a/server/src/main/java/server/worldgen/layer/GenLayerBiome.java b/server/src/main/java/server/worldgen/layer/GenLayerBiome.java index f0e02021..a24d9b51 100755 --- a/server/src/main/java/server/worldgen/layer/GenLayerBiome.java +++ b/server/src/main/java/server/worldgen/layer/GenLayerBiome.java @@ -1,7 +1,5 @@ package server.worldgen.layer; -import server.worldgen.Biome; - public class GenLayerBiome extends GenLayer { private final Biome[] hot; diff --git a/server/src/main/java/server/worldgen/layer/GenLayerRiverMix.java b/server/src/main/java/server/worldgen/layer/GenLayerRiverMix.java index 6b0df1d7..a0fff2db 100755 --- a/server/src/main/java/server/worldgen/layer/GenLayerRiverMix.java +++ b/server/src/main/java/server/worldgen/layer/GenLayerRiverMix.java @@ -3,7 +3,6 @@ package server.worldgen.layer; import java.util.Set; import common.collect.Sets; -import server.worldgen.Biome; public class GenLayerRiverMix extends GenLayer { public static final int NONE = 0; diff --git a/server/src/main/java/server/worldgen/populator/PopulatorAlphaLike.java b/server/src/main/java/server/worldgen/populator/PopulatorAlphaLike.java new file mode 100644 index 00000000..2b17a0cb --- /dev/null +++ b/server/src/main/java/server/worldgen/populator/PopulatorAlphaLike.java @@ -0,0 +1,20 @@ +package server.worldgen.populator; + +import common.rng.Random; +import common.util.BlockPos; +import server.rng.PerlinGen; +import server.world.WorldServer; + +public class PopulatorAlphaLike extends PopulatorBasic { + protected static final PerlinGen TREE_NOISE = new PerlinGen(new Random(726528729282625L), 8); + + public PopulatorAlphaLike() { + this.grassPerChunk = 0; + this.clayExtPerChunk = 10; + } + + public void decorate(WorldServer world, Random rand, BlockPos pos) { + this.treesPerChunk = (int)((TREE_NOISE.generate((double)pos.getX() * 0.5D, (double)pos.getZ() * 0.5D) / 8D + rand.doublev() * 4D + 4D) / 3D) + 5; + super.decorate(world, rand, pos); + } +} diff --git a/server/src/main/java/server/worldgen/populator/PopulatorBasic.java b/server/src/main/java/server/worldgen/populator/PopulatorBasic.java index edd5d240..1dce7fd5 100755 --- a/server/src/main/java/server/worldgen/populator/PopulatorBasic.java +++ b/server/src/main/java/server/worldgen/populator/PopulatorBasic.java @@ -4,7 +4,6 @@ import common.block.foliage.BlockFlower; import common.init.Blocks; import common.rng.Random; import common.util.BlockPos; -import server.rng.PerlinGen; import server.world.WorldServer; import server.worldgen.FeatureGenerator; import server.worldgen.feature.WorldGenClay; @@ -25,7 +24,6 @@ import server.worldgen.tree.WorldGenBigTree; import server.worldgen.tree.WorldGenTree; public abstract class PopulatorBasic implements Populator { - protected static final PerlinGen TREE_NOISE = new PerlinGen(new Random(726528729282625L), 8); protected static final FeatureDoublePlant DOUBLE_PLANT_GEN = new FeatureDoublePlant(); protected final WorldGenBaseTree worldGeneratorTrees = new WorldGenBaseTree(false); @@ -60,13 +58,6 @@ public abstract class PopulatorBasic implements Populator { { return rand.chance(10) ? this.worldGeneratorBigTree : this.worldGeneratorTrees; } - - protected WorldGenTree genBigTreeLegacy(Random rand, BlockPos pos, boolean humid) - { - int noise = (int)((TREE_NOISE.generate((double)pos.getX() * 0.5D, (double)pos.getZ() * 0.5D) / 8D + rand.doublev() * 4D + 4D) / 3D); - return (noise > 0 && rand.chance(noise)) || (humid && rand.chance(3)) ? this.worldGeneratorBigTree : - this.worldGeneratorTrees; - } protected FeatureGenerator getRandomWorldGenForGrass(Random rand) { diff --git a/server/src/main/java/server/worldgen/populator/PopulatorHell.java b/server/src/main/java/server/worldgen/populator/PopulatorHell.java index 16f0bb58..ba485265 100755 --- a/server/src/main/java/server/worldgen/populator/PopulatorHell.java +++ b/server/src/main/java/server/worldgen/populator/PopulatorHell.java @@ -4,7 +4,7 @@ import common.init.Blocks; import common.rng.Random; import common.util.BlockPos; import server.world.WorldServer; -import server.worldgen.FeatureOres; +import server.worldgen.component.FeatureOres; import server.worldgen.feature.WorldGenFire; import server.worldgen.feature.WorldGenGlowStone; import server.worldgen.feature.WorldGenHellLava; diff --git a/server/src/main/java/server/worldgen/populator/PopulatorHills.java b/server/src/main/java/server/worldgen/populator/PopulatorHills.java index 826ec956..debc39d6 100755 --- a/server/src/main/java/server/worldgen/populator/PopulatorHills.java +++ b/server/src/main/java/server/worldgen/populator/PopulatorHills.java @@ -4,7 +4,7 @@ import common.init.Blocks; import common.rng.Random; import common.util.BlockPos; import server.world.WorldServer; -import server.worldgen.FeatureOres; +import server.worldgen.component.FeatureOres; import server.worldgen.tree.WorldGenTaiga2; import server.worldgen.tree.WorldGenTree; diff --git a/server/src/main/java/server/worldgen/BlockReplacer.java b/server/src/main/java/server/worldgen/replacer/BlockReplacer.java similarity index 83% rename from server/src/main/java/server/worldgen/BlockReplacer.java rename to server/src/main/java/server/worldgen/replacer/BlockReplacer.java index 4cc6dc6b..65530d7a 100755 --- a/server/src/main/java/server/worldgen/BlockReplacer.java +++ b/server/src/main/java/server/worldgen/replacer/BlockReplacer.java @@ -1,10 +1,11 @@ -package server.worldgen; +package server.worldgen.replacer; import common.dimension.Dimension; import common.rng.Random; import common.world.State; import server.dimension.GeneratorData; import server.world.WorldServer; +import server.worldgen.ChunkPrimer; public interface BlockReplacer { void replaceBlocks(WorldServer world, int x, int z, ChunkPrimer primer, Random rand); diff --git a/server/src/main/java/server/worldgen/ReplacerAltBiome.java b/server/src/main/java/server/worldgen/replacer/ReplacerAltBiome.java similarity index 94% rename from server/src/main/java/server/worldgen/ReplacerAltBiome.java rename to server/src/main/java/server/worldgen/replacer/ReplacerAltBiome.java index 852d4905..ff95c5e0 100755 --- a/server/src/main/java/server/worldgen/ReplacerAltBiome.java +++ b/server/src/main/java/server/worldgen/replacer/ReplacerAltBiome.java @@ -1,4 +1,4 @@ -package server.worldgen; +package server.worldgen.replacer; import common.block.Block; import common.dimension.Dimension; @@ -6,15 +6,15 @@ import common.init.Blocks; import common.rng.Random; import common.world.State; import server.dimension.GeneratorData; -import server.rng.NoiseGen; import server.rng.OctaveGen; import server.world.WorldServer; +import server.worldgen.ChunkPrimer; public class ReplacerAltBiome implements BlockReplacer { private final boolean useFiller; - private NoiseGen altNoiseGen; - private NoiseGen exclNoiseGen; + private OctaveGen altNoiseGen; + private OctaveGen exclNoiseGen; private State filler; private State top; diff --git a/server/src/main/java/server/worldgen/ReplacerAltSimple.java b/server/src/main/java/server/worldgen/replacer/ReplacerAltSimple.java similarity index 95% rename from server/src/main/java/server/worldgen/ReplacerAltSimple.java rename to server/src/main/java/server/worldgen/replacer/ReplacerAltSimple.java index ec3586dd..2f879ce5 100644 --- a/server/src/main/java/server/worldgen/ReplacerAltSimple.java +++ b/server/src/main/java/server/worldgen/replacer/ReplacerAltSimple.java @@ -1,4 +1,4 @@ -package server.worldgen; +package server.worldgen.replacer; import common.dimension.Dimension; import common.init.Blocks; @@ -7,6 +7,7 @@ import common.util.BlockPos; import common.world.State; import server.dimension.GeneratorData; import server.world.WorldServer; +import server.worldgen.ChunkPrimer; public class ReplacerAltSimple extends ReplacerBiome { diff --git a/server/src/main/java/server/worldgen/ReplacerAltSurface.java b/server/src/main/java/server/worldgen/replacer/ReplacerAltSurface.java similarity index 98% rename from server/src/main/java/server/worldgen/ReplacerAltSurface.java rename to server/src/main/java/server/worldgen/replacer/ReplacerAltSurface.java index bbcaa777..080273db 100755 --- a/server/src/main/java/server/worldgen/ReplacerAltSurface.java +++ b/server/src/main/java/server/worldgen/replacer/ReplacerAltSurface.java @@ -1,4 +1,4 @@ -package server.worldgen; +package server.worldgen.replacer; import common.block.Block; import common.dimension.Dimension; @@ -8,6 +8,7 @@ import common.world.State; import server.dimension.GeneratorData; import server.rng.OctaveGen; import server.world.WorldServer; +import server.worldgen.ChunkPrimer; public class ReplacerAltSurface implements BlockReplacer { diff --git a/server/src/main/java/server/worldgen/ReplacerBiome.java b/server/src/main/java/server/worldgen/replacer/ReplacerBiome.java similarity index 93% rename from server/src/main/java/server/worldgen/ReplacerBiome.java rename to server/src/main/java/server/worldgen/replacer/ReplacerBiome.java index f186aebc..2af33837 100755 --- a/server/src/main/java/server/worldgen/ReplacerBiome.java +++ b/server/src/main/java/server/worldgen/replacer/ReplacerBiome.java @@ -1,4 +1,4 @@ -package server.worldgen; +package server.worldgen.replacer; import common.block.Block; import common.block.Material; @@ -8,6 +8,7 @@ import common.world.State; import server.dimension.GeneratorData; import server.rng.PerlinGen; import server.world.WorldServer; +import server.worldgen.ChunkPrimer; public abstract class ReplacerBiome implements BlockReplacer { diff --git a/server/src/main/java/server/worldgen/ReplacerMesa.java b/server/src/main/java/server/worldgen/replacer/ReplacerMesa.java similarity index 99% rename from server/src/main/java/server/worldgen/ReplacerMesa.java rename to server/src/main/java/server/worldgen/replacer/ReplacerMesa.java index 8f6e8054..2aa6885a 100644 --- a/server/src/main/java/server/worldgen/ReplacerMesa.java +++ b/server/src/main/java/server/worldgen/replacer/ReplacerMesa.java @@ -1,4 +1,4 @@ -package server.worldgen; +package server.worldgen.replacer; import java.util.Arrays; @@ -10,6 +10,7 @@ import common.world.State; import server.dimension.GeneratorData; import server.rng.PerlinGen; import server.world.WorldServer; +import server.worldgen.ChunkPrimer; public class ReplacerMesa extends ReplacerBiome { diff --git a/server/src/main/java/server/worldgen/ReplacerTerranian.java b/server/src/main/java/server/worldgen/replacer/ReplacerTerranian.java similarity index 98% rename from server/src/main/java/server/worldgen/ReplacerTerranian.java rename to server/src/main/java/server/worldgen/replacer/ReplacerTerranian.java index 34aef815..ebb37a65 100644 --- a/server/src/main/java/server/worldgen/ReplacerTerranian.java +++ b/server/src/main/java/server/worldgen/replacer/ReplacerTerranian.java @@ -1,4 +1,4 @@ -package server.worldgen; +package server.worldgen.replacer; import common.block.foliage.BlockLilyPad; import common.dimension.Dimension; @@ -9,6 +9,7 @@ import common.world.State; import server.dimension.GeneratorData; import server.rng.PerlinGen; import server.world.WorldServer; +import server.worldgen.ChunkPrimer; public class ReplacerTerranian extends ReplacerAltSimple { private PerlinGen grassNoiseGen; diff --git a/server/src/main/java/server/worldgen/ReplacerTopLayer.java b/server/src/main/java/server/worldgen/replacer/ReplacerTopLayer.java similarity index 97% rename from server/src/main/java/server/worldgen/ReplacerTopLayer.java rename to server/src/main/java/server/worldgen/replacer/ReplacerTopLayer.java index 8cef0914..3225d9fd 100755 --- a/server/src/main/java/server/worldgen/ReplacerTopLayer.java +++ b/server/src/main/java/server/worldgen/replacer/ReplacerTopLayer.java @@ -1,4 +1,4 @@ -package server.worldgen; +package server.worldgen.replacer; import common.block.Block; import common.dimension.Dimension; @@ -7,6 +7,7 @@ import common.rng.Random; import common.world.State; import server.dimension.GeneratorData; import server.world.WorldServer; +import server.worldgen.ChunkPrimer; public class ReplacerTopLayer implements BlockReplacer { diff --git a/server/src/main/java/server/worldgen/tree/WorldGenBaseTree.java b/server/src/main/java/server/worldgen/tree/WorldGenBaseTree.java index a1312b96..f7d9f3a8 100755 --- a/server/src/main/java/server/worldgen/tree/WorldGenBaseTree.java +++ b/server/src/main/java/server/worldgen/tree/WorldGenBaseTree.java @@ -117,7 +117,7 @@ public class WorldGenBaseTree extends WorldGenTree if (block == Blocks.air || block.getMaterial() == Material.LEAVES || block.getMaterial() == Material.BUSH) { - this.setBlockAndNotifyAdequately(worldIn, blockpos, this.metaLeaves == null ? Blocks.dry_leaves.getState() : BlockLeaves.getLeavesBlock(this.metaLeaves, worldIn.getLeavesGen(blockpos)).getState().withProperty(BlockLeaves.DECAY, Boolean.valueOf(false))); + this.setBlockNotify(worldIn, blockpos, this.metaLeaves == null ? Blocks.dry_leaves.getState() : BlockLeaves.getLeavesBlock(this.metaLeaves, worldIn.getLeavesGen(blockpos)).getState().withProperty(BlockLeaves.DECAY, Boolean.valueOf(false))); } } } @@ -130,7 +130,7 @@ public class WorldGenBaseTree extends WorldGenTree if (block2 == Blocks.air || block2.getMaterial() == Material.LEAVES || block2.getMaterial() == Material.BUSH || block2 == Blocks.dry_leaves) { - this.setBlockAndNotifyAdequately(worldIn, position.up(j3), this.metaWood); + this.setBlockNotify(worldIn, position.up(j3), this.metaWood); if (this.vinesGrow && j3 > 0) { @@ -219,7 +219,7 @@ public class WorldGenBaseTree extends WorldGenTree private void func_181651_a(WorldServer p_181651_1_, BlockPos p_181651_2_, PropertyBool p_181651_3_) { - this.setBlockAndNotifyAdequately(p_181651_1_, p_181651_2_, Blocks.vine.getState().withProperty(p_181651_3_, Boolean.valueOf(true))); + this.setBlockNotify(p_181651_1_, p_181651_2_, Blocks.vine.getState().withProperty(p_181651_3_, Boolean.valueOf(true))); } private void func_181650_b(WorldServer p_181650_1_, BlockPos p_181650_2_, PropertyBool p_181650_3_) diff --git a/server/src/main/java/server/worldgen/tree/WorldGenBigTree.java b/server/src/main/java/server/worldgen/tree/WorldGenBigTree.java index da9ac1bc..c0d45066 100755 --- a/server/src/main/java/server/worldgen/tree/WorldGenBigTree.java +++ b/server/src/main/java/server/worldgen/tree/WorldGenBigTree.java @@ -131,7 +131,7 @@ public class WorldGenBigTree extends WorldGenTree if (block == Blocks.air || block.getMaterial() == Material.LEAVES) { - this.setBlockAndNotifyAdequately(this.world, blockpos, p_181631_3_); + this.setBlockNotify(this.world, blockpos, p_181631_3_); } } } @@ -194,7 +194,7 @@ public class WorldGenBigTree extends WorldGenTree { BlockPos blockpos1 = p_175937_1_.add((double)(0.5F + (float)j * f), (double)(0.5F + (float)j * f1), (double)(0.5F + (float)j * f2)); Facing.Axis blocklog$enumaxis = this.func_175938_b(p_175937_1_, blockpos1); - this.setBlockAndNotifyAdequately(this.world, blockpos1, this.logBase.withProperty(BlockLog.AXIS, blocklog$enumaxis)); + this.setBlockNotify(this.world, blockpos1, this.logBase.withProperty(BlockLog.AXIS, blocklog$enumaxis)); } } diff --git a/server/src/main/java/server/worldgen/tree/WorldGenBirch.java b/server/src/main/java/server/worldgen/tree/WorldGenBirch.java index 6fb934a6..9d648ffb 100755 --- a/server/src/main/java/server/worldgen/tree/WorldGenBirch.java +++ b/server/src/main/java/server/worldgen/tree/WorldGenBirch.java @@ -103,7 +103,7 @@ public class WorldGenBirch extends WorldGenTree if (block == Blocks.air || block.getMaterial() == Material.LEAVES) { - this.setBlockAndNotifyAdequately(worldIn, blockpos, BlockLeaves.getLeavesBlock(leavesBlock, worldIn.getLeavesGen(blockpos)).getState().withProperty(BlockLeaves.DECAY, Boolean.valueOf(false))); + this.setBlockNotify(worldIn, blockpos, BlockLeaves.getLeavesBlock(leavesBlock, worldIn.getLeavesGen(blockpos)).getState().withProperty(BlockLeaves.DECAY, Boolean.valueOf(false))); } } } @@ -116,7 +116,7 @@ public class WorldGenBirch extends WorldGenTree if (block2 == Blocks.air || block2.getMaterial() == Material.LEAVES) { - this.setBlockAndNotifyAdequately(worldIn, position.up(j2), logBlock); + this.setBlockNotify(worldIn, position.up(j2), logBlock); } } diff --git a/server/src/main/java/server/worldgen/tree/WorldGenDarkOak.java b/server/src/main/java/server/worldgen/tree/WorldGenDarkOak.java index 5ed0ba55..86afa98b 100755 --- a/server/src/main/java/server/worldgen/tree/WorldGenDarkOak.java +++ b/server/src/main/java/server/worldgen/tree/WorldGenDarkOak.java @@ -201,7 +201,7 @@ public class WorldGenDarkOak extends WorldGenTree { if (this.canBeReplaced(p_181639_1_.getState(p_181639_2_).getBlock())) { - this.setBlockAndNotifyAdequately(p_181639_1_, p_181639_2_, logBlock); + this.setBlockNotify(p_181639_1_, p_181639_2_, logBlock); } } @@ -212,7 +212,7 @@ public class WorldGenDarkOak extends WorldGenTree if (block == Blocks.air) { - this.setBlockAndNotifyAdequately(worldIn, blockpos, BlockLeaves.getLeavesBlock(leavesBlock, worldIn.getLeavesGen(blockpos)).getState().withProperty(BlockLeaves.DECAY, Boolean.valueOf(false))); + this.setBlockNotify(worldIn, blockpos, BlockLeaves.getLeavesBlock(leavesBlock, worldIn.getLeavesGen(blockpos)).getState().withProperty(BlockLeaves.DECAY, Boolean.valueOf(false))); } } } diff --git a/server/src/main/java/server/worldgen/tree/WorldGenHugeTree.java b/server/src/main/java/server/worldgen/tree/WorldGenHugeTree.java index b2a09d1b..e772e4c0 100755 --- a/server/src/main/java/server/worldgen/tree/WorldGenHugeTree.java +++ b/server/src/main/java/server/worldgen/tree/WorldGenHugeTree.java @@ -124,7 +124,7 @@ public abstract class WorldGenHugeTree extends WorldGenTree if (block == Blocks.air || block.getMaterial() == Material.LEAVES) { - this.setBlockAndNotifyAdequately(worldIn, blockpos, BlockLeaves.getLeavesBlock(this.leavesMetadata, worldIn.getLeavesGen(blockpos)).getState().withProperty(BlockLeaves.DECAY, Boolean.valueOf(false))); + this.setBlockNotify(worldIn, blockpos, BlockLeaves.getLeavesBlock(this.leavesMetadata, worldIn.getLeavesGen(blockpos)).getState().withProperty(BlockLeaves.DECAY, Boolean.valueOf(false))); } } } @@ -146,7 +146,7 @@ public abstract class WorldGenHugeTree extends WorldGenTree if (block == Blocks.air || block.getMaterial() == Material.LEAVES) { - this.setBlockAndNotifyAdequately(worldIn, blockpos, BlockLeaves.getLeavesBlock(this.leavesMetadata, worldIn.getLeavesGen(blockpos)).getState().withProperty(BlockLeaves.DECAY, Boolean.valueOf(false))); + this.setBlockNotify(worldIn, blockpos, BlockLeaves.getLeavesBlock(this.leavesMetadata, worldIn.getLeavesGen(blockpos)).getState().withProperty(BlockLeaves.DECAY, Boolean.valueOf(false))); } } } diff --git a/server/src/main/java/server/worldgen/tree/WorldGenJungle.java b/server/src/main/java/server/worldgen/tree/WorldGenJungle.java index 03e15476..154b6234 100755 --- a/server/src/main/java/server/worldgen/tree/WorldGenJungle.java +++ b/server/src/main/java/server/worldgen/tree/WorldGenJungle.java @@ -39,7 +39,7 @@ public class WorldGenJungle extends WorldGenHugeTree { k = position.getX() + (int)(1.5F + ExtMath.cos(f) * (float)i1); l = position.getZ() + (int)(1.5F + ExtMath.sin(f) * (float)i1); - this.setBlockAndNotifyAdequately(worldIn, new BlockPos(k, j - 3 + i1 / 2, l), this.woodMetadata); + this.setBlockNotify(worldIn, new BlockPos(k, j - 3 + i1 / 2, l), this.woodMetadata); } int j2 = 1 + rand.zrange(2); @@ -58,7 +58,7 @@ public class WorldGenJungle extends WorldGenHugeTree if (this.canBeReplaced(worldIn.getState(blockpos).getBlock())) { - this.setBlockAndNotifyAdequately(worldIn, blockpos, this.woodMetadata); + this.setBlockNotify(worldIn, blockpos, this.woodMetadata); if (i2 > 0) { @@ -73,7 +73,7 @@ public class WorldGenJungle extends WorldGenHugeTree if (this.canBeReplaced(worldIn.getState(blockpos1).getBlock())) { - this.setBlockAndNotifyAdequately(worldIn, blockpos1, this.woodMetadata); + this.setBlockNotify(worldIn, blockpos1, this.woodMetadata); if (i2 > 0) { @@ -86,7 +86,7 @@ public class WorldGenJungle extends WorldGenHugeTree if (this.canBeReplaced(worldIn.getState(blockpos2).getBlock())) { - this.setBlockAndNotifyAdequately(worldIn, blockpos2, this.woodMetadata); + this.setBlockNotify(worldIn, blockpos2, this.woodMetadata); if (i2 > 0) { @@ -99,7 +99,7 @@ public class WorldGenJungle extends WorldGenHugeTree if (this.canBeReplaced(worldIn.getState(blockpos3).getBlock())) { - this.setBlockAndNotifyAdequately(worldIn, blockpos3, this.woodMetadata); + this.setBlockNotify(worldIn, blockpos3, this.woodMetadata); if (i2 > 0) { @@ -118,7 +118,7 @@ public class WorldGenJungle extends WorldGenHugeTree { if (p_181632_2_.zrange(3) > 0 && p_181632_1_.isAirBlock(p_181632_3_)) { - this.setBlockAndNotifyAdequately(p_181632_1_, p_181632_3_, Blocks.vine.getState().withProperty(p_181632_4_, Boolean.valueOf(true))); + this.setBlockNotify(p_181632_1_, p_181632_3_, Blocks.vine.getState().withProperty(p_181632_4_, Boolean.valueOf(true))); } } diff --git a/server/src/main/java/server/worldgen/tree/WorldGenPine.java b/server/src/main/java/server/worldgen/tree/WorldGenPine.java index 344dd6b4..ef43c14b 100755 --- a/server/src/main/java/server/worldgen/tree/WorldGenPine.java +++ b/server/src/main/java/server/worldgen/tree/WorldGenPine.java @@ -42,7 +42,7 @@ public class WorldGenPine extends WorldGenHugeTree if (block == Blocks.air || block.getMaterial() == Material.LEAVES) { - this.setBlockAndNotifyAdequately(worldIn, position.up(j), this.woodMetadata); + this.setBlockNotify(worldIn, position.up(j), this.woodMetadata); } if (j < i - 1) @@ -51,21 +51,21 @@ public class WorldGenPine extends WorldGenHugeTree if (block == Blocks.air || block.getMaterial() == Material.LEAVES) { - this.setBlockAndNotifyAdequately(worldIn, position.add(1, j, 0), this.woodMetadata); + this.setBlockNotify(worldIn, position.add(1, j, 0), this.woodMetadata); } block = worldIn.getState(position.add(1, j, 1)).getBlock(); if (block == Blocks.air || block.getMaterial() == Material.LEAVES) { - this.setBlockAndNotifyAdequately(worldIn, position.add(1, j, 1), this.woodMetadata); + this.setBlockNotify(worldIn, position.add(1, j, 1), this.woodMetadata); } block = worldIn.getState(position.add(0, j, 1)).getBlock(); if (block == Blocks.air || block.getMaterial() == Material.LEAVES) { - this.setBlockAndNotifyAdequately(worldIn, position.add(0, j, 1), this.woodMetadata); + this.setBlockNotify(worldIn, position.add(0, j, 1), this.woodMetadata); } } } @@ -131,7 +131,7 @@ public class WorldGenPine extends WorldGenHugeTree if (block == Blocks.grass || block == Blocks.dirt || block == Blocks.coarse_dirt || block == Blocks.podzol) { - this.setBlockAndNotifyAdequately(worldIn, blockpos, field_181635_g); + this.setBlockNotify(worldIn, blockpos, field_181635_g); break; } diff --git a/server/src/main/java/server/worldgen/tree/WorldGenSavanna.java b/server/src/main/java/server/worldgen/tree/WorldGenSavanna.java index a1772468..0e4bbabd 100755 --- a/server/src/main/java/server/worldgen/tree/WorldGenSavanna.java +++ b/server/src/main/java/server/worldgen/tree/WorldGenSavanna.java @@ -204,7 +204,7 @@ public class WorldGenSavanna extends WorldGenTree private void func_181642_b(WorldServer p_181642_1_, BlockPos p_181642_2_) { - this.setBlockAndNotifyAdequately(p_181642_1_, p_181642_2_, field_181643_a); + this.setBlockNotify(p_181642_1_, p_181642_2_, field_181643_a); } private void func_175924_b(WorldServer worldIn, BlockPos p_175924_2_) @@ -213,7 +213,7 @@ public class WorldGenSavanna extends WorldGenTree if (block == Blocks.air || block.getMaterial() == Material.LEAVES) { - this.setBlockAndNotifyAdequately(worldIn, p_175924_2_, BlockLeaves.getLeavesBlock(field_181644_b, worldIn.getLeavesGen(p_175924_2_)).getState().withProperty(BlockLeaves.DECAY, Boolean.valueOf(false))); + this.setBlockNotify(worldIn, p_175924_2_, BlockLeaves.getLeavesBlock(field_181644_b, worldIn.getLeavesGen(p_175924_2_)).getState().withProperty(BlockLeaves.DECAY, Boolean.valueOf(false))); } } } diff --git a/server/src/main/java/server/worldgen/tree/WorldGenSwamp.java b/server/src/main/java/server/worldgen/tree/WorldGenSwamp.java index 9e287cda..c2209996 100755 --- a/server/src/main/java/server/worldgen/tree/WorldGenSwamp.java +++ b/server/src/main/java/server/worldgen/tree/WorldGenSwamp.java @@ -112,7 +112,7 @@ public class WorldGenSwamp extends WorldGenTree if (!worldIn.getState(blockpos).getBlock().isFullBlock()) { - this.setBlockAndNotifyAdequately(worldIn, blockpos, BlockLeaves.getLeavesBlock(field_181649_b, worldIn.getLeavesGen(blockpos)).getState().withProperty(BlockLeaves.DECAY, Boolean.valueOf(false))); + this.setBlockNotify(worldIn, blockpos, BlockLeaves.getLeavesBlock(field_181649_b, worldIn.getLeavesGen(blockpos)).getState().withProperty(BlockLeaves.DECAY, Boolean.valueOf(false))); } } } @@ -125,7 +125,7 @@ public class WorldGenSwamp extends WorldGenTree if (block2 == Blocks.air || block2.getMaterial() == Material.LEAVES || block2 == Blocks.flowing_water || block2 == Blocks.water) { - this.setBlockAndNotifyAdequately(worldIn, position.up(i2), field_181648_a); + this.setBlockNotify(worldIn, position.up(i2), field_181648_a); } } @@ -189,12 +189,12 @@ public class WorldGenSwamp extends WorldGenTree private void func_181647_a(WorldServer p_181647_1_, BlockPos p_181647_2_, PropertyBool p_181647_3_) { State iblockstate = Blocks.swamp_vine.getState().withProperty(p_181647_3_, Boolean.valueOf(true)); - this.setBlockAndNotifyAdequately(p_181647_1_, p_181647_2_, iblockstate); + this.setBlockNotify(p_181647_1_, p_181647_2_, iblockstate); int i = 4; for (p_181647_2_ = p_181647_2_.down(); p_181647_1_.getState(p_181647_2_).getBlock() == Blocks.air && i > 0; --i) { - this.setBlockAndNotifyAdequately(p_181647_1_, p_181647_2_, iblockstate); + this.setBlockNotify(p_181647_1_, p_181647_2_, iblockstate); p_181647_2_ = p_181647_2_.down(); } } diff --git a/server/src/main/java/server/worldgen/tree/WorldGenTaiga1.java b/server/src/main/java/server/worldgen/tree/WorldGenTaiga1.java index bbff9623..059f9324 100755 --- a/server/src/main/java/server/worldgen/tree/WorldGenTaiga1.java +++ b/server/src/main/java/server/worldgen/tree/WorldGenTaiga1.java @@ -95,7 +95,7 @@ public class WorldGenTaiga1 extends WorldGenTree if (!worldIn.getState(blockpos).getBlock().isFullBlock()) { - this.setBlockAndNotifyAdequately(worldIn, blockpos, BlockLeaves.getLeavesBlock(field_181637_b, worldIn.getLeavesGen(blockpos)).getState().withProperty(BlockLeaves.DECAY, Boolean.valueOf(false))); + this.setBlockNotify(worldIn, blockpos, BlockLeaves.getLeavesBlock(field_181637_b, worldIn.getLeavesGen(blockpos)).getState().withProperty(BlockLeaves.DECAY, Boolean.valueOf(false))); } } } @@ -117,7 +117,7 @@ public class WorldGenTaiga1 extends WorldGenTree if (block1 == Blocks.air || block1.getMaterial() == Material.LEAVES) { - this.setBlockAndNotifyAdequately(worldIn, position.up(i3), field_181636_a); + this.setBlockNotify(worldIn, position.up(i3), field_181636_a); } } diff --git a/server/src/main/java/server/worldgen/tree/WorldGenTaiga2.java b/server/src/main/java/server/worldgen/tree/WorldGenTaiga2.java index 04b218b5..2d9bfad8 100755 --- a/server/src/main/java/server/worldgen/tree/WorldGenTaiga2.java +++ b/server/src/main/java/server/worldgen/tree/WorldGenTaiga2.java @@ -101,7 +101,7 @@ public class WorldGenTaiga2 extends WorldGenTree if (!worldIn.getState(blockpos).getBlock().isFullBlock()) { - this.setBlockAndNotifyAdequately(worldIn, blockpos, BlockLeaves.getLeavesBlock(field_181646_b, worldIn.getLeavesGen(blockpos)).getState().withProperty(BlockLeaves.DECAY, Boolean.valueOf(false))); + this.setBlockNotify(worldIn, blockpos, BlockLeaves.getLeavesBlock(field_181646_b, worldIn.getLeavesGen(blockpos)).getState().withProperty(BlockLeaves.DECAY, Boolean.valueOf(false))); } } } @@ -132,7 +132,7 @@ public class WorldGenTaiga2 extends WorldGenTree if (block2 == Blocks.air || block2.getMaterial() == Material.LEAVES) { - this.setBlockAndNotifyAdequately(worldIn, position.up(k4), field_181645_a); + this.setBlockNotify(worldIn, position.up(k4), field_181645_a); } } diff --git a/server/src/main/java/server/worldgen/tree/WorldGenTree.java b/server/src/main/java/server/worldgen/tree/WorldGenTree.java index f3381a33..6a1238a6 100755 --- a/server/src/main/java/server/worldgen/tree/WorldGenTree.java +++ b/server/src/main/java/server/worldgen/tree/WorldGenTree.java @@ -35,7 +35,7 @@ public abstract class WorldGenTree extends FeatureGenerator { if (worldIn.getState(pos) != worldIn.gen.getTop()) { - this.setBlockAndNotifyAdequately(worldIn, pos, worldIn.gen.getTop()); // Blocks.dirt.getDefaultState()); + this.setBlockNotify(worldIn, pos, worldIn.gen.getTop()); // Blocks.dirt.getDefaultState()); } } }