From a1c8fefe1f7f54397712392ad710f9772b81c1e5 Mon Sep 17 00:00:00 2001 From: srs-bsns Date: Sat, 31 Aug 2019 06:46:36 -0400 Subject: [PATCH] fix improper brace placement in several classes Signed-off-by: srs-bsns --- .../java/kipster/nt/biomes/cool/BiomeAutumnTaiga.java | 2 +- .../java/kipster/nt/biomes/cool/BiomeBlueTaiga.java | 2 +- src/main/java/kipster/nt/biomes/cool/BiomeCliffs.java | 2 +- .../java/kipster/nt/biomes/cool/BiomeMapleForest.java | 2 +- .../kipster/nt/biomes/cool/BiomeMegaAutumnTaiga.java | 2 +- .../kipster/nt/biomes/cool/BiomeMegaBlueTaiga.java | 2 +- .../kipster/nt/biomes/cool/BiomeMegaMapleForest.java | 2 +- .../java/kipster/nt/biomes/cool/BiomeStoneFields.java | 2 +- .../java/kipster/nt/biomes/desert/BiomeClayland.java | 2 +- .../java/kipster/nt/biomes/desert/BiomeLushDesert.java | 2 +- .../java/kipster/nt/biomes/desert/BiomeRockland.java | 4 ++-- .../kipster/nt/biomes/desert/BiomeSandyMountains.java | 3 ++- .../kipster/nt/biomes/desert/BiomeSandyScrubland.java | 4 ++-- .../java/kipster/nt/biomes/desert/BiomeScrubland.java | 2 +- .../kipster/nt/biomes/desert/BiomeTropicalDesert.java | 2 +- .../java/kipster/nt/biomes/icy/BiomeColdBlueTaiga.java | 2 +- .../kipster/nt/biomes/icy/BiomeColdMegaBlueTaiga.java | 2 +- src/main/java/kipster/nt/biomes/icy/BiomeGlacier.java | 2 +- .../kipster/nt/biomes/warm/BiomeAegeanArchipelago.java | 10 +++++----- .../java/kipster/nt/biomes/warm/BiomeAliumMeadow.java | 2 +- .../java/kipster/nt/biomes/warm/BiomeAutumnForest.java | 2 +- .../java/kipster/nt/biomes/warm/BiomeBirchHills.java | 2 +- .../java/kipster/nt/biomes/warm/BiomeFungalJungle.java | 4 ++-- .../java/kipster/nt/biomes/warm/BiomeGrassHills.java | 2 +- .../kipster/nt/biomes/warm/BiomeGreenMixedForest.java | 2 +- .../java/kipster/nt/biomes/warm/BiomeHotSpring.java | 5 +---- src/main/java/kipster/nt/biomes/warm/BiomeMeadow.java | 2 +- .../kipster/nt/biomes/warm/BiomeMonsoonForest.java | 4 ++-- .../java/kipster/nt/biomes/warm/BiomeMoorland.java | 2 +- .../java/kipster/nt/biomes/warm/BiomePoppyMeadow.java | 2 +- src/main/java/kipster/nt/biomes/warm/BiomeSprings.java | 2 +- .../java/kipster/nt/biomes/warm/BiomeWhiteOrchard.java | 2 +- 32 files changed, 41 insertions(+), 43 deletions(-) diff --git a/src/main/java/kipster/nt/biomes/cool/BiomeAutumnTaiga.java b/src/main/java/kipster/nt/biomes/cool/BiomeAutumnTaiga.java index 78a3e9f..189b57c 100644 --- a/src/main/java/kipster/nt/biomes/cool/BiomeAutumnTaiga.java +++ b/src/main/java/kipster/nt/biomes/cool/BiomeAutumnTaiga.java @@ -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 diff --git a/src/main/java/kipster/nt/biomes/cool/BiomeBlueTaiga.java b/src/main/java/kipster/nt/biomes/cool/BiomeBlueTaiga.java index 14d2dcb..74150e2 100644 --- a/src/main/java/kipster/nt/biomes/cool/BiomeBlueTaiga.java +++ b/src/main/java/kipster/nt/biomes/cool/BiomeBlueTaiga.java @@ -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 diff --git a/src/main/java/kipster/nt/biomes/cool/BiomeCliffs.java b/src/main/java/kipster/nt/biomes/cool/BiomeCliffs.java index 654473b..64e2c36 100644 --- a/src/main/java/kipster/nt/biomes/cool/BiomeCliffs.java +++ b/src/main/java/kipster/nt/biomes/cool/BiomeCliffs.java @@ -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) { @@ -83,7 +84,6 @@ public void decorate(World worldIn, Random rand, BlockPos pos) { COBBLESTONE_LINE.generate(worldIn, rand, blockpos); } } - } super.decorate(worldIn, rand, pos); } diff --git a/src/main/java/kipster/nt/biomes/cool/BiomeMapleForest.java b/src/main/java/kipster/nt/biomes/cool/BiomeMapleForest.java index bdd9335..ed03c46 100644 --- a/src/main/java/kipster/nt/biomes/cool/BiomeMapleForest.java +++ b/src/main/java/kipster/nt/biomes/cool/BiomeMapleForest.java @@ -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) { diff --git a/src/main/java/kipster/nt/biomes/cool/BiomeMegaAutumnTaiga.java b/src/main/java/kipster/nt/biomes/cool/BiomeMegaAutumnTaiga.java index c4f49db..0892480 100644 --- a/src/main/java/kipster/nt/biomes/cool/BiomeMegaAutumnTaiga.java +++ b/src/main/java/kipster/nt/biomes/cool/BiomeMegaAutumnTaiga.java @@ -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 diff --git a/src/main/java/kipster/nt/biomes/cool/BiomeMegaBlueTaiga.java b/src/main/java/kipster/nt/biomes/cool/BiomeMegaBlueTaiga.java index 55135ba..7838f5f 100644 --- a/src/main/java/kipster/nt/biomes/cool/BiomeMegaBlueTaiga.java +++ b/src/main/java/kipster/nt/biomes/cool/BiomeMegaBlueTaiga.java @@ -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 diff --git a/src/main/java/kipster/nt/biomes/cool/BiomeMegaMapleForest.java b/src/main/java/kipster/nt/biomes/cool/BiomeMegaMapleForest.java index 3214fcd..5625a8f 100644 --- a/src/main/java/kipster/nt/biomes/cool/BiomeMegaMapleForest.java +++ b/src/main/java/kipster/nt/biomes/cool/BiomeMegaMapleForest.java @@ -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 diff --git a/src/main/java/kipster/nt/biomes/cool/BiomeStoneFields.java b/src/main/java/kipster/nt/biomes/cool/BiomeStoneFields.java index 7f67dac..2de6675 100644 --- a/src/main/java/kipster/nt/biomes/cool/BiomeStoneFields.java +++ b/src/main/java/kipster/nt/biomes/cool/BiomeStoneFields.java @@ -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 diff --git a/src/main/java/kipster/nt/biomes/desert/BiomeClayland.java b/src/main/java/kipster/nt/biomes/desert/BiomeClayland.java index 64ef788..22bcf0f 100644 --- a/src/main/java/kipster/nt/biomes/desert/BiomeClayland.java +++ b/src/main/java/kipster/nt/biomes/desert/BiomeClayland.java @@ -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) { @@ -146,7 +147,6 @@ public void decorate(World worldIn, Random rand, BlockPos pos) } } } - } @Override public int getModdedBiomeGrassColor(int original) { diff --git a/src/main/java/kipster/nt/biomes/desert/BiomeLushDesert.java b/src/main/java/kipster/nt/biomes/desert/BiomeLushDesert.java index fa0f5d1..934e357 100644 --- a/src/main/java/kipster/nt/biomes/desert/BiomeLushDesert.java +++ b/src/main/java/kipster/nt/biomes/desert/BiomeLushDesert.java @@ -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(); @@ -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); diff --git a/src/main/java/kipster/nt/biomes/desert/BiomeRockland.java b/src/main/java/kipster/nt/biomes/desert/BiomeRockland.java index ae8197c..7f46629 100644 --- a/src/main/java/kipster/nt/biomes/desert/BiomeRockland.java +++ b/src/main/java/kipster/nt/biomes/desert/BiomeRockland.java @@ -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; @@ -145,7 +146,6 @@ public void decorate(World worldIn, Random rand, BlockPos pos) STONE.generate(worldIn, rand, blockpos); } } - } } @Override diff --git a/src/main/java/kipster/nt/biomes/desert/BiomeSandyMountains.java b/src/main/java/kipster/nt/biomes/desert/BiomeSandyMountains.java index 60d060a..b08fee7 100644 --- a/src/main/java/kipster/nt/biomes/desert/BiomeSandyMountains.java +++ b/src/main/java/kipster/nt/biomes/desert/BiomeSandyMountains.java @@ -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) { @@ -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)); } diff --git a/src/main/java/kipster/nt/biomes/desert/BiomeSandyScrubland.java b/src/main/java/kipster/nt/biomes/desert/BiomeSandyScrubland.java index 500d294..84c1e07 100644 --- a/src/main/java/kipster/nt/biomes/desert/BiomeSandyScrubland.java +++ b/src/main/java/kipster/nt/biomes/desert/BiomeSandyScrubland.java @@ -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); @@ -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) @@ -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) { diff --git a/src/main/java/kipster/nt/biomes/desert/BiomeScrubland.java b/src/main/java/kipster/nt/biomes/desert/BiomeScrubland.java index 53bba0d..dfa1e8f 100644 --- a/src/main/java/kipster/nt/biomes/desert/BiomeScrubland.java +++ b/src/main/java/kipster/nt/biomes/desert/BiomeScrubland.java @@ -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)); @@ -108,7 +109,6 @@ public void decorate(World worldIn, Random rand, BlockPos pos) super.decorate(worldIn, rand, pos); } - } public static class GoldGenerator extends WorldGenerator { diff --git a/src/main/java/kipster/nt/biomes/desert/BiomeTropicalDesert.java b/src/main/java/kipster/nt/biomes/desert/BiomeTropicalDesert.java index b7fe252..a60d072 100644 --- a/src/main/java/kipster/nt/biomes/desert/BiomeTropicalDesert.java +++ b/src/main/java/kipster/nt/biomes/desert/BiomeTropicalDesert.java @@ -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(); @@ -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); diff --git a/src/main/java/kipster/nt/biomes/icy/BiomeColdBlueTaiga.java b/src/main/java/kipster/nt/biomes/icy/BiomeColdBlueTaiga.java index 3112d11..58921b0 100644 --- a/src/main/java/kipster/nt/biomes/icy/BiomeColdBlueTaiga.java +++ b/src/main/java/kipster/nt/biomes/icy/BiomeColdBlueTaiga.java @@ -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); } diff --git a/src/main/java/kipster/nt/biomes/icy/BiomeColdMegaBlueTaiga.java b/src/main/java/kipster/nt/biomes/icy/BiomeColdMegaBlueTaiga.java index 77d2364..0c6bdb7 100644 --- a/src/main/java/kipster/nt/biomes/icy/BiomeColdMegaBlueTaiga.java +++ b/src/main/java/kipster/nt/biomes/icy/BiomeColdMegaBlueTaiga.java @@ -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 diff --git a/src/main/java/kipster/nt/biomes/icy/BiomeGlacier.java b/src/main/java/kipster/nt/biomes/icy/BiomeGlacier.java index 66c1654..740c7ae 100644 --- a/src/main/java/kipster/nt/biomes/icy/BiomeGlacier.java +++ b/src/main/java/kipster/nt/biomes/icy/BiomeGlacier.java @@ -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 { diff --git a/src/main/java/kipster/nt/biomes/warm/BiomeAegeanArchipelago.java b/src/main/java/kipster/nt/biomes/warm/BiomeAegeanArchipelago.java index 59e9a01..d146986 100644 --- a/src/main/java/kipster/nt/biomes/warm/BiomeAegeanArchipelago.java +++ b/src/main/java/kipster/nt/biomes/warm/BiomeAegeanArchipelago.java @@ -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) { diff --git a/src/main/java/kipster/nt/biomes/warm/BiomeAliumMeadow.java b/src/main/java/kipster/nt/biomes/warm/BiomeAliumMeadow.java index 1ddadcf..5b19097 100644 --- a/src/main/java/kipster/nt/biomes/warm/BiomeAliumMeadow.java +++ b/src/main/java/kipster/nt/biomes/warm/BiomeAliumMeadow.java @@ -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 diff --git a/src/main/java/kipster/nt/biomes/warm/BiomeAutumnForest.java b/src/main/java/kipster/nt/biomes/warm/BiomeAutumnForest.java index 3190a7f..a1557fc 100644 --- a/src/main/java/kipster/nt/biomes/warm/BiomeAutumnForest.java +++ b/src/main/java/kipster/nt/biomes/warm/BiomeAutumnForest.java @@ -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 diff --git a/src/main/java/kipster/nt/biomes/warm/BiomeBirchHills.java b/src/main/java/kipster/nt/biomes/warm/BiomeBirchHills.java index 973d412..da571de 100644 --- a/src/main/java/kipster/nt/biomes/warm/BiomeBirchHills.java +++ b/src/main/java/kipster/nt/biomes/warm/BiomeBirchHills.java @@ -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); } diff --git a/src/main/java/kipster/nt/biomes/warm/BiomeFungalJungle.java b/src/main/java/kipster/nt/biomes/warm/BiomeFungalJungle.java index abdee35..c96cb38 100644 --- a/src/main/java/kipster/nt/biomes/warm/BiomeFungalJungle.java +++ b/src/main/java/kipster/nt/biomes/warm/BiomeFungalJungle.java @@ -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 @@ -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 diff --git a/src/main/java/kipster/nt/biomes/warm/BiomeGrassHills.java b/src/main/java/kipster/nt/biomes/warm/BiomeGrassHills.java index cfcc596..4b679ab 100644 --- a/src/main/java/kipster/nt/biomes/warm/BiomeGrassHills.java +++ b/src/main/java/kipster/nt/biomes/warm/BiomeGrassHills.java @@ -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)) @@ -86,7 +87,6 @@ public void decorate(World worldIn, Random rand, BlockPos pos) } super.decorate(worldIn, rand, pos); - } } public static class EmeraldGenerator extends WorldGenerator diff --git a/src/main/java/kipster/nt/biomes/warm/BiomeGreenMixedForest.java b/src/main/java/kipster/nt/biomes/warm/BiomeGreenMixedForest.java index e065ab2..bf2ec13 100644 --- a/src/main/java/kipster/nt/biomes/warm/BiomeGreenMixedForest.java +++ b/src/main/java/kipster/nt/biomes/warm/BiomeGreenMixedForest.java @@ -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); } diff --git a/src/main/java/kipster/nt/biomes/warm/BiomeHotSpring.java b/src/main/java/kipster/nt/biomes/warm/BiomeHotSpring.java index 34dd794..521957e 100644 --- a/src/main/java/kipster/nt/biomes/warm/BiomeHotSpring.java +++ b/src/main/java/kipster/nt/biomes/warm/BiomeHotSpring.java @@ -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 diff --git a/src/main/java/kipster/nt/biomes/warm/BiomeMeadow.java b/src/main/java/kipster/nt/biomes/warm/BiomeMeadow.java index fcf6068..d8e2075 100644 --- a/src/main/java/kipster/nt/biomes/warm/BiomeMeadow.java +++ b/src/main/java/kipster/nt/biomes/warm/BiomeMeadow.java @@ -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 diff --git a/src/main/java/kipster/nt/biomes/warm/BiomeMonsoonForest.java b/src/main/java/kipster/nt/biomes/warm/BiomeMonsoonForest.java index ce0619d..6d813df 100644 --- a/src/main/java/kipster/nt/biomes/warm/BiomeMonsoonForest.java +++ b/src/main/java/kipster/nt/biomes/warm/BiomeMonsoonForest.java @@ -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); @@ -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 @@ -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); } diff --git a/src/main/java/kipster/nt/biomes/warm/BiomeMoorland.java b/src/main/java/kipster/nt/biomes/warm/BiomeMoorland.java index 0502b74..42b7a6b 100644 --- a/src/main/java/kipster/nt/biomes/warm/BiomeMoorland.java +++ b/src/main/java/kipster/nt/biomes/warm/BiomeMoorland.java @@ -68,6 +68,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, new net.minecraft.util.math.ChunkPos(pos), net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.FOSSIL)) if (rand.nextInt(64) == 0) { @@ -80,7 +81,6 @@ 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)); } - } @Override public int getGrassColorAtPos(BlockPos pos) diff --git a/src/main/java/kipster/nt/biomes/warm/BiomePoppyMeadow.java b/src/main/java/kipster/nt/biomes/warm/BiomePoppyMeadow.java index cf5460b..928b9c7 100644 --- a/src/main/java/kipster/nt/biomes/warm/BiomePoppyMeadow.java +++ b/src/main/java/kipster/nt/biomes/warm/BiomePoppyMeadow.java @@ -97,8 +97,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 diff --git a/src/main/java/kipster/nt/biomes/warm/BiomeSprings.java b/src/main/java/kipster/nt/biomes/warm/BiomeSprings.java index fed2776..705ced9 100644 --- a/src/main/java/kipster/nt/biomes/warm/BiomeSprings.java +++ b/src/main/java/kipster/nt/biomes/warm/BiomeSprings.java @@ -91,6 +91,7 @@ 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; @@ -102,7 +103,6 @@ public void decorate(World worldIn, Random rand, BlockPos pos) } super.decorate(worldIn, rand, pos); - } } public static class EmeraldGenerator extends WorldGenerator diff --git a/src/main/java/kipster/nt/biomes/warm/BiomeWhiteOrchard.java b/src/main/java/kipster/nt/biomes/warm/BiomeWhiteOrchard.java index 012c232..61368ea 100644 --- a/src/main/java/kipster/nt/biomes/warm/BiomeWhiteOrchard.java +++ b/src/main/java/kipster/nt/biomes/warm/BiomeWhiteOrchard.java @@ -92,6 +92,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)) for (int i = 0; i < 7; ++i) @@ -103,7 +104,6 @@ public void decorate(World worldIn, Random rand, BlockPos pos) } super.decorate(worldIn, rand, pos); - } } @Override public void addDefaultFlowers()