Skip to content

Commit

Permalink
Merge pull request #14 from srs-bsns/biomefix
Browse files Browse the repository at this point in the history
fix improper brace placement in several classes
  • Loading branch information
TheKiipster authored Mar 22, 2020
2 parents 19af85c + a1c8fef commit 983ed17
Show file tree
Hide file tree
Showing 32 changed files with 41 additions and 43 deletions.
2 changes: 1 addition & 1 deletion src/main/java/kipster/nt/biomes/cool/BiomeAutumnTaiga.java
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
}
net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Post(worldIn, rand, pos));

super.decorate(worldIn, rand, pos);
}
super.decorate(worldIn, rand, pos);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/kipster/nt/biomes/cool/BiomeBlueTaiga.java
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
}
net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Post(worldIn, rand, pos));

super.decorate(worldIn, rand, pos);
}
super.decorate(worldIn, rand, pos);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/kipster/nt/biomes/cool/BiomeCliffs.java
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ public void decorate(World worldIn, Random rand, BlockPos pos) {
BlockPos blockpos = worldIn.getHeight(pos.add(k6, 0, l));
COBBLESTONE_BOULDER_FEATURE.generate(worldIn, rand, blockpos);
}
}
if (!MiscConfig.disableBouldersInCliffs && net.minecraftforge.event.terraingen.TerrainGen.decorate(worldIn, rand, pos, DecorateBiomeEvent.Decorate.EventType.ROCK)) {
int genChance1 = rand.nextInt(3);
if (genChance1 == 0) {
Expand All @@ -83,7 +84,6 @@ public void decorate(World worldIn, Random rand, BlockPos pos) {
COBBLESTONE_LINE.generate(worldIn, rand, blockpos);
}
}
}
super.decorate(worldIn, rand, pos);

}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/kipster/nt/biomes/cool/BiomeMapleForest.java
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
}
net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Post(worldIn, rand, pos));

super.decorate(worldIn, rand, pos);
}
super.decorate(worldIn, rand, pos);
}
@Override
public void genTerrainBlocks(World worldIn, Random rand, ChunkPrimer chunkPrimerIn, int x, int z, double noiseVal) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
}
net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Post(worldIn, rand, pos));

super.decorate(worldIn, rand, pos);
}
super.decorate(worldIn, rand, pos);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
}
net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Post(worldIn, rand, pos));

super.decorate(worldIn, rand, pos);
}
super.decorate(worldIn, rand, pos);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
}
net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Post(worldIn, rand, pos));

super.decorate(worldIn, rand, pos);
}
super.decorate(worldIn, rand, pos);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/kipster/nt/biomes/cool/BiomeStoneFields.java
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
int k = rand.nextInt(16) + 8;
this.stoneSpike.generate(worldIn, rand, worldIn.getHeight(pos.add(j, 0, k)));
}
super.decorate(worldIn, rand, pos);
}
super.decorate(worldIn, rand, pos);
}

public static class DiamondGenerator extends WorldGenerator
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/kipster/nt/biomes/desert/BiomeClayland.java
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
BlockPos blockpos = worldIn.getHeight(pos.add(k6, 0, l));
CLAY_BOULDER_FEATURE.generate(worldIn, rand, blockpos);
}
}
if (!MiscConfig.disableBouldersInClayland && net.minecraftforge.event.terraingen.TerrainGen.decorate(worldIn, rand, pos, DecorateBiomeEvent.Decorate.EventType.ROCK)) {
int genChance1 = rand.nextInt(3);
if (genChance1 == 0) {
Expand All @@ -146,7 +147,6 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
}
}
}
}

@Override
public int getModdedBiomeGrassColor(int original) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
BlockPos blockpos = worldIn.getHeight(pos.add(k6, 0, l));
LAKE.generate(worldIn, rand, blockpos);
}
}
net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Pre(worldIn, rand, pos));
WorldGenerator gold = new GoldGenerator();

Expand All @@ -167,7 +168,6 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
{
(new WorldGenFossils()).generate(worldIn, rand, pos);
}
}
net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Post(worldIn, rand, pos));

super.decorate(worldIn, rand, pos);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/kipster/nt/biomes/desert/BiomeRockland.java
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,8 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
BlockPos blockpos = worldIn.getHeight(pos.add(k6, 0, l));
STONE_BOULDER_FEATURE.generate(worldIn, rand, blockpos);
}
if (!MiscConfig.disableBouldersInRockland && net.minecraftforge.event.terraingen.TerrainGen.decorate(worldIn, rand, pos, DecorateBiomeEvent.Decorate.EventType.ROCK)) {
}
if (!MiscConfig.disableBouldersInRockland && net.minecraftforge.event.terraingen.TerrainGen.decorate(worldIn, rand, pos, DecorateBiomeEvent.Decorate.EventType.ROCK)) {
int genChance1 = rand.nextInt(3);
if (genChance1 == 0) {
int k6 = rand.nextInt(16) + 8;
Expand All @@ -145,7 +146,6 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
STONE.generate(worldIn, rand, blockpos);
}
}
}
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
BlockPos blockpos = worldIn.getHeight(pos.add(k6, 0, l));
LAVA_LAKE_FEATURE.generate(worldIn, rand, blockpos);
}
}

