From 31f049910c48c0c4c102b0c2200783a6131ae322 Mon Sep 17 00:00:00 2001 From: Adubbz Date: Tue, 7 Jan 2014 00:37:35 +1100 Subject: [PATCH] Reverted back to the old coord setup, seems using the vanilla one breaks things --- .../java/biomesoplenty/common/core/BOPBiomes.java | 2 +- .../world/DecorateBiomeEventHandler.java | 6 +++--- .../world/DecorationModificationEventHandler.java | 14 +++++++------- .../common/world/features/WorldGenBOPFlora.java | 4 ++-- .../world/features/WorldGenBOPTallGrass.java | 4 ++-- .../common/world/features/WorldGenMoss.java | 4 ++-- .../common/world/features/WorldGenMud.java | 4 ++-- .../common/world/features/WorldGenRiverCane.java | 4 ++-- .../common/world/features/WorldGenWaterReeds.java | 4 ++-- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/main/java/biomesoplenty/common/core/BOPBiomes.java b/src/main/java/biomesoplenty/common/core/BOPBiomes.java index 70bc6ac68..030710cdd 100644 --- a/src/main/java/biomesoplenty/common/core/BOPBiomes.java +++ b/src/main/java/biomesoplenty/common/core/BOPBiomes.java @@ -92,7 +92,7 @@ public class BOPBiomes /*registerBiome(new BOPBiomeListEntry(new BiomeGenHeathland(BOPConfigurationIDs.heathlandID).setBiomeName("Heathland"), BOPBiomeTemperatureType.WARM));*/ registerBiome(new BOPBiomeListEntry(new BiomeGenHighland(BOPConfigurationIDs.highlandID).setBiomeName("Highland"), BOPBiomeTemperatureType.WARM)); registerBiome(new BOPBiomeListEntry(new BiomeGenJadeCliffs(BOPConfigurationIDs.jadeCliffsID).setBiomeName("Jade Cliffs"), BOPBiomeTemperatureType.WARM)); - registerOnlyBiome(new BOPBiomeListEntry(new BiomeGenLavenderFields(BOPConfigurationIDs.lavenderFieldsID).setBiomeName("Lavender Fields"), BOPBiomeTemperatureType.WARM)); + registerBiome(new BOPBiomeListEntry(new BiomeGenLavenderFields(BOPConfigurationIDs.lavenderFieldsID).setBiomeName("Lavender Fields"), BOPBiomeTemperatureType.WARM)); /*registerBiome(new BOPBiomeListEntry(new BiomeGenLushDesert(BOPConfigurationIDs.lushDesertID).setBiomeName("Lush Desert"), BOPBiomeTemperatureType.HOT)); registerBiome(new BOPBiomeListEntry(new BiomeGenLushSwamp(BOPConfigurationIDs.lushSwampID).setBiomeName("Lush Swamp"), BOPBiomeTemperatureType.WARM)); registerBiome(new BOPBiomeListEntry(new BiomeGenMapleWoods(BOPConfigurationIDs.mapleWoodsID).setBiomeName("Maple Woods"), BOPBiomeTemperatureType.COOL));*/ diff --git a/src/main/java/biomesoplenty/common/eventhandler/world/DecorateBiomeEventHandler.java b/src/main/java/biomesoplenty/common/eventhandler/world/DecorateBiomeEventHandler.java index 6c90d18cb..ca1a31bb9 100644 --- a/src/main/java/biomesoplenty/common/eventhandler/world/DecorateBiomeEventHandler.java +++ b/src/main/java/biomesoplenty/common/eventhandler/world/DecorateBiomeEventHandler.java @@ -32,10 +32,10 @@ public class DecorateBiomeEventHandler Random random = event.rand; - int x = chunkX * 16; - int z = chunkZ * 16; + int x = chunkX + 8; + int z = chunkZ + 8; - BiomeGenBase biome = world.getBiomeGenForCoordsBody(x + 16, z + 16); + BiomeGenBase biome = world.getBiomeGenForCoordsBody(x, z); IBOPDecoration bopDecoration = null; diff --git a/src/main/java/biomesoplenty/common/eventhandler/world/DecorationModificationEventHandler.java b/src/main/java/biomesoplenty/common/eventhandler/world/DecorationModificationEventHandler.java index 92bf81c0e..df2978fc9 100644 --- a/src/main/java/biomesoplenty/common/eventhandler/world/DecorationModificationEventHandler.java +++ b/src/main/java/biomesoplenty/common/eventhandler/world/DecorationModificationEventHandler.java @@ -63,10 +63,10 @@ public class DecorationModificationEventHandler Random random = event.rand; - int x = chunkX * 16; - int z = chunkZ * 16; + int x = chunkX + 8; + int z = chunkZ + 8; - BiomeGenBase biome = world.getBiomeGenForCoordsBody(x + 16, z + 16); + BiomeGenBase biome = world.getBiomeGenForCoordsBody(x, z); IBOPDecoration bopDecoration = null; if (biome instanceof IBOPDecoration) @@ -88,9 +88,9 @@ public class DecorationModificationEventHandler { if (random.nextInt(4) == 0) { - int randX = x + random.nextInt(16) + 8; + int randX = x + random.nextInt(16); int randY = random.nextInt(256); - int randZ = z + random.nextInt(16) + 8; + int randZ = z + random.nextInt(16); (new WorldGenLakes(Blocks.water)).generate(world, random, randX, randY, randZ); } @@ -104,9 +104,9 @@ public class DecorationModificationEventHandler { if (random.nextInt(8) == 0) { - int randX = x + random.nextInt(16) + 8; + int randX = x + random.nextInt(16); int randY = random.nextInt(random.nextInt(248) + 8); - int randZ = z + random.nextInt(16) + 8; + int randZ = z + random.nextInt(16); if (randY < 63 || random.nextInt(10) == 0) { diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPFlora.java b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPFlora.java index 9f2ef6bb6..e22d5d945 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPFlora.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPFlora.java @@ -55,8 +55,8 @@ public class WorldGenBOPFlora extends WorldGeneratorBOP { for (int i = 0; i < worldGeneratorField.getInt(bopDecoration.getWorldFeatures()); i++) { - int randX = x + random.nextInt(16) + 8; - int randZ = z + random.nextInt(16) + 8; + int randX = x + random.nextInt(16); + int randZ = z + random.nextInt(16); worldGenerator.generate(world, random, randX, world.getTopSolidOrLiquidBlock(randX, randZ), randZ); } diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPTallGrass.java b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPTallGrass.java index a595f5480..58c19670c 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPTallGrass.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPTallGrass.java @@ -58,8 +58,8 @@ public class WorldGenBOPTallGrass extends WorldGeneratorBOP { for (int i = 0; i < worldGeneratorField.getInt(bopDecoration.getWorldFeatures()); i++) { - int randX = x + random.nextInt(16) + 8; - int randZ = z + random.nextInt(16) + 8; + int randX = x + random.nextInt(16); + int randZ = z + random.nextInt(16); worldGenerator.generate(world, random, randX, world.getTopSolidOrLiquidBlock(randX, randZ), randZ); } diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenMoss.java b/src/main/java/biomesoplenty/common/world/features/WorldGenMoss.java index fa4410a29..39a0c52e3 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenMoss.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenMoss.java @@ -55,8 +55,8 @@ public class WorldGenMoss extends WorldGeneratorBOP { for (int i = 0; i < worldGeneratorField.getInt(bopDecoration.getWorldFeatures()); i++) { - int randX = x + random.nextInt(16) + 8; - int randZ = z + random.nextInt(16) + 8; + int randX = x + random.nextInt(16); + int randZ = z + random.nextInt(16); worldGenerator.generate(world, random, randX, world.getTopSolidOrLiquidBlock(randX, randZ), randZ); } diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenMud.java b/src/main/java/biomesoplenty/common/world/features/WorldGenMud.java index f6ff40952..15ad60d5c 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenMud.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenMud.java @@ -67,8 +67,8 @@ public class WorldGenMud extends WorldGeneratorBOP { for (int i = 0; i < worldGeneratorField.getInt(bopDecoration.getWorldFeatures()); i++) { - int randX = x + random.nextInt(16) + 8; - int randZ = z + random.nextInt(16) + 8; + int randX = x + random.nextInt(16); + int randZ = z + random.nextInt(16); worldGenerator.generate(world, random, randX, world.getTopSolidOrLiquidBlock(randX, randZ), randZ); } diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenRiverCane.java b/src/main/java/biomesoplenty/common/world/features/WorldGenRiverCane.java index e3f02c781..d16436c14 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenRiverCane.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenRiverCane.java @@ -47,8 +47,8 @@ public class WorldGenRiverCane extends WorldGeneratorBOP { for (int i = 0; i < worldGeneratorField.getInt(bopDecoration.getWorldFeatures()); i++) { - int randX = x + random.nextInt(16) + 8; - int randZ = z + random.nextInt(16) + 8; + int randX = x + random.nextInt(16); + int randZ = z + random.nextInt(16); worldGenerator.generate(world, random, randX, world.getTopSolidOrLiquidBlock(randX, randZ), randZ); } diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenWaterReeds.java b/src/main/java/biomesoplenty/common/world/features/WorldGenWaterReeds.java index 3119858b7..4348d073b 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenWaterReeds.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenWaterReeds.java @@ -46,8 +46,8 @@ public class WorldGenWaterReeds extends WorldGeneratorBOP { for (int i = 0; i < worldGeneratorField.getInt(bopDecoration.getWorldFeatures()); i++) { - int randX = x + random.nextInt(16) + 8; - int randZ = z + random.nextInt(16) + 8; + int randX = x + random.nextInt(16); + int randZ = z + random.nextInt(16); worldGenerator.generate(world, random, randX, world.getTopSolidOrLiquidBlock(randX, randZ), randZ); }