Skip to content

Commit

Permalink
fix ore spawning + config option
Browse files Browse the repository at this point in the history 
default is to have ores spawn
  • Loading branch information
@Hennamann
Hennamann committed Feb 24, 2018
1 parent 82b11fe commit 6bc04e9
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 3 deletions.
3 changes: 3 additions & 0 deletions src/main/java/com/legacy/wasteland/config/WastelandConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ public static class Worldgen {
@Config.Comment("Should the bunker spawn with a bed?")
public boolean shouldSpawnBunkerBed = true;

@Config.Comment("Should ores generate?")
public boolean shouldSpawnOres = true;

public Block getSurfaceBlock() {
return Block.REGISTRY.getObject(new ResourceLocation(surfaceBlock));
}
Expand Down
85 changes: 82 additions & 3 deletions src/main/java/com/legacy/wasteland/world/biome/decorations/BiomeDecoratorWasteland.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,19 @@
import net.minecraft.world.World;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.BiomeDecorator;
import net.minecraft.world.gen.ChunkGeneratorSettings;
import net.minecraft.world.gen.ChunkGeneratorSettings.Factory;
import net.minecraft.world.gen.feature.WorldGenDeadBush;
import net.minecraft.world.gen.feature.WorldGenMinable;
import net.minecraft.world.gen.feature.WorldGenSand;
import net.minecraft.world.gen.feature.WorldGenerator;
import net.minecraftforge.event.terraingen.TerrainGen;
import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType;

public class BiomeDecoratorWasteland extends BiomeDecorator {
public BlockPos position;
public boolean decorating;
public ChunkGeneratorSettings chunkProviderSettings;
public int firePerChunk;
public int rubblePerChunk;
public int deadTreePerChunk;
Expand All @@ -51,6 +54,20 @@ public class BiomeDecoratorWasteland extends BiomeDecorator {
public WorldGenerator tent = new WorldGenSurvivalTent();
public WorldGenerator temple = new WorldGenRuinedRuins();
public WorldGenerator house = new WorldGenCivilizationRuins();
/** The dirt generator. */
public WorldGenerator dirtGen;
public WorldGenerator gravelOreGen;
public WorldGenerator graniteGen;
public WorldGenerator dioriteGen;
public WorldGenerator andesiteGen;
public WorldGenerator coalGen;
public WorldGenerator ironGen;
/** Field that holds gold WorldGenMinable */
public WorldGenerator goldGen;
public WorldGenerator redstoneGen;
public WorldGenerator diamondGen;
/** Field that holds Lapis WorldGenMinable */
public WorldGenerator lapisGen;

public BiomeDecoratorWasteland() {
this.firePerChunk = WastelandConfig.worldgen.randomFirePerChunk;
Expand All @@ -66,11 +83,9 @@ public void decorate(World worldIn, Random random, Biome biome, BlockPos pos) {
throw new RuntimeException("Already decorating");
} else {
this.position = pos;
this.chunkPos = pos;
this.deadBushPerChunk = 5;
this.chunkProviderSettings = Factory.jsonToFactory(worldIn.getWorldInfo().getGeneratorOptions()).build();
this.dirtGen = new WorldGenMinable(Blocks.DIRT.getDefaultState(), this.chunkProviderSettings.dirtSize);
this.gravelGen = new WorldGenMinable(Blocks.GRAVEL.getDefaultState(), this.chunkProviderSettings.gravelSize);
this.graniteGen = new WorldGenMinable(Blocks.STONE.getDefaultState().withProperty(BlockStone.VARIANT, EnumType.GRANITE), this.chunkProviderSettings.graniteSize);
this.dioriteGen = new WorldGenMinable(Blocks.STONE.getDefaultState().withProperty(BlockStone.VARIANT, EnumType.DIORITE), this.chunkProviderSettings.dioriteSize);
this.andesiteGen = new WorldGenMinable(Blocks.STONE.getDefaultState().withProperty(BlockStone.VARIANT, EnumType.ANDESITE), this.chunkProviderSettings.andesiteSize);
Expand All @@ -81,10 +96,15 @@ public void decorate(World worldIn, Random random, Biome biome, BlockPos pos) {
this.diamondGen = new WorldGenMinable(Blocks.DIAMOND_ORE.getDefaultState(), this.chunkProviderSettings.diamondSize);
this.lapisGen = new WorldGenMinable(Blocks.LAPIS_ORE.getDefaultState(), this.chunkProviderSettings.lapisSize);
this.genDecorations(biome, worldIn, random);
this.decorating = false;
}
}

@Override
protected void genDecorations(Biome biomeGenBaseIn, World world, Random random) {
net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.terraingen.DecorateBiomeEvent.Pre(world, random, position));
this.generateOres(world, random);

if(biomeGenBaseIn instanceof BiomeGenApocalypse) {
this.decorateWasteland(world, random);
} else if(biomeGenBaseIn instanceof BiomeGenMountains) {
Expand Down Expand Up @@ -118,7 +138,7 @@ protected void genDecorations(Biome biomeGenBaseIn, World world, Random random)
if(random.nextInt(WastelandConfig.worldgen.wastelandRuinRarirty) == 0) {
this.randomRubbleGen.generate(world, random, world.getHeight(this.position.add(random.nextInt(16) + 8, 0, random.nextInt(16) + 8)));
}

net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.terraingen.DecorateBiomeEvent.Post(world, random, chunkPos));
}

private void decorateDesert(World world, Random random) {
Expand All @@ -131,7 +151,66 @@ private void decorateDesert(World world, Random random) {
this.cactusGen.generate(world, random, this.position.add(l9, j19, k13));
}
}
}

@Override
protected void generateOres(World worldIn, Random random)
{
if (WastelandConfig.worldgen.shouldSpawnOres) {
net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Pre(worldIn, random, position));
if (net.minecraftforge.event.terraingen.TerrainGen.generateOre(worldIn, random, dirtGen, position, net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.DIRT))
this.genStandardOre1(worldIn, random, this.chunkProviderSettings.dirtCount, this.dirtGen, this.chunkProviderSettings.dirtMinHeight, this.chunkProviderSettings.dirtMaxHeight);
if (net.minecraftforge.event.terraingen.TerrainGen.generateOre(worldIn, random, dioriteGen, position, net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.DIORITE))
this.genStandardOre1(worldIn, random, this.chunkProviderSettings.dioriteCount, this.dioriteGen, this.chunkProviderSettings.dioriteMinHeight, this.chunkProviderSettings.dioriteMaxHeight);
if (net.minecraftforge.event.terraingen.TerrainGen.generateOre(worldIn, random, graniteGen, position, net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.GRANITE))
this.genStandardOre1(worldIn, random, this.chunkProviderSettings.graniteCount, this.graniteGen, this.chunkProviderSettings.graniteMinHeight, this.chunkProviderSettings.graniteMaxHeight);
if (net.minecraftforge.event.terraingen.TerrainGen.generateOre(worldIn, random, andesiteGen, position, net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.ANDESITE))
this.genStandardOre1(worldIn, random, this.chunkProviderSettings.andesiteCount, this.andesiteGen, this.chunkProviderSettings.andesiteMinHeight, this.chunkProviderSettings.andesiteMaxHeight);
if (net.minecraftforge.event.terraingen.TerrainGen.generateOre(worldIn, random, coalGen, position, net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.COAL))
this.genStandardOre1(worldIn, random, this.chunkProviderSettings.coalCount, this.coalGen, this.chunkProviderSettings.coalMinHeight, this.chunkProviderSettings.coalMaxHeight);
if (net.minecraftforge.event.terraingen.TerrainGen.generateOre(worldIn, random, ironGen, position, net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.IRON))
this.genStandardOre1(worldIn, random, this.chunkProviderSettings.ironCount, this.ironGen, this.chunkProviderSettings.ironMinHeight, this.chunkProviderSettings.ironMaxHeight);
if (net.minecraftforge.event.terraingen.TerrainGen.generateOre(worldIn, random, goldGen, position, net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.GOLD))
this.genStandardOre1(worldIn, random, this.chunkProviderSettings.goldCount, this.goldGen, this.chunkProviderSettings.goldMinHeight, this.chunkProviderSettings.goldMaxHeight);
if (net.minecraftforge.event.terraingen.TerrainGen.generateOre(worldIn, random, redstoneGen, position, net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.REDSTONE))
this.genStandardOre1(worldIn, random, this.chunkProviderSettings.redstoneCount, this.redstoneGen, this.chunkProviderSettings.redstoneMinHeight, this.chunkProviderSettings.redstoneMaxHeight);
if (net.minecraftforge.event.terraingen.TerrainGen.generateOre(worldIn, random, diamondGen, position, net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.DIAMOND))
this.genStandardOre1(worldIn, random, this.chunkProviderSettings.diamondCount, this.diamondGen, this.chunkProviderSettings.diamondMinHeight, this.chunkProviderSettings.diamondMaxHeight);
if (net.minecraftforge.event.terraingen.TerrainGen.generateOre(worldIn, random, lapisGen, position, net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.LAPIS))
this.genStandardOre2(worldIn, random, this.chunkProviderSettings.lapisCount, this.lapisGen, this.chunkProviderSettings.lapisCenterHeight, this.chunkProviderSettings.lapisSpread);
net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Post(worldIn, random, position));
}
}

@Override
protected void genStandardOre1(World worldIn, Random random, int blockCount, WorldGenerator generator, int minHeight, int maxHeight)
{
if (maxHeight < minHeight) {
int i = minHeight;
minHeight = maxHeight;
maxHeight = i;
}
else if (maxHeight == minHeight) {
if (minHeight < 255) {
++maxHeight;
}
else {
--minHeight;
}
}

for (int j = 0; j < blockCount; ++j) {
BlockPos blockpos = this.position.add(random.nextInt(16), random.nextInt(maxHeight - minHeight) + minHeight, random.nextInt(16));
generator.generate(worldIn, random, blockpos);
}
}

@Override
protected void genStandardOre2(World worldIn, Random random, int blockCount, WorldGenerator generator, int centerHeight, int spread) {
for (int i = 0; i < blockCount; ++i) {
BlockPos blockpos = this.position.add(random.nextInt(16), random.nextInt(spread) + random.nextInt(spread) + centerHeight - spread, random.nextInt(16));
generator.generate(worldIn, random, blockpos);
}
}

private void decorateWasteland(World world, Random random) {
Expand Down

0 comments on commit 6bc04e9

Please sign in to comment.