if(net.minecraftforge.event.terraingen.TerrainGen.decorate(worldIn, rand, new net.minecraft.util.math.ChunkPos(pos), net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.DESERT_WELL))
if (rand.nextInt(1000) == 0)
{
Expand All @@ -124,7 +126,6 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
{
(new WorldGenFossils()).generate(worldIn, rand, pos);
}
}
net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Post(worldIn, rand, pos));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
BlockPos blockpos = worldIn.getHeight(pos.add(k6, 0, l));
LAVA_LAKE_FEATURE.generate(worldIn, rand, blockpos);
}
}

if (!MiscConfig.disableBouldersInSandyScrubland && net.minecraftforge.event.terraingen.TerrainGen.decorate(worldIn, rand, pos, DecorateBiomeEvent.Decorate.EventType.ROCK)) {
int genChance = rand.nextInt(3);
Expand All @@ -124,6 +125,7 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
BlockPos blockpos = worldIn.getHeight(pos.add(k6, 0, l));
SAND_BOULDER_FEATURE.generate(worldIn, rand, blockpos);
}
}

if(net.minecraftforge.event.terraingen.TerrainGen.decorate(worldIn, rand, new net.minecraft.util.math.ChunkPos(pos), net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.DESERT_WELL))
if (rand.nextInt(1000) == 0)
Expand All @@ -140,8 +142,6 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
(new WorldGenFossils()).generate(worldIn, rand, pos);
}
net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Post(worldIn, rand, pos));
}
}
}
@Override
public int getModdedBiomeGrassColor(int original) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/kipster/nt/biomes/desert/BiomeScrubland.java
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
BlockPos blockpos = worldIn.getHeight(pos.add(k6, 0, l));
LAVA_LAKE_FEATURE.generate(worldIn, rand, blockpos);
}
}


net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Pre(worldIn, rand, pos));
Expand All @@ -108,7 +109,6 @@ public void decorate(World worldIn, Random rand, BlockPos pos)

super.decorate(worldIn, rand, pos);
}
}

public static class GoldGenerator extends WorldGenerator
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
BlockPos blockpos = worldIn.getHeight(pos.add(k6, 0, l));
LAKE.generate(worldIn, rand, blockpos);
}
}
net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Pre(worldIn, rand, pos));
WorldGenerator gold = new GoldGenerator();

Expand All @@ -175,7 +176,6 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
{
(new WorldGenFossils()).generate(worldIn, rand, pos);
}
}
net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Post(worldIn, rand, pos));

super.decorate(worldIn, rand, pos);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
}
net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Post(worldIn, rand, pos));

super.decorate(worldIn, rand, pos);
}
super.decorate(worldIn, rand, pos);
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
}
net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Post(worldIn, rand, pos));

super.decorate(worldIn, rand, pos);
}
super.decorate(worldIn, rand, pos);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/kipster/nt/biomes/icy/BiomeGlacier.java
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ public void decorate(World worldIn, Random rand, BlockPos pos)

}

super.decorate(worldIn, rand, pos);
}
super.decorate(worldIn, rand, pos);
}
public static class LapisGenerator extends WorldGenerator
{
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/kipster/nt/biomes/warm/BiomeAegeanArchipelago.java
Original file line number Diff line number Diff line change
Expand Up @@ -78,17 +78,17 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
BlockPos blockpos = worldIn.getHeight(pos.add(k6, 0, l));
STONE_BOULDER_FEATURE.generate(worldIn, rand, blockpos);
}
if(net.minecraftforge.event.terraingen.TerrainGen.decorate(worldIn, rand, new net.minecraft.util.math.ChunkPos(pos), net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.FOSSIL))
if (rand.nextInt(64) == 0)
{
}
//if(net.minecraftforge.event.terraingen.TerrainGen.decorate(worldIn, rand, new net.minecraft.util.math.ChunkPos(pos), net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.FOSSIL))
//if (rand.nextInt(64) == 0)
//{
//}
net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Pre(worldIn, rand, pos));
WorldGenerator emeralds = new EmeraldGenerator();
if (net.minecraftforge.event.terraingen.TerrainGen.generateOre(worldIn, rand, emeralds, pos, net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.EMERALD))
emeralds.generate(worldIn, rand, pos);

net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Post(worldIn, rand, pos));
}
}
}
@Override
public int getModdedBiomeGrassColor(int original) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/kipster/nt/biomes/warm/BiomeAliumMeadow.java
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
BlockPos blockpos = worldIn.getHeight(pos.add(k6, 0, l));
LAKE.generate(worldIn, rand, blockpos);
}
super.decorate(worldIn, rand, pos);
}
super.decorate(worldIn, rand, pos);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,10 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
BlockPos blockpos = worldIn.getHeight(pos.add(k6, 0, l));
LAKE.generate(worldIn, rand, blockpos);
}
}
net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Post(worldIn, rand, pos));

super.decorate(worldIn, rand, pos);
}
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/kipster/nt/biomes/warm/BiomeBirchHills.java
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
BlockPos blockpos = worldIn.getHeight(pos.add(k6, 0, 1));
LAKE.generate(worldIn, rand, blockpos);
}
super.decorate(worldIn, rand, pos);
}
super.decorate(worldIn, rand, pos);
}


Expand Down
4 changes: 2 additions & 2 deletions src/main/java/kipster/nt/biomes/warm/BiomeFungalJungle.java
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
BlockPos blockpos = worldIn.getHeight(pos.add(k6, 0, l));
LAKE.generate(worldIn, rand, blockpos);
}
}
int i = rand.nextInt(16) + 8;
int j = rand.nextInt(16) + 8;
int height = worldIn.getHeight(pos.add(i, 0, j)).getY() * 2; // could == 0, which crashes nextInt
Expand Down Expand Up @@ -188,11 +189,10 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
BlockPos blockpos = worldIn.getHeight(pos.add(k6, 0, l));
MUSHROOM_PATCHES.generate(worldIn, rand, blockpos);

net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Post(worldIn, rand, pos));
}
net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Post(worldIn, rand, pos));

super.decorate(worldIn, rand, pos);
}
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/kipster/nt/biomes/warm/BiomeGrassHills.java
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
BlockPos blockpos = worldIn.getHeight(pos.add(k6, 0, 1));
LAKE.generate(worldIn, rand, blockpos);
}
}


if(net.minecraftforge.event.terraingen.TerrainGen.decorate(worldIn, rand, pos, net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.GRASS))
Expand All @@ -86,7 +87,6 @@ public void decorate(World worldIn, Random rand, BlockPos pos)

}
super.decorate(worldIn, rand, pos);
}
}

public static class EmeraldGenerator extends WorldGenerator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
BlockPos blockpos = worldIn.getHeight(pos.add(k6, 0, l));
LAKE.generate(worldIn, rand, blockpos);
}
net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Post(worldIn, rand, pos));
}
net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Post(worldIn, rand, pos));

super.decorate(worldIn, rand, pos);
}
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/kipster/nt/biomes/warm/BiomeHotSpring.java
Original file line number Diff line number Diff line change
Expand Up @@ -92,18 +92,15 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
BlockPos blockpos = worldIn.getHeight(pos.add(k6, 0, 1));
LAKE.generate(worldIn, rand, blockpos);
}
}
int grasspatchChance = rand.nextInt(4);
if (grasspatchChance == 0) {
int k6 = rand.nextInt(16) + 8;
int l = rand.nextInt(16) + 8;
BlockPos blockpos = worldIn.getHeight(pos.add(k6, 0, l));
GRASS_PATCHES.generate(worldIn, rand, blockpos);


}

super.decorate(worldIn, rand, pos);
}
}

public static class EmeraldGenerator extends WorldGenerator
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/kipster/nt/biomes/warm/BiomeMeadow.java
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
BlockPos blockpos = worldIn.getHeight(pos.add(k6, 0, l));
LAKE.generate(worldIn, rand, blockpos);
}
super.decorate(worldIn, rand, pos);
}
super.decorate(worldIn, rand, pos);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/kipster/nt/biomes/warm/BiomeMonsoonForest.java
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
BlockPos blockpos = worldIn.getHeight(pos.add(k6, 0, l));
STONE_BOULDER_FEATURE.generate(worldIn, rand, blockpos);
}
}

if (net.minecraftforge.event.terraingen.TerrainGen.decorate(worldIn, rand, pos, DecorateBiomeEvent.Decorate.EventType.LAKE_WATER)) {
int boulderChance = rand.nextInt(12);
Expand All @@ -181,6 +182,7 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
BlockPos blockpos = worldIn.getHeight(pos.add(k6, 0, l));
LAKE.generate(worldIn, rand, blockpos);
}
}
int i = rand.nextInt(16) + 8;
int j = rand.nextInt(16) + 8;
int height = worldIn.getHeight(pos.add(i, 0, j)).getY() * 2; // could == 0, which crashes nextInt
Expand Down Expand Up @@ -208,9 +210,7 @@ public void decorate(World worldIn, Random rand, BlockPos pos)
this.addDoublePlants(worldIn, rand, pos, i1);

net.minecraftforge.common.MinecraftForge.ORE_GEN_BUS.post(new net.minecraftforge.event.terraingen.OreGenEvent.Post(worldIn, rand, pos));
}
}
}
super.decorate(worldIn, rand, pos);

}
Expand Down
Loading

0 comments on commit 983ed17

Please sign in to comment.