From 4b07cab7cddd823a4ca4d36865df71813ea441e3 Mon Sep 17 00:00:00 2001 From: Adubbz Date: Mon, 9 Jun 2014 11:34:44 +1000 Subject: [PATCH] Rewrote decoration. Don't try this at home. --- .../java/biomesoplenty/BiomesOPlenty.java | 4 +- .../api/BOPObfuscationHelper.java | 35 +++ .../biomesoplenty/api/biome/BOPBiome.java | 46 ++++ .../api/biome/BOPBiomeDecorator.java | 113 ++++++++ .../api/biome/BOPInheritedBiome.java | 87 +++++++ .../api/biome/BOPOverriddenBiome.java | 9 + .../api/biome/BiomeFeatures.java | 63 +++++ .../api/exception/FeatureExistsException.java | 9 + .../api/exception/NoSuchFeatureException.java | 9 + .../common/biome/BOPInheritedNetherBiome.java | 14 + .../biome/BOPInheritedOverworldBiome.java | 13 + .../{biomes => biome}/BOPNetherBiome.java | 16 +- .../{biomes => biome}/BOPOceanBiome.java | 4 +- .../common/biome/BOPOverworldBiome.java | 12 + .../common/{biomes => biome}/BOPSubBiome.java | 9 +- .../decoration/BOPNetherBiomeDecorator.java | 101 ++++++++ .../BOPOverworldBiomeDecorator.java | 12 + .../biome/decoration/BiomeFeaturesBase.java | 14 + .../biome/decoration/NetherBiomeFeatures.java | 14 + .../decoration/OverworldBiomeFeatures.java | 76 ++++++ .../common/biome/nether/BiomeGenBoneyard.java | 22 ++ .../nether/BiomeGenCorruptedSands.java | 10 +- .../nether/BiomeGenPhantasmagoricInferno.java | 28 ++ .../biome/nether/BiomeGenUndergarden.java | 49 ++++ .../nether/BiomeGenVisceralHeap.java | 8 +- .../overridden/BiomeGenBOPBirchForest.java | 40 +++ .../biome/overridden/BiomeGenBOPDesert.java | 15 ++ .../overridden/BiomeGenBOPExtremeHills.java | 39 +++ .../biome/overridden/BiomeGenBOPForest.java | 38 +++ .../biome/overridden/BiomeGenBOPHell.java | 25 ++ .../overridden/BiomeGenBOPIcePlains.java | 19 ++ .../biome/overridden/BiomeGenBOPJungle.java | 32 +++ .../biome/overridden/BiomeGenBOPMesa.java | 33 +++ .../overridden/BiomeGenBOPMushroomIsland.java | 16 ++ .../biome/overridden/BiomeGenBOPOcean.java | 14 + .../biome/overridden/BiomeGenBOPPlains.java | 28 ++ .../biome/overridden/BiomeGenBOPRiver.java | 16 ++ .../overridden/BiomeGenBOPRoofedForest.java | 30 +++ .../biome/overridden/BiomeGenBOPSavanna.java | 31 +++ .../biome/overridden/BiomeGenBOPSwamp.java | 47 ++++ .../biome/overridden/BiomeGenBOPTaiga.java | 22 ++ .../overworld/BiomeGenAlps.java | 8 +- .../overworld/BiomeGenArctic.java | 12 +- .../overworld/BiomeGenBambooForest.java | 18 +- .../overworld/BiomeGenBayou.java | 42 +-- .../overworld/BiomeGenBog.java | 45 ++-- .../overworld/BiomeGenBorealForest.java | 30 ++- .../overworld/BiomeGenBrushland.java | 27 +- .../overworld/BiomeGenCanyon.java | 19 +- .../overworld/BiomeGenChaparral.java | 42 +-- .../overworld/BiomeGenCherryBlossomGrove.java | 35 +-- .../overworld/BiomeGenConiferousForest.java | 48 ++-- .../BiomeGenConiferousForestSnow.java | 29 ++- .../overworld/BiomeGenCrag.java | 8 +- .../overworld/BiomeGenDeadForest.java | 25 +- .../overworld/BiomeGenDeadSwamp.java | 29 ++- .../overworld/BiomeGenDeciduousForest.java | 36 +-- .../overworld/BiomeGenFen.java | 52 ++-- .../overworld/BiomeGenFlowerField.java | 17 +- .../overworld/BiomeGenFrostForest.java | 29 ++- .../overworld/BiomeGenFungiForest.java | 46 ++-- .../overworld/BiomeGenGarden.java | 38 +-- .../overworld/BiomeGenGrassland.java | 30 ++- .../overworld/BiomeGenGrove.java | 37 +-- .../overworld/BiomeGenHeathland.java | 34 +-- .../overworld/BiomeGenHighland.java | 21 +- .../overworld/BiomeGenJadeCliffs.java | 19 +- .../overworld/BiomeGenLavenderFields.java | 9 +- .../overworld/BiomeGenLushDesert.java | 44 ++-- .../overworld/BiomeGenLushSwamp.java | 46 ++-- .../overworld/BiomeGenMapleWoods.java | 25 +- .../overworld/BiomeGenMarsh.java | 32 +-- .../overworld/BiomeGenMeadow.java | 39 +-- .../overworld/BiomeGenMoor.java | 33 +-- .../overworld/BiomeGenMountain.java | 31 +-- .../overworld/BiomeGenMysticGrove.java | 51 ++-- .../overworld/BiomeGenOminousWoods.java | 33 +-- .../overworld/BiomeGenOriginValley.java | 24 +- .../overworld/BiomeGenOutback.java | 17 +- .../overworld/BiomeGenPrairie.java | 36 +-- .../overworld/BiomeGenRainforest.java | 30 ++- .../overworld/BiomeGenRedwoodForest.java | 37 +-- .../overworld/BiomeGenSacredSprings.java | 19 +- .../overworld/BiomeGenSeasonalForest.java | 30 ++- .../overworld/BiomeGenShield.java | 29 ++- .../overworld/BiomeGenShrubland.java | 32 +-- .../overworld/BiomeGenSludgepit.java | 32 +-- .../overworld/BiomeGenSteppe.java | 24 +- .../BiomeGenTemperateRainforest.java | 41 +-- .../overworld/BiomeGenThicket.java | 19 +- .../overworld/BiomeGenTropicalRainforest.java | 40 +-- .../overworld/BiomeGenTundra.java | 31 +-- .../overworld/BiomeGenWasteland.java | 25 +- .../overworld/BiomeGenWetland.java | 59 ++--- .../overworld/BiomeGenWoodland.java | 35 +-- .../overworld/ocean/BiomeGenCoralReef.java | 12 +- .../overworld/ocean/BiomeGenKelpForest.java | 12 +- .../overworld/sub/BiomeGenAlpsForest.java | 16 +- .../overworld/sub/BiomeGenCanyonRavine.java | 16 +- .../overworld/sub/BiomeGenGlacier.java | 4 +- .../overworld/sub/BiomeGenMangrove.java | 14 +- .../overworld/sub/BiomeGenMeadowForest.java | 30 +-- .../overworld/sub/BiomeGenOasis.java | 24 +- .../overworld/sub/BiomeGenOrchard.java | 30 +-- .../overworld/sub/BiomeGenQuagmire.java | 22 +- .../overworld/sub/BiomeGenScrubland.java | 20 +- .../overworld/sub/BiomeGenSilkglades.java | 28 +- .../overworld/sub/BiomeGenSpruceWoods.java | 30 +-- .../overworld/sub/BiomeGenTropics.java | 36 +-- .../overworld/sub/BiomeGenVolcano.java | 10 +- .../overworld/tech/BiomeGenDryRiver.java | 7 +- .../overworld/tech/BiomeGenLushRiver.java | 50 ++++ .../biomesoplenty/common/biomes/BOPBiome.java | 48 ---- .../biomes/nether/BiomeGenBoneyard.java | 22 -- .../nether/BiomeGenPhantasmagoricInferno.java | 28 -- .../biomes/nether/BiomeGenUndergarden.java | 49 ---- .../overworld/tech/BiomeGenLushRiver.java | 49 ---- .../biomesoplenty/common/core/BOPBiomes.java | 241 ++++++++++++------ .../common/core/BOPVanillaCompat.java | 49 ++-- .../DecorationModificationEventHandler.java | 40 ++- .../common/helpers/BOPReflectionHelper.java | 18 ++ .../common/world/BOPBiomeManager.java | 21 +- .../common/world/ChunkProviderBOPHell.java | 30 +-- .../decoration/BOPDecorationManager.java | 109 -------- .../world/decoration/BOPWorldFeatures.java | 150 ----------- .../common/world/decoration/BiomeTweaker.java | 132 ---------- .../world/decoration/ForcedDecorator.java | 17 -- .../common/world/decoration/IBOPBiome.java | 6 - .../features/WorldGenBOPBigMushroom.java | 7 +- .../world/features/WorldGenBOPBlob.java | 7 +- .../world/features/WorldGenBOPCoral.java | 7 +- .../features/WorldGenBOPDoubleFlora.java | 7 +- .../world/features/WorldGenBOPFlora.java | 7 +- .../world/features/WorldGenBOPTallGrass.java | 22 +- .../WorldGenBOPUndergroundDecoration.java | 7 +- .../world/features/WorldGenCobwebNest.java | 7 +- .../world/features/WorldGenGrassSplatter.java | 7 +- .../common/world/features/WorldGenKelp.java | 11 +- .../world/features/WorldGenLavaSpout.java | 7 +- .../common/world/features/WorldGenLog.java | 7 +- .../world/features/WorldGenLongVine.java | 7 +- .../common/world/features/WorldGenMoss.java | 7 +- .../features/WorldGenOvergrownNetherrack.java | 7 +- .../world/features/WorldGenRiverCane.java | 7 +- .../world/features/WorldGenRockpile.java | 7 +- .../features/WorldGenSandstoneSpike.java | 7 +- .../world/features/WorldGenSplatter.java | 7 +- .../world/features/WorldGenSplotches.java | 25 +- .../world/features/WorldGenWasteland.java | 7 +- .../world/features/WorldGenWasteland2.java | 7 +- .../world/features/WorldGenWasteland3.java | 7 +- .../world/features/WorldGenWasteland4.java | 7 +- .../world/features/WorldGenWaterReeds.java | 7 +- .../world/features/WorldGenWaterside.java | 7 +- .../managers/WorldGenBOPFlowerManager.java | 24 +- .../managers/WorldGenBOPGrassManager.java | 25 +- .../features/nether/WorldGenBoneSpine.java | 7 +- .../world/features/nether/WorldGenGrave.java | 7 +- .../features/nether/WorldGenLakesNether.java | 7 +- .../features/nether/WorldGenWaspHive.java | 8 +- .../features/trees/WorldGenMiniShrub.java | 22 +- .../nether/ForcedDecoratorHell.java | 20 -- .../overworld/BirchForestForcedDecorator.java | 30 --- .../overworld/DesertForcedDecorator.java | 14 - .../ExtremeHillsForcedDecorator.java | 29 --- .../overworld/ForestForcedDecorator.java | 37 --- .../overworld/IcePlainsForcedDecorator.java | 18 -- .../overworld/JungleForcedDecorator.java | 31 --- .../overworld/MesaForcedDecorator.java | 22 -- .../MushroomIslandForcedDecorator.java | 15 -- .../overworld/OceanForcedDecorator.java | 13 - .../overworld/PlainsForcedDecorator.java | 27 -- .../overworld/RiverForcedDecorator.java | 15 -- .../RoofedForestForcedDecorator.java | 29 --- .../overworld/SavannaForcedDecorator.java | 30 --- .../overworld/SwampForcedDecorator.java | 37 --- .../overworld/TaigaForcedDecorator.java | 21 -- .../LakesForcedGenerator.java | 15 +- .../MelonForcedGenerator.java | 15 +- .../SpringForcedGenerator.java | 20 +- .../world/generation/IBOPWorldGenerator.java | 5 +- .../common/world/layer/GenLayerSubBiome.java | 2 +- 182 files changed, 2686 insertions(+), 2349 deletions(-) create mode 100644 src/main/java/biomesoplenty/api/BOPObfuscationHelper.java create mode 100644 src/main/java/biomesoplenty/api/biome/BOPBiome.java create mode 100644 src/main/java/biomesoplenty/api/biome/BOPBiomeDecorator.java create mode 100644 src/main/java/biomesoplenty/api/biome/BOPInheritedBiome.java create mode 100644 src/main/java/biomesoplenty/api/biome/BOPOverriddenBiome.java create mode 100644 src/main/java/biomesoplenty/api/biome/BiomeFeatures.java create mode 100644 src/main/java/biomesoplenty/api/exception/FeatureExistsException.java create mode 100644 src/main/java/biomesoplenty/api/exception/NoSuchFeatureException.java create mode 100644 src/main/java/biomesoplenty/common/biome/BOPInheritedNetherBiome.java create mode 100644 src/main/java/biomesoplenty/common/biome/BOPInheritedOverworldBiome.java rename src/main/java/biomesoplenty/common/{biomes => biome}/BOPNetherBiome.java (66%) rename src/main/java/biomesoplenty/common/{biomes => biome}/BOPOceanBiome.java (74%) create mode 100644 src/main/java/biomesoplenty/common/biome/BOPOverworldBiome.java rename src/main/java/biomesoplenty/common/{biomes => biome}/BOPSubBiome.java (59%) create mode 100644 src/main/java/biomesoplenty/common/biome/decoration/BOPNetherBiomeDecorator.java create mode 100644 src/main/java/biomesoplenty/common/biome/decoration/BOPOverworldBiomeDecorator.java create mode 100644 src/main/java/biomesoplenty/common/biome/decoration/BiomeFeaturesBase.java create mode 100644 src/main/java/biomesoplenty/common/biome/decoration/NetherBiomeFeatures.java create mode 100644 src/main/java/biomesoplenty/common/biome/decoration/OverworldBiomeFeatures.java create mode 100644 src/main/java/biomesoplenty/common/biome/nether/BiomeGenBoneyard.java rename src/main/java/biomesoplenty/common/{biomes => biome}/nether/BiomeGenCorruptedSands.java (52%) create mode 100644 src/main/java/biomesoplenty/common/biome/nether/BiomeGenPhantasmagoricInferno.java create mode 100644 src/main/java/biomesoplenty/common/biome/nether/BiomeGenUndergarden.java rename src/main/java/biomesoplenty/common/{biomes => biome}/nether/BiomeGenVisceralHeap.java (57%) create mode 100644 src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPBirchForest.java create mode 100644 src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPDesert.java create mode 100644 src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPExtremeHills.java create mode 100644 src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPForest.java create mode 100644 src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPHell.java create mode 100644 src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPIcePlains.java create mode 100644 src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPJungle.java create mode 100644 src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPMesa.java create mode 100644 src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPMushroomIsland.java create mode 100644 src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPOcean.java create mode 100644 src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPPlains.java create mode 100644 src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPRiver.java create mode 100644 src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPRoofedForest.java create mode 100644 src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPSavanna.java create mode 100644 src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPSwamp.java create mode 100644 src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPTaiga.java rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenAlps.java (86%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenArctic.java (84%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenBambooForest.java (86%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenBayou.java (67%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenBog.java (58%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenBorealForest.java (64%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenBrushland.java (65%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenCanyon.java (75%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenChaparral.java (58%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenCherryBlossomGrove.java (57%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenConiferousForest.java (54%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenConiferousForestSnow.java (65%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenCrag.java (90%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenDeadForest.java (69%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenDeadSwamp.java (70%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenDeciduousForest.java (60%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenFen.java (57%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenFlowerField.java (65%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenFrostForest.java (64%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenFungiForest.java (61%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenGarden.java (56%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenGrassland.java (63%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenGrove.java (60%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenHeathland.java (61%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenHighland.java (58%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenJadeCliffs.java (77%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenLavenderFields.java (87%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenLushDesert.java (67%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenLushSwamp.java (52%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenMapleWoods.java (63%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenMarsh.java (58%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenMeadow.java (60%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenMoor.java (61%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenMountain.java (59%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenMysticGrove.java (60%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenOminousWoods.java (71%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenOriginValley.java (66%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenOutback.java (78%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenPrairie.java (55%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenRainforest.java (71%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenRedwoodForest.java (62%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenSacredSprings.java (79%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenSeasonalForest.java (70%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenShield.java (68%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenShrubland.java (54%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenSludgepit.java (70%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenSteppe.java (67%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenTemperateRainforest.java (66%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenThicket.java (76%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenTropicalRainforest.java (67%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenTundra.java (62%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenWasteland.java (74%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenWetland.java (59%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/BiomeGenWoodland.java (53%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/ocean/BiomeGenCoralReef.java (74%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/ocean/BiomeGenKelpForest.java (74%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/sub/BiomeGenAlpsForest.java (72%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/sub/BiomeGenCanyonRavine.java (79%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/sub/BiomeGenGlacier.java (92%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/sub/BiomeGenMangrove.java (80%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/sub/BiomeGenMeadowForest.java (65%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/sub/BiomeGenOasis.java (66%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/sub/BiomeGenOrchard.java (64%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/sub/BiomeGenQuagmire.java (77%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/sub/BiomeGenScrubland.java (67%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/sub/BiomeGenSilkglades.java (76%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/sub/BiomeGenSpruceWoods.java (62%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/sub/BiomeGenTropics.java (65%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/sub/BiomeGenVolcano.java (86%) rename src/main/java/biomesoplenty/common/{biomes => biome}/overworld/tech/BiomeGenDryRiver.java (71%) create mode 100644 src/main/java/biomesoplenty/common/biome/overworld/tech/BiomeGenLushRiver.java delete mode 100644 src/main/java/biomesoplenty/common/biomes/BOPBiome.java delete mode 100644 src/main/java/biomesoplenty/common/biomes/nether/BiomeGenBoneyard.java delete mode 100644 src/main/java/biomesoplenty/common/biomes/nether/BiomeGenPhantasmagoricInferno.java delete mode 100644 src/main/java/biomesoplenty/common/biomes/nether/BiomeGenUndergarden.java delete mode 100644 src/main/java/biomesoplenty/common/biomes/overworld/tech/BiomeGenLushRiver.java delete mode 100644 src/main/java/biomesoplenty/common/world/decoration/BOPDecorationManager.java delete mode 100644 src/main/java/biomesoplenty/common/world/decoration/BOPWorldFeatures.java delete mode 100644 src/main/java/biomesoplenty/common/world/decoration/BiomeTweaker.java delete mode 100644 src/main/java/biomesoplenty/common/world/decoration/ForcedDecorator.java delete mode 100644 src/main/java/biomesoplenty/common/world/decoration/IBOPBiome.java delete mode 100644 src/main/java/biomesoplenty/common/world/forceddecorators/nether/ForcedDecoratorHell.java delete mode 100644 src/main/java/biomesoplenty/common/world/forceddecorators/overworld/BirchForestForcedDecorator.java delete mode 100644 src/main/java/biomesoplenty/common/world/forceddecorators/overworld/DesertForcedDecorator.java delete mode 100644 src/main/java/biomesoplenty/common/world/forceddecorators/overworld/ExtremeHillsForcedDecorator.java delete mode 100644 src/main/java/biomesoplenty/common/world/forceddecorators/overworld/ForestForcedDecorator.java delete mode 100644 src/main/java/biomesoplenty/common/world/forceddecorators/overworld/IcePlainsForcedDecorator.java delete mode 100644 src/main/java/biomesoplenty/common/world/forceddecorators/overworld/JungleForcedDecorator.java delete mode 100644 src/main/java/biomesoplenty/common/world/forceddecorators/overworld/MesaForcedDecorator.java delete mode 100644 src/main/java/biomesoplenty/common/world/forceddecorators/overworld/MushroomIslandForcedDecorator.java delete mode 100644 src/main/java/biomesoplenty/common/world/forceddecorators/overworld/OceanForcedDecorator.java delete mode 100644 src/main/java/biomesoplenty/common/world/forceddecorators/overworld/PlainsForcedDecorator.java delete mode 100644 src/main/java/biomesoplenty/common/world/forceddecorators/overworld/RiverForcedDecorator.java delete mode 100644 src/main/java/biomesoplenty/common/world/forceddecorators/overworld/RoofedForestForcedDecorator.java delete mode 100644 src/main/java/biomesoplenty/common/world/forceddecorators/overworld/SavannaForcedDecorator.java delete mode 100644 src/main/java/biomesoplenty/common/world/forceddecorators/overworld/SwampForcedDecorator.java delete mode 100644 src/main/java/biomesoplenty/common/world/forceddecorators/overworld/TaigaForcedDecorator.java diff --git a/src/main/java/biomesoplenty/BiomesOPlenty.java b/src/main/java/biomesoplenty/BiomesOPlenty.java index 1f3791e99..89dbc5665 100644 --- a/src/main/java/biomesoplenty/BiomesOPlenty.java +++ b/src/main/java/biomesoplenty/BiomesOPlenty.java @@ -11,7 +11,7 @@ import biomesoplenty.common.integration.TreecapitatorIntegration; import biomesoplenty.common.network.PacketPipeline; import biomesoplenty.common.utils.BOPModInfo; import biomesoplenty.common.world.WorldTypeBOP; -import biomesoplenty.common.world.decoration.BiomeTweaker; +import biomesoplenty.common.world.generation.WorldGenFieldAssociation; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; @@ -52,10 +52,10 @@ public class BiomesOPlenty BOPItems.init(); BOPFluids.init(); BOPCrafting.init(); + WorldGenFieldAssociation.init(); BOPBiomes.init(); BOPConfigurationVillages.init(BOPConfiguration.villagesConfigFile); BOPConfigurationStrongholds.init(BOPConfiguration.strongholdsConfigFile); - BiomeTweaker.init(); BOPEntities.init(); BOPVanillaCompat.init(); diff --git a/src/main/java/biomesoplenty/api/BOPObfuscationHelper.java b/src/main/java/biomesoplenty/api/BOPObfuscationHelper.java new file mode 100644 index 000000000..5682b97e8 --- /dev/null +++ b/src/main/java/biomesoplenty/api/BOPObfuscationHelper.java @@ -0,0 +1,35 @@ +package biomesoplenty.api; + +public class BOPObfuscationHelper +{ + //BiomeGenBase + public static final String[] birchForest = new String[] { "birchForest", "field_150583_P" }; + public static final String[] birchForestHills = new String[] { "birchForestHills", "field_150582_Q" }; + public static final String[] coldTaiga = new String[] { "coldTaiga", "field_150584_S" }; + public static final String[] coldTaigaHills = new String[] { "coldTaigaHills", "field_150579_T" }; + public static final String[] desert = new String[] { "desert", "field_76769_d" }; + public static final String[] desertHills = new String[] { "desertHills", "field_76786_s" }; + public static final String[] extremeHills = new String[] { "extremeHills", "field_76770_e" }; + public static final String[] extremeHillsEdge = new String[] { "extremeHillsEdge", "field_76783_v" }; + public static final String[] forest = new String[] { "forest", "field_76767_f" }; + public static final String[] forestHills = new String[] { "forestHills", "field_76785_t" }; + public static final String[] icePlains = new String[] { "icePlains", "field_76774_n" }; + public static final String[] jungle = new String[] { "jungle", "field_76782_w" }; + public static final String[] jungleEdge = new String[] { "jungleEdge", "field_150574_L" }; + public static final String[] jungleHills = new String[] { "jungleHills", "field_76792_x" }; + public static final String[] mesa = new String[] { "mesa", "field_150589_Z" }; + public static final String[] mesaPlateau = new String[] { "mesaPlateau", "field_150608_ab" }; + public static final String[] mesaPlateau_F = new String[] { "mesaPlateau_F", "field_150607_aa" }; + public static final String[] mushroomIsland = new String[] { "mushroomIsland", "field_76789_p" }; + public static final String[] mushroomIslandShore = new String[] { "mushroomIslandShore", "field_76788_q" }; + public static final String[] ocean = new String[] { "ocean", "field_76771_b" }; + public static final String[] plains = new String[] { "plains", "field_76772_c" }; + public static final String[] savanna = new String[] { "savanna", "field_150588_X" }; + public static final String[] savannaPlateau = new String[] { "savannaPlateau", "field_150587_Y" }; + public static final String[] swampland = new String[] { "swampland", "field_76780_h" }; + public static final String[] taiga = new String[] { "taiga", "field_76768_g" }; + public static final String[] taigaHills = new String[] { "taigaHills", "field_76784_u" }; + public static final String[] river = new String[] { "river", "field_76781_i" }; + public static final String[] roofedForest = new String[] { "roofedForest", "field_150585_R" }; + public static final String[] hell = new String[] { "hell", "field_76778_j" }; +} diff --git a/src/main/java/biomesoplenty/api/biome/BOPBiome.java b/src/main/java/biomesoplenty/api/biome/BOPBiome.java new file mode 100644 index 000000000..540cd24b0 --- /dev/null +++ b/src/main/java/biomesoplenty/api/biome/BOPBiome.java @@ -0,0 +1,46 @@ +package biomesoplenty.api.biome; + +import java.util.List; +import java.util.Random; + +import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; + +public class BOPBiome extends BiomeGenBase +{ + public final T theBiomeDecorator; + + public BOPBiome(int biomeID, Class clazz, boolean register) + { + super(biomeID, register); + + try + { + this.theBiomeDecorator = clazz.newInstance(); + } + catch (InstantiationException | IllegalAccessException e) + { + throw new RuntimeException(); + } + + this.flowers.clear(); + this.addDefaultFlowers(); + + this.theBiomeDecorator.flowersPerChunk = 0; + this.theBiomeDecorator.grassPerChunk = 0; + } + + public BOPBiome(int biomeID, Class clazz) + { + this(biomeID, clazz, true); + } + + //TODO: Wrap tree method + + @Override + public void decorate(World world, Random random, int chunkX, int chunkZ) + { + this.theBiomeDecorator.decorateChunk(world, random, this, chunkX, chunkZ); + } +} diff --git a/src/main/java/biomesoplenty/api/biome/BOPBiomeDecorator.java b/src/main/java/biomesoplenty/api/biome/BOPBiomeDecorator.java new file mode 100644 index 000000000..417bc6a4b --- /dev/null +++ b/src/main/java/biomesoplenty/api/biome/BOPBiomeDecorator.java @@ -0,0 +1,113 @@ +package biomesoplenty.api.biome; + +import java.util.HashMap; +import java.util.Map; +import java.util.Random; + +import biomesoplenty.common.world.generation.IBOPWorldGenerator; +import biomesoplenty.common.world.generation.WorldGenFieldAssociation; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeDecorator; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.gen.feature.WorldGenerator; +import net.minecraftforge.event.terraingen.DecorateBiomeEvent; +import net.minecraftforge.event.terraingen.TerrainGen; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.*; + +public class BOPBiomeDecorator extends BiomeDecorator +{ + public T bopFeatures; + + public BOPBiomeDecorator(Class biomeFeaturesClass) + { + super(); + + try + { + this.bopFeatures = biomeFeaturesClass.newInstance(); + } + catch (InstantiationException | IllegalAccessException e) + { + throw new RuntimeException(); + } + } + + @Override + public void decorateChunk(World world, Random random, BiomeGenBase biome, int chunkX, int chunkZ) + { + if (this.currentWorld != null) + { + return; + } + else + { + this.currentWorld = world; + this.randomGenerator = random; + this.chunk_X = chunkX; + this.chunk_Z = chunkZ; + this.genDecorations(biome); + this.currentWorld = null; + this.randomGenerator = null; + } + } + + @Override + protected void genDecorations(BiomeGenBase biome) + { + super.genDecorations(biome); + + BOPBiome bopBiome = (BOPBiome)biome; + + for (String featureName : bopFeatures.getFeatureNames()) + { + if (featureName.equals("bopFlowersPerChunk")) + { + if (!TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, FLOWERS)) continue; + } + else if (featureName.equals("bopGrassPerChunk")) + { + if (!TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, GRASS)) continue; + } + + WorldGenFieldAssociation.WorldFeature worldFeature = WorldGenFieldAssociation.getAssociatedFeature(featureName); + + if (worldFeature != null) + { + IBOPWorldGenerator worldGenerator = worldFeature.getBOPWorldGenerator(); + + if (worldGenerator != null) + { + worldGenerator.setupGeneration(currentWorld, randomGenerator, bopBiome, featureName, chunk_X, chunk_Z); + } + } + } + } + + public static T getRandomWeightedWorldGenerator(HashMap worldGeneratorMap) + { + double completeWeight = 0D; + + for (Number weight : worldGeneratorMap.values()) + { + completeWeight += Double.parseDouble(weight.toString()); + } + + double random = Math.random() * completeWeight; + double countWeight = 0D; + + for (Map.Entry entry : worldGeneratorMap.entrySet()) + { + countWeight += Double.parseDouble(entry.getValue().toString()); + + if (countWeight >= random) return entry.getKey(); + } + + return null; + } + + protected int nextInt(int i) + { + if (i <= 1) return 0; + return this.randomGenerator.nextInt(i); + } +} diff --git a/src/main/java/biomesoplenty/api/biome/BOPInheritedBiome.java b/src/main/java/biomesoplenty/api/biome/BOPInheritedBiome.java new file mode 100644 index 000000000..eacf1c8cd --- /dev/null +++ b/src/main/java/biomesoplenty/api/biome/BOPInheritedBiome.java @@ -0,0 +1,87 @@ +package biomesoplenty.api.biome; + +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.entity.EnumCreatureType; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.gen.feature.WorldGenAbstractTree; + +public class BOPInheritedBiome extends BOPOverriddenBiome +{ + protected BiomeGenBase inheritedBiome; + + public BOPInheritedBiome(int biomeID, Class clazz, BiomeGenBase inheritedBiome) + { + super(biomeID, clazz); + + this.inheritedBiome = inheritedBiome; + + this.func_150557_a(inheritedBiome.color, true); + this.biomeName = inheritedBiome.biomeName; + this.topBlock = inheritedBiome.topBlock; + this.fillerBlock = inheritedBiome.fillerBlock; + this.field_76754_C = inheritedBiome.field_76754_C; + this.rootHeight = inheritedBiome.rootHeight; + this.heightVariation = inheritedBiome.heightVariation; + this.temperature = inheritedBiome.temperature; + this.rainfall = inheritedBiome.rainfall; + this.waterColorMultiplier = inheritedBiome.waterColorMultiplier; + this.enableSnow = inheritedBiome.getEnableSnow(); + this.enableRain = inheritedBiome.canSpawnLightningBolt(); + this.spawnableCreatureList = inheritedBiome.getSpawnableList(EnumCreatureType.creature); + this.spawnableMonsterList = inheritedBiome.getSpawnableList(EnumCreatureType.monster); + this.spawnableCaveCreatureList = inheritedBiome.getSpawnableList(EnumCreatureType.ambient); + this.spawnableWaterCreatureList = inheritedBiome.getSpawnableList(EnumCreatureType.waterCreature); + } + + @Override + public void decorate(World world, Random random, int chunkX, int chunkZ) + { + this.inheritedBiome.theBiomeDecorator.decorateChunk(world, random, this.inheritedBiome, chunkX, chunkZ); + this.theBiomeDecorator.decorateChunk(world, random, this, chunkX, chunkZ); + } + + @Override + public void genTerrainBlocks(World world, Random random, Block[] blockArray, byte[] metaArray, int chunkX, int chunkZ, double noise) + { + this.inheritedBiome.genTerrainBlocks(world, random, blockArray, metaArray, chunkX, chunkZ, noise); + } + + @Override + public float getSpawningChance() + { + return this.inheritedBiome.getSpawningChance(); + } + + @Override + public WorldGenAbstractTree func_150567_a(Random random) + { + return this.inheritedBiome.func_150567_a(random); + } + + @Override + public int getBiomeGrassColor(int x, int y, int z) + { + return this.inheritedBiome.getBiomeGrassColor(x, y, z); + } + + @Override + public int getBiomeFoliageColor(int x, int y, int z) + { + return this.inheritedBiome.getBiomeFoliageColor(x, y, z); + } + + @Override + public boolean isEqualTo(BiomeGenBase biome) + { + return this.inheritedBiome.isEqualTo(biome); + } + + @Override + public BiomeGenBase.TempCategory getTempCategory() + { + return this.inheritedBiome.getTempCategory(); + } +} diff --git a/src/main/java/biomesoplenty/api/biome/BOPOverriddenBiome.java b/src/main/java/biomesoplenty/api/biome/BOPOverriddenBiome.java new file mode 100644 index 000000000..1bfb92349 --- /dev/null +++ b/src/main/java/biomesoplenty/api/biome/BOPOverriddenBiome.java @@ -0,0 +1,9 @@ +package biomesoplenty.api.biome; + +public class BOPOverriddenBiome extends BOPBiome +{ + public BOPOverriddenBiome(int biomeID, Class clazz) + { + super(biomeID, clazz, false); + } +} diff --git a/src/main/java/biomesoplenty/api/biome/BiomeFeatures.java b/src/main/java/biomesoplenty/api/biome/BiomeFeatures.java new file mode 100644 index 000000000..335694e4e --- /dev/null +++ b/src/main/java/biomesoplenty/api/biome/BiomeFeatures.java @@ -0,0 +1,63 @@ +package biomesoplenty.api.biome; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.HashMap; + +import net.minecraft.world.gen.feature.WorldGenerator; +import biomesoplenty.api.exception.FeatureExistsException; +import biomesoplenty.api.exception.NoSuchFeatureException; + +public class BiomeFeatures +{ + public HashMap weightedGrassGen = new HashMap(); + public HashMap weightedFlowerGen = new HashMap(); + + private ArrayList features = new ArrayList(); + + @BiomeFeature public int bopFlowersPerChunk = 0; + @BiomeFeature public int bopGrassPerChunk = 0; + + public BiomeFeatures() + { + for (Field field : this.getClass().getFields()) + { + if (field.isAnnotationPresent(BiomeFeature.class)) + { + if (!features.contains(field.getName())) + { + features.add(field.getName()); + } + else throw new FeatureExistsException(field.getName()); + } + } + } + + public Object getFeature(String featureName) + { + try + { + return this.getClass().getField(featureName).get(this); + } + catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) + { + throw new NoSuchFeatureException(featureName); + } + } + + public ArrayList getFeatureNames() + { + return features; + } + + @Retention(RetentionPolicy.RUNTIME) + @Target(ElementType.FIELD) + protected @interface BiomeFeature + { + + } +} diff --git a/src/main/java/biomesoplenty/api/exception/FeatureExistsException.java b/src/main/java/biomesoplenty/api/exception/FeatureExistsException.java new file mode 100644 index 000000000..eb615593e --- /dev/null +++ b/src/main/java/biomesoplenty/api/exception/FeatureExistsException.java @@ -0,0 +1,9 @@ +package biomesoplenty.api.exception; + +public class FeatureExistsException extends RuntimeException +{ + public FeatureExistsException(String name) + { + super("Feature " + name + " already exists!"); + } +} diff --git a/src/main/java/biomesoplenty/api/exception/NoSuchFeatureException.java b/src/main/java/biomesoplenty/api/exception/NoSuchFeatureException.java new file mode 100644 index 000000000..cc2b4b3fa --- /dev/null +++ b/src/main/java/biomesoplenty/api/exception/NoSuchFeatureException.java @@ -0,0 +1,9 @@ +package biomesoplenty.api.exception; + +public class NoSuchFeatureException extends RuntimeException +{ + public NoSuchFeatureException(String name) + { + super("Feature " + name + " does not exist!"); + } +} diff --git a/src/main/java/biomesoplenty/common/biome/BOPInheritedNetherBiome.java b/src/main/java/biomesoplenty/common/biome/BOPInheritedNetherBiome.java new file mode 100644 index 000000000..b03c08320 --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/BOPInheritedNetherBiome.java @@ -0,0 +1,14 @@ +package biomesoplenty.common.biome; + +import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.api.biome.BOPInheritedBiome; +import biomesoplenty.common.biome.decoration.BOPNetherBiomeDecorator; +import biomesoplenty.common.biome.decoration.BOPOverworldBiomeDecorator; + +public class BOPInheritedNetherBiome extends BOPInheritedBiome +{ + public BOPInheritedNetherBiome(int biomeID, BiomeGenBase inheritedBiome) + { + super(biomeID, BOPNetherBiomeDecorator.class, inheritedBiome); + } +} diff --git a/src/main/java/biomesoplenty/common/biome/BOPInheritedOverworldBiome.java b/src/main/java/biomesoplenty/common/biome/BOPInheritedOverworldBiome.java new file mode 100644 index 000000000..5a5e0bf1c --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/BOPInheritedOverworldBiome.java @@ -0,0 +1,13 @@ +package biomesoplenty.common.biome; + +import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.api.biome.BOPInheritedBiome; +import biomesoplenty.common.biome.decoration.BOPOverworldBiomeDecorator; + +public class BOPInheritedOverworldBiome extends BOPInheritedBiome +{ + public BOPInheritedOverworldBiome(int biomeID, BiomeGenBase inheritedBiome) + { + super(biomeID, BOPOverworldBiomeDecorator.class, inheritedBiome); + } +} diff --git a/src/main/java/biomesoplenty/common/biomes/BOPNetherBiome.java b/src/main/java/biomesoplenty/common/biome/BOPNetherBiome.java similarity index 66% rename from src/main/java/biomesoplenty/common/biomes/BOPNetherBiome.java rename to src/main/java/biomesoplenty/common/biome/BOPNetherBiome.java index f43661b19..ac6a2eee7 100644 --- a/src/main/java/biomesoplenty/common/biomes/BOPNetherBiome.java +++ b/src/main/java/biomesoplenty/common/biome/BOPNetherBiome.java @@ -1,14 +1,19 @@ -package biomesoplenty.common.biomes; +package biomesoplenty.common.biome; +import java.util.Random; + +import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.common.biome.decoration.BOPNetherBiomeDecorator; import net.minecraft.entity.monster.EntityGhast; import net.minecraft.entity.monster.EntityMagmaCube; import net.minecraft.entity.monster.EntityPigZombie; +import net.minecraft.world.World; -public class BOPNetherBiome extends BOPBiome +public class BOPNetherBiome extends BOPBiome { public BOPNetherBiome(int id) { - super(id); + super(id, BOPNetherBiomeDecorator.class); this.setDisableRain(); this.setTemperatureRainfall(2.0F, 0.0F); @@ -21,10 +26,5 @@ public class BOPNetherBiome extends BOPBiome this.spawnableMonsterList.add(new SpawnListEntry(EntityGhast.class, 50, 4, 4)); this.spawnableMonsterList.add(new SpawnListEntry(EntityPigZombie.class, 100, 4, 4)); this.spawnableMonsterList.add(new SpawnListEntry(EntityMagmaCube.class, 1, 4, 4)); - - this.bopWorldFeatures.setFeature("stalagmitesPerChunk", 0); - this.bopWorldFeatures.setFeature("stalactitesPerChunk", 0); - this.bopWorldFeatures.setFeature("minersDelightPerChunk", 0); - this.bopWorldFeatures.setFeature("rootsPerChunk", 0); } } diff --git a/src/main/java/biomesoplenty/common/biomes/BOPOceanBiome.java b/src/main/java/biomesoplenty/common/biome/BOPOceanBiome.java similarity index 74% rename from src/main/java/biomesoplenty/common/biomes/BOPOceanBiome.java rename to src/main/java/biomesoplenty/common/biome/BOPOceanBiome.java index 8e5139ca8..7052f7a1a 100644 --- a/src/main/java/biomesoplenty/common/biomes/BOPOceanBiome.java +++ b/src/main/java/biomesoplenty/common/biome/BOPOceanBiome.java @@ -1,9 +1,9 @@ -package biomesoplenty.common.biomes; +package biomesoplenty.common.biome; import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.common.world.BOPBiomeManager; -public abstract class BOPOceanBiome extends BOPSubBiome +public class BOPOceanBiome extends BOPSubBiome { public BOPOceanBiome(int biomeID) { diff --git a/src/main/java/biomesoplenty/common/biome/BOPOverworldBiome.java b/src/main/java/biomesoplenty/common/biome/BOPOverworldBiome.java new file mode 100644 index 000000000..fee75f67d --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/BOPOverworldBiome.java @@ -0,0 +1,12 @@ +package biomesoplenty.common.biome; + +import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.common.biome.decoration.BOPOverworldBiomeDecorator; + +public class BOPOverworldBiome extends BOPBiome +{ + public BOPOverworldBiome(int biomeID) + { + super(biomeID, BOPOverworldBiomeDecorator.class); + } +} diff --git a/src/main/java/biomesoplenty/common/biomes/BOPSubBiome.java b/src/main/java/biomesoplenty/common/biome/BOPSubBiome.java similarity index 59% rename from src/main/java/biomesoplenty/common/biomes/BOPSubBiome.java rename to src/main/java/biomesoplenty/common/biome/BOPSubBiome.java index 0bf4ac3f3..4b13a7fef 100644 --- a/src/main/java/biomesoplenty/common/biomes/BOPSubBiome.java +++ b/src/main/java/biomesoplenty/common/biome/BOPSubBiome.java @@ -1,11 +1,6 @@ -package biomesoplenty.common.biomes; +package biomesoplenty.common.biome; -import java.util.ArrayList; -import java.util.List; - -import biomesoplenty.common.world.layer.GenLayerSubBiome; - -public abstract class BOPSubBiome extends BOPBiome +public class BOPSubBiome extends BOPOverworldBiome { /**Smaller numbers zoom in the noise field (biomes are less common)*/ public double zoom; diff --git a/src/main/java/biomesoplenty/common/biome/decoration/BOPNetherBiomeDecorator.java b/src/main/java/biomesoplenty/common/biome/decoration/BOPNetherBiomeDecorator.java new file mode 100644 index 000000000..7af2cbf5d --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/decoration/BOPNetherBiomeDecorator.java @@ -0,0 +1,101 @@ +package biomesoplenty.common.biome.decoration; + +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.BIG_SHROOM; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.CACTUS; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.CLAY; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.DEAD_BUSH; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.FLOWERS; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.GRASS; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.LAKE; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.LILYPAD; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.PUMPKIN; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.REED; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.SAND; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.SAND_PASS2; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.SHROOM; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.TREE; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.material.Material; +import net.minecraft.init.Blocks; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.gen.feature.WorldGenAbstractTree; +import net.minecraft.world.gen.feature.WorldGenDeadBush; +import net.minecraft.world.gen.feature.WorldGenLiquids; +import net.minecraft.world.gen.feature.WorldGenPumpkin; +import net.minecraft.world.gen.feature.WorldGenerator; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.terraingen.DecorateBiomeEvent; +import net.minecraftforge.event.terraingen.TerrainGen; +import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.biome.BOPBiomeDecorator; +import biomesoplenty.common.world.generation.IBOPWorldGenerator; +import biomesoplenty.common.world.generation.WorldGenFieldAssociation; + +public class BOPNetherBiomeDecorator extends BOPBiomeDecorator +{ + public BOPNetherBiomeDecorator() + { + super(NetherBiomeFeatures.class); + } + + @Override + protected void genDecorations(BiomeGenBase biome) + { + BOPBiome bopBiome = (BOPBiome)biome; + + MinecraftForge.EVENT_BUS.post(new DecorateBiomeEvent.Pre(currentWorld, randomGenerator, chunk_X, chunk_Z)); + + int i; + int x; + int y; + int z; + int perChunk = this.treesPerChunk; + + if (this.randomGenerator.nextInt(10) == 0) + { + ++perChunk; + } + + boolean doGen = TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, TREE); + + for (i = 0; doGen && i < perChunk; ++i) + { + x = this.chunk_X + this.randomGenerator.nextInt(16) + 8; + z = this.chunk_Z + this.randomGenerator.nextInt(16) + 8; + y = this.nextInt(128); + WorldGenAbstractTree worldgenabstracttree = biome.func_150567_a(this.randomGenerator); + worldgenabstracttree.setScale(1.0D, 1.0D, 1.0D); + + if (worldgenabstracttree.generate(this.currentWorld, this.randomGenerator, x, y, z)) + { + worldgenabstracttree.func_150524_b(this.currentWorld, this.randomGenerator, x, y, z); + } + } + + for (String featureName : bopFeatures.getFeatureNames()) + { + if (featureName.equals("bopFlowersPerChunk")) + { + if (!TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, FLOWERS)) continue; + } + else if (featureName.equals("bopGrassPerChunk")) + { + if (!TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, GRASS)) continue; + } + + WorldGenFieldAssociation.WorldFeature worldFeature = WorldGenFieldAssociation.getAssociatedFeature(featureName); + + if (worldFeature != null) + { + IBOPWorldGenerator worldGenerator = worldFeature.getBOPWorldGenerator(); + + if (worldGenerator != null) + { + worldGenerator.setupGeneration(currentWorld, randomGenerator, bopBiome, featureName, chunk_X, chunk_Z); + } + } + } + + MinecraftForge.EVENT_BUS.post(new DecorateBiomeEvent.Post(currentWorld, randomGenerator, chunk_X, chunk_Z)); + } +} diff --git a/src/main/java/biomesoplenty/common/biome/decoration/BOPOverworldBiomeDecorator.java b/src/main/java/biomesoplenty/common/biome/decoration/BOPOverworldBiomeDecorator.java new file mode 100644 index 000000000..bac812918 --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/decoration/BOPOverworldBiomeDecorator.java @@ -0,0 +1,12 @@ +package biomesoplenty.common.biome.decoration; + +import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.biome.BOPBiomeDecorator; + +public class BOPOverworldBiomeDecorator extends BOPBiomeDecorator +{ + public BOPOverworldBiomeDecorator() + { + super(OverworldBiomeFeatures.class); + } +} diff --git a/src/main/java/biomesoplenty/common/biome/decoration/BiomeFeaturesBase.java b/src/main/java/biomesoplenty/common/biome/decoration/BiomeFeaturesBase.java new file mode 100644 index 000000000..6b8d3f907 --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/decoration/BiomeFeaturesBase.java @@ -0,0 +1,14 @@ +package biomesoplenty.common.biome.decoration; + +import biomesoplenty.api.biome.BiomeFeatures; + +public class BiomeFeaturesBase extends BiomeFeatures +{ + @BiomeFeature public boolean generateAsh = false; + + @BiomeFeature public int thornsPerChunk = 0; + @BiomeFeature public int smolderingGrassPerChunk = 0; + @BiomeFeature public int toadstoolsPerChunk = 0; + @BiomeFeature public int glowshroomsPerChunk = 0; + @BiomeFeature public int bopBigMushroomsPerChunk = 0; +} diff --git a/src/main/java/biomesoplenty/common/biome/decoration/NetherBiomeFeatures.java b/src/main/java/biomesoplenty/common/biome/decoration/NetherBiomeFeatures.java new file mode 100644 index 000000000..08e9b1bf7 --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/decoration/NetherBiomeFeatures.java @@ -0,0 +1,14 @@ +package biomesoplenty.common.biome.decoration; + +import biomesoplenty.api.biome.BiomeFeatures; + +public class NetherBiomeFeatures extends BiomeFeaturesBase +{ + @BiomeFeature public int waspHivesPerChunk = 0; + @BiomeFeature public int boneSpinesUpPerChunk = 0; + @BiomeFeature public int boneSpinesDownPerChunk = 0; + @BiomeFeature public int netherLavaLakesPerChunk = 0; + @BiomeFeature public int netherVinesPerChunk = 0; + @BiomeFeature public int netherrackSplatterPerChunk = 0; + @BiomeFeature public int gravesPerChunk = 0; +} diff --git a/src/main/java/biomesoplenty/common/biome/decoration/OverworldBiomeFeatures.java b/src/main/java/biomesoplenty/common/biome/decoration/OverworldBiomeFeatures.java new file mode 100644 index 000000000..3532fea12 --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/decoration/OverworldBiomeFeatures.java @@ -0,0 +1,76 @@ +package biomesoplenty.common.biome.decoration; + +import biomesoplenty.api.biome.BiomeFeatures; + +public class OverworldBiomeFeatures extends BiomeFeaturesBase +{ + @BiomeFeature public boolean generatePumpkins = true; + @BiomeFeature public boolean generateQuicksand = false; + @BiomeFeature public boolean generateCanyon = false; + @BiomeFeature public boolean generateStoneInGrass = false; + @BiomeFeature public boolean generateStoneInGrass2 = false; + @BiomeFeature public boolean generateGrass = false; + @BiomeFeature public boolean generateSand = false; + @BiomeFeature public boolean generateQuagmire = false; + @BiomeFeature public boolean generateMelons = false; + @BiomeFeature public boolean generateMycelium = false; + @BiomeFeature public boolean generateSponge = false; + + @BiomeFeature public int waterSpringsPerChunk = 50; + @BiomeFeature public int lavaSpringsPerChunk = 20; + + @BiomeFeature public int waterLakesPerChunk = 0; + @BiomeFeature public int lavaLakesPerChunk = 0; + @BiomeFeature public int poisonLakesPerChunk = 0; + + @BiomeFeature public int mudPerChunk = 0; + @BiomeFeature public int riverCanePerChunk = 0; + @BiomeFeature public int shrubsPerChunk = 0; + @BiomeFeature public int bushesPerChunk = 0; + @BiomeFeature public int cloverPatchesPerChunk = 0; + @BiomeFeature public int leafPilesPerChunk = 0; + @BiomeFeature public int deadLeafPilesPerChunk = 0; + @BiomeFeature public int lavenderPerChunk = 0; + @BiomeFeature public int stalagmitesPerChunk = 3; + @BiomeFeature public int stalactitesPerChunk = 6; + @BiomeFeature public int desertSproutsPerChunk = 0; + @BiomeFeature public int bromeliadsPerChunk = 0; + @BiomeFeature public int waterReedsPerChunk = 0; + @BiomeFeature public int wildCarrotsPerChunk = 0; + @BiomeFeature public int poisonIvyPerChunk = 0; + @BiomeFeature public int berryBushesPerChunk = 0; + @BiomeFeature public int portobellosPerChunk = 0; + @BiomeFeature public int koruPerChunk = 0; + @BiomeFeature public int blueMilksPerChunk = 0; + @BiomeFeature public int cattailsPerChunk = 0; + @BiomeFeature public int highCattailsPerChunk = 0; + @BiomeFeature public int algaePerChunk = 0; + @BiomeFeature public int sproutsPerChunk = 0; + @BiomeFeature public int tinyCactiPerChunk = 0; + @BiomeFeature public int oasesPerChunk = 0; + @BiomeFeature public int minersDelightPerChunk = 2; + @BiomeFeature public int rootsPerChunk = 9; + @BiomeFeature public int grassSplatterPerChunk = 0; + @BiomeFeature public int rockpilesPerChunk = 0; + @BiomeFeature public int logsPerChunk = 0; + @BiomeFeature public int lavaSpoutsPerChunk = 0; + @BiomeFeature public int cobwebsPerChunk = 0; + @BiomeFeature public int cobwebNestsPerChunk = 0; + @BiomeFeature public int wasteland1PerChunk = 0; + @BiomeFeature public int wasteland2PerChunk = 0; + @BiomeFeature public int wasteland3PerChunk = 0; + @BiomeFeature public int wasteland4PerChunk = 0; + @BiomeFeature public int wastelandRockPilesPerChunk = 0; + @BiomeFeature public int sandSplatterPerChunk = 0; + @BiomeFeature public int gravelSplatterPerChunk = 0; + @BiomeFeature public int redSandSplatterPerChunk = 0; + @BiomeFeature public int dirtSplatterPerChunk = 0; + @BiomeFeature public int sandstoneSpikesPerChunk = 0; + + //Ocean Features + @BiomeFeature public int seaweedPerChunk = 0; + @BiomeFeature public int coralPerChunk = 0; + @BiomeFeature public int kelpPerChunk = 0; + @BiomeFeature public int kelpThickPerChunk = 0; + @BiomeFeature public int shortKelpPerChunk = 0; +} diff --git a/src/main/java/biomesoplenty/common/biome/nether/BiomeGenBoneyard.java b/src/main/java/biomesoplenty/common/biome/nether/BiomeGenBoneyard.java new file mode 100644 index 000000000..301c0cc6e --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/nether/BiomeGenBoneyard.java @@ -0,0 +1,22 @@ +package biomesoplenty.common.biome.nether; + +import net.minecraft.init.Blocks; +import biomesoplenty.common.biome.BOPNetherBiome; + +public class BiomeGenBoneyard extends BOPNetherBiome +{ + public BiomeGenBoneyard(int id) + { + super(id); + + this.setColor(15657658); + + this.topBlock = Blocks.netherrack; + this.fillerBlock = Blocks.netherrack; + + this.theBiomeDecorator.bopFeatures.boneSpinesUpPerChunk = 9; + this.theBiomeDecorator.bopFeatures.boneSpinesDownPerChunk = 12; + this.theBiomeDecorator.bopFeatures.gravesPerChunk = 1; + this.theBiomeDecorator.bopFeatures.waspHivesPerChunk = 1; + } +} diff --git a/src/main/java/biomesoplenty/common/biomes/nether/BiomeGenCorruptedSands.java b/src/main/java/biomesoplenty/common/biome/nether/BiomeGenCorruptedSands.java similarity index 52% rename from src/main/java/biomesoplenty/common/biomes/nether/BiomeGenCorruptedSands.java rename to src/main/java/biomesoplenty/common/biome/nether/BiomeGenCorruptedSands.java index c22749e59..8108a01c4 100644 --- a/src/main/java/biomesoplenty/common/biomes/nether/BiomeGenCorruptedSands.java +++ b/src/main/java/biomesoplenty/common/biome/nether/BiomeGenCorruptedSands.java @@ -1,7 +1,7 @@ -package biomesoplenty.common.biomes.nether; +package biomesoplenty.common.biome.nether; import net.minecraft.init.Blocks; -import biomesoplenty.common.biomes.BOPNetherBiome; +import biomesoplenty.common.biome.BOPNetherBiome; public class BiomeGenCorruptedSands extends BOPNetherBiome { @@ -14,8 +14,8 @@ public class BiomeGenCorruptedSands extends BOPNetherBiome this.topBlock = Blocks.soul_sand; this.fillerBlock = Blocks.soul_sand; - this.bopWorldFeatures.setFeature("thornsPerChunk", 10); - this.bopWorldFeatures.setFeature("gravesPerChunk", 1); - this.bopWorldFeatures.setFeature("waspHivesPerChunk", 1); + this.theBiomeDecorator.bopFeatures.thornsPerChunk = 10; + this.theBiomeDecorator.bopFeatures.gravesPerChunk = 1; + this.theBiomeDecorator.bopFeatures.waspHivesPerChunk = 1; } } diff --git a/src/main/java/biomesoplenty/common/biome/nether/BiomeGenPhantasmagoricInferno.java b/src/main/java/biomesoplenty/common/biome/nether/BiomeGenPhantasmagoricInferno.java new file mode 100644 index 000000000..ef59d3ab7 --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/nether/BiomeGenPhantasmagoricInferno.java @@ -0,0 +1,28 @@ +package biomesoplenty.common.biome.nether; + +import net.minecraft.world.gen.feature.WorldGenFire; +import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.common.biome.BOPNetherBiome; + +public class BiomeGenPhantasmagoricInferno extends BOPNetherBiome +{ + public BiomeGenPhantasmagoricInferno(int id) + { + super(id); + + this.setColor(14247446); + + this.topBlock = BOPCBlocks.ash; + this.fillerBlock = BOPCBlocks.ash; + + this.theBiomeDecorator.bopFeatures.netherLavaLakesPerChunk = 20; + this.theBiomeDecorator.bopFeatures.smolderingGrassPerChunk = 30; + this.theBiomeDecorator.bopFeatures.gravesPerChunk = 1; + this.theBiomeDecorator.bopFeatures.waspHivesPerChunk = 1; + this.theBiomeDecorator.bopFeatures.generateAsh = true; + + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 8; + + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenFire(), 1D); + } +} diff --git a/src/main/java/biomesoplenty/common/biome/nether/BiomeGenUndergarden.java b/src/main/java/biomesoplenty/common/biome/nether/BiomeGenUndergarden.java new file mode 100644 index 000000000..31e889659 --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/nether/BiomeGenUndergarden.java @@ -0,0 +1,49 @@ +package biomesoplenty.common.biome.nether; + +import java.util.Random; + +import net.minecraft.init.Blocks; +import net.minecraft.world.gen.feature.WorldGenAbstractTree; +import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.common.biome.BOPNetherBiome; +import biomesoplenty.common.world.features.WorldGenBOPTallGrass; +import biomesoplenty.common.world.features.trees.WorldGenMiniShrub; + +public class BiomeGenUndergarden extends BOPNetherBiome +{ + public BiomeGenUndergarden(int id) + { + super(id); + + this.setColor(15657658); + + this.topBlock = BOPCBlocks.overgrownNetherrack; + this.fillerBlock = Blocks.netherrack; + + this.theBiomeDecorator.treesPerChunk = 50; + + this.theBiomeDecorator.bopFeatures.netherVinesPerChunk = 20; + this.theBiomeDecorator.bopFeatures.netherrackSplatterPerChunk = 45; + this.theBiomeDecorator.bopFeatures.bopBigMushroomsPerChunk = 30; + this.theBiomeDecorator.bopFeatures.gravesPerChunk = 1; + this.theBiomeDecorator.bopFeatures.waspHivesPerChunk = 1; + this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 10; + this.theBiomeDecorator.bopFeatures.glowshroomsPerChunk = 5; + + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 50; + + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 0), 0.25D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + } + + @Override + //TODO: getRandomWorldGenForTrees() + public WorldGenAbstractTree func_150567_a(Random random) + { + return new WorldGenMiniShrub(BOPCBlocks.logs4, BOPCBlocks.leaves4, 1, 0, BOPCBlocks.overgrownNetherrack); + } +} diff --git a/src/main/java/biomesoplenty/common/biomes/nether/BiomeGenVisceralHeap.java b/src/main/java/biomesoplenty/common/biome/nether/BiomeGenVisceralHeap.java similarity index 57% rename from src/main/java/biomesoplenty/common/biomes/nether/BiomeGenVisceralHeap.java rename to src/main/java/biomesoplenty/common/biome/nether/BiomeGenVisceralHeap.java index dcf46d448..a6f8e87a9 100644 --- a/src/main/java/biomesoplenty/common/biomes/nether/BiomeGenVisceralHeap.java +++ b/src/main/java/biomesoplenty/common/biome/nether/BiomeGenVisceralHeap.java @@ -1,7 +1,7 @@ -package biomesoplenty.common.biomes.nether; +package biomesoplenty.common.biome.nether; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPNetherBiome; +import biomesoplenty.common.biome.BOPNetherBiome; public class BiomeGenVisceralHeap extends BOPNetherBiome { @@ -14,7 +14,7 @@ public class BiomeGenVisceralHeap extends BOPNetherBiome this.topBlock = BOPCBlocks.flesh; this.fillerBlock = BOPCBlocks.flesh; - this.bopWorldFeatures.setFeature("gravesPerChunk", 1); - this.bopWorldFeatures.setFeature("waspHivesPerChunk", 1); + this.theBiomeDecorator.bopFeatures.gravesPerChunk = 1; + this.theBiomeDecorator.bopFeatures.waspHivesPerChunk = 1; } } diff --git a/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPBirchForest.java b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPBirchForest.java new file mode 100644 index 000000000..2638d85f4 --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPBirchForest.java @@ -0,0 +1,40 @@ +package biomesoplenty.common.biome.overridden; + +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.gen.feature.WorldGenAbstractTree; +import net.minecraft.world.gen.feature.WorldGenMinable; +import net.minecraft.world.gen.feature.WorldGenTaiga2; +import net.minecraft.world.gen.feature.WorldGenerator; +import biomesoplenty.api.biome.BOPInheritedBiome; +import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.common.biome.BOPInheritedOverworldBiome; +import biomesoplenty.common.world.features.WorldGenBOPFlora; +import biomesoplenty.common.world.features.WorldGenBOPTallGrass; + +public class BiomeGenBOPBirchForest extends BOPInheritedOverworldBiome +{ + public BiomeGenBOPBirchForest(int biomeID, BiomeGenBase inheritedBiome) + { + super(biomeID, inheritedBiome); + + this.theBiomeDecorator.bopFeatures.poisonIvyPerChunk = 3; + this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 15; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 4; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 2; + + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5; + + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 0), 10); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 1), 15); + + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.25D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.25D); + } +} diff --git a/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPDesert.java b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPDesert.java new file mode 100644 index 000000000..2053e8a0d --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPDesert.java @@ -0,0 +1,15 @@ +package biomesoplenty.common.biome.overridden; + +import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.common.biome.BOPInheritedOverworldBiome; + +public class BiomeGenBOPDesert extends BOPInheritedOverworldBiome +{ + public BiomeGenBOPDesert(int biomeID, BiomeGenBase inheritedBiome) + { + super(biomeID, inheritedBiome); + + this.theBiomeDecorator.bopFeatures.tinyCactiPerChunk = 10; + this.theBiomeDecorator.bopFeatures.generateQuicksand = true; + } +} diff --git a/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPExtremeHills.java b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPExtremeHills.java new file mode 100644 index 000000000..bea2aaa64 --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPExtremeHills.java @@ -0,0 +1,39 @@ +package biomesoplenty.common.biome.overridden; + +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.gen.feature.WorldGenAbstractTree; +import net.minecraft.world.gen.feature.WorldGenMinable; +import net.minecraft.world.gen.feature.WorldGenTaiga2; +import net.minecraft.world.gen.feature.WorldGenerator; +import biomesoplenty.api.biome.BOPInheritedBiome; +import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.common.biome.BOPInheritedOverworldBiome; +import biomesoplenty.common.world.features.WorldGenBOPFlora; +import biomesoplenty.common.world.features.WorldGenBOPTallGrass; + +public class BiomeGenBOPExtremeHills extends BOPInheritedOverworldBiome +{ + public BiomeGenBOPExtremeHills(int biomeID, BiomeGenBase inheritedBiome) + { + super(biomeID, inheritedBiome); + + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 3; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 1; + + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 3; + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5; + + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 8); + + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + } +} diff --git a/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPForest.java b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPForest.java new file mode 100644 index 000000000..9124af1cf --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPForest.java @@ -0,0 +1,38 @@ +package biomesoplenty.common.biome.overridden; + +import net.minecraft.init.Blocks; +import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.common.biome.BOPInheritedOverworldBiome; +import biomesoplenty.common.world.features.WorldGenBOPFlora; +import biomesoplenty.common.world.features.WorldGenBOPTallGrass; + +public class BiomeGenBOPForest extends BOPInheritedOverworldBiome +{ + public BiomeGenBOPForest(int biomeID, BiomeGenBase inheritedBiome) + { + super(biomeID, inheritedBiome); + + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 15; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 5; + this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 5; + this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 5; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 6; + this.theBiomeDecorator.bopFeatures.poisonIvyPerChunk = 1; + this.theBiomeDecorator.bopFeatures.bushesPerChunk = 2; + this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 1; + this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 2; + + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5; + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5; + + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8); + + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + } +} diff --git a/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPHell.java b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPHell.java new file mode 100644 index 000000000..a7c999a3d --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPHell.java @@ -0,0 +1,25 @@ +package biomesoplenty.common.biome.overridden; + +import net.minecraft.init.Blocks; +import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.common.biome.BOPInheritedNetherBiome; +import biomesoplenty.common.world.features.WorldGenBOPFlora; + +public class BiomeGenBOPHell extends BOPInheritedNetherBiome +{ + public BiomeGenBOPHell(int biomeID, BiomeGenBase inheritedBiome) + { + super(biomeID, inheritedBiome); + + this.topBlock = Blocks.netherrack; + this.fillerBlock = Blocks.netherrack; + + this.theBiomeDecorator.bopFeatures.gravesPerChunk = 1; + this.theBiomeDecorator.bopFeatures.waspHivesPerChunk = 1; + + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 4; + + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers2, 2), 10); + } +} diff --git a/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPIcePlains.java b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPIcePlains.java new file mode 100644 index 000000000..3b10b93e4 --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPIcePlains.java @@ -0,0 +1,19 @@ +package biomesoplenty.common.biome.overridden; + +import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.common.biome.BOPInheritedOverworldBiome; +import biomesoplenty.common.world.features.WorldGenBOPFlora; + +public class BiomeGenBOPIcePlains extends BOPInheritedOverworldBiome +{ + public BiomeGenBOPIcePlains(int biomeID, BiomeGenBase inheritedBiome) + { + super(biomeID, inheritedBiome); + + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 1; + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5; + + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 8); + } +} diff --git a/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPJungle.java b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPJungle.java new file mode 100644 index 000000000..0e1d9f85a --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPJungle.java @@ -0,0 +1,32 @@ +package biomesoplenty.common.biome.overridden; + +import net.minecraft.init.Blocks; +import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.common.biome.BOPInheritedOverworldBiome; +import biomesoplenty.common.world.features.WorldGenBOPFlora; +import biomesoplenty.common.world.features.WorldGenBOPTallGrass; + +public class BiomeGenBOPJungle extends BOPInheritedOverworldBiome +{ + public BiomeGenBOPJungle(int biomeID, BiomeGenBase inheritedBiome) + { + super(biomeID, inheritedBiome); + + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 15; + this.theBiomeDecorator.bopFeatures.poisonIvyPerChunk = 1; + + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 10; + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5; + + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 5), 12); + + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + } +} diff --git a/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPMesa.java b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPMesa.java new file mode 100644 index 000000000..4ea81506b --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPMesa.java @@ -0,0 +1,33 @@ +package biomesoplenty.common.biome.overridden; + +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.gen.feature.WorldGenAbstractTree; +import net.minecraft.world.gen.feature.WorldGenMinable; +import net.minecraft.world.gen.feature.WorldGenTaiga2; +import net.minecraft.world.gen.feature.WorldGenerator; +import biomesoplenty.api.biome.BOPInheritedBiome; +import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.common.biome.BOPInheritedOverworldBiome; +import biomesoplenty.common.world.features.WorldGenBOPFlora; +import biomesoplenty.common.world.features.WorldGenBOPTallGrass; + +public class BiomeGenBOPMesa extends BOPInheritedOverworldBiome +{ + public BiomeGenBOPMesa(int biomeID, BiomeGenBase inheritedBiome) + { + super(biomeID, inheritedBiome); + + this.theBiomeDecorator.bopFeatures.tinyCactiPerChunk = 10; + this.theBiomeDecorator.bopFeatures.bromeliadsPerChunk = 10; + + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5; + + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.plants, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + } +} diff --git a/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPMushroomIsland.java b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPMushroomIsland.java new file mode 100644 index 000000000..af7c44bfe --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPMushroomIsland.java @@ -0,0 +1,16 @@ +package biomesoplenty.common.biome.overridden; + +import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.common.biome.BOPInheritedOverworldBiome; + +public class BiomeGenBOPMushroomIsland extends BOPInheritedOverworldBiome +{ + public BiomeGenBOPMushroomIsland(int biomeID, BiomeGenBase inheritedBiome) + { + super(biomeID, inheritedBiome); + + this.theBiomeDecorator.bopFeatures.blueMilksPerChunk = 2; + this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 8; + this.theBiomeDecorator.bopFeatures.portobellosPerChunk = 6; + } +} diff --git a/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPOcean.java b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPOcean.java new file mode 100644 index 000000000..ceaa7c4a1 --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPOcean.java @@ -0,0 +1,14 @@ +package biomesoplenty.common.biome.overridden; + +import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.common.biome.BOPInheritedOverworldBiome; + +public class BiomeGenBOPOcean extends BOPInheritedOverworldBiome +{ + public BiomeGenBOPOcean(int biomeID, BiomeGenBase inheritedBiome) + { + super(biomeID, inheritedBiome); + + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 20; + } +} diff --git a/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPPlains.java b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPPlains.java new file mode 100644 index 000000000..3fe745f55 --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPPlains.java @@ -0,0 +1,28 @@ +package biomesoplenty.common.biome.overridden; + +import net.minecraft.init.Blocks; +import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.common.biome.BOPInheritedOverworldBiome; +import biomesoplenty.common.world.features.WorldGenBOPFlora; +import biomesoplenty.common.world.features.WorldGenBOPTallGrass; + +public class BiomeGenBOPPlains extends BOPInheritedOverworldBiome +{ + public BiomeGenBOPPlains(int biomeID, BiomeGenBase inheritedBiome) + { + super(biomeID, inheritedBiome); + + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 8; + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5; + + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 0), 10); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 5); + + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + } +} diff --git a/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPRiver.java b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPRiver.java new file mode 100644 index 000000000..d1d6be861 --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPRiver.java @@ -0,0 +1,16 @@ +package biomesoplenty.common.biome.overridden; + +import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.common.biome.BOPInheritedOverworldBiome; + +public class BiomeGenBOPRiver extends BOPInheritedOverworldBiome +{ + public BiomeGenBOPRiver(int biomeID, BiomeGenBase inheritedBiome) + { + super(biomeID, inheritedBiome); + + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5; + this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 10; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4; + } +} diff --git a/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPRoofedForest.java b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPRoofedForest.java new file mode 100644 index 000000000..4b3582bd2 --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPRoofedForest.java @@ -0,0 +1,30 @@ +package biomesoplenty.common.biome.overridden; + +import net.minecraft.init.Blocks; +import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.common.biome.BOPInheritedOverworldBiome; +import biomesoplenty.common.world.features.WorldGenBOPTallGrass; + +public class BiomeGenBOPRoofedForest extends BOPInheritedOverworldBiome +{ + public BiomeGenBOPRoofedForest(int biomeID, BiomeGenBase inheritedBiome) + { + super(biomeID, inheritedBiome); + + this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.blueMilksPerChunk = 1; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 8; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 4; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2; + + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5; + + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.25D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.25D); + } +} \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPSavanna.java b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPSavanna.java new file mode 100644 index 000000000..5d53c1da0 --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPSavanna.java @@ -0,0 +1,31 @@ +package biomesoplenty.common.biome.overridden; + +import net.minecraft.init.Blocks; +import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.common.biome.BOPInheritedOverworldBiome; +import biomesoplenty.common.world.features.WorldGenBOPFlora; +import biomesoplenty.common.world.features.WorldGenBOPTallGrass; + +public class BiomeGenBOPSavanna extends BOPInheritedOverworldBiome +{ + public BiomeGenBOPSavanna(int biomeID, BiomeGenBase inheritedBiome) + { + super(biomeID, inheritedBiome); + + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 5; + this.theBiomeDecorator.bopFeatures.bushesPerChunk = 3; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 5; + + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 10; + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 20; + + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 7), 8); + + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + } +} diff --git a/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPSwamp.java b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPSwamp.java new file mode 100644 index 000000000..dfc79de54 --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPSwamp.java @@ -0,0 +1,47 @@ +package biomesoplenty.common.biome.overridden; + +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.gen.feature.WorldGenAbstractTree; +import net.minecraft.world.gen.feature.WorldGenMinable; +import net.minecraft.world.gen.feature.WorldGenTaiga2; +import net.minecraft.world.gen.feature.WorldGenerator; +import biomesoplenty.api.biome.BOPInheritedBiome; +import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.common.biome.BOPInheritedOverworldBiome; +import biomesoplenty.common.world.features.WorldGenBOPFlora; +import biomesoplenty.common.world.features.WorldGenBOPTallGrass; + +public class BiomeGenBOPSwamp extends BOPInheritedOverworldBiome +{ + public BiomeGenBOPSwamp(int biomeID, BiomeGenBase inheritedBiome) + { + super(biomeID, inheritedBiome); + + this.theBiomeDecorator.bopFeatures.mudPerChunk = 3; + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 10; + this.theBiomeDecorator.bopFeatures.cattailsPerChunk = 10; + this.theBiomeDecorator.bopFeatures.highCattailsPerChunk = 5; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 3; + this.theBiomeDecorator.bopFeatures.koruPerChunk = 25; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 5; + this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.blueMilksPerChunk = 1; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 2; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 4; + + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5; + + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 1), 15); + + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + } +} diff --git a/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPTaiga.java b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPTaiga.java new file mode 100644 index 000000000..8cd551960 --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPTaiga.java @@ -0,0 +1,22 @@ +package biomesoplenty.common.biome.overridden; + +import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.common.biome.BOPInheritedOverworldBiome; +import biomesoplenty.common.world.features.WorldGenBOPFlora; + +public class BiomeGenBOPTaiga extends BOPInheritedOverworldBiome +{ + public BiomeGenBOPTaiga(int biomeID, BiomeGenBase inheritedBiome) + { + super(biomeID, inheritedBiome); + + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 2; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 4; + + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 2; + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5; + + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 8); + } +} diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenAlps.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java similarity index 86% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenAlps.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java index 7329b54dd..c33b46700 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenAlps.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java @@ -1,13 +1,13 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; -public class BiomeGenAlps extends BOPBiome +public class BiomeGenAlps extends BOPOverworldBiome { private static final Height biomeHeight = new Height(8.0F, 0.025F); @@ -41,12 +41,10 @@ public class BiomeGenAlps extends BOPBiome int y = random.nextInt(28) + 4; int z = chunkZ + random.nextInt(16); - //TODO: getBlock() Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { - //TODO: setBlock() world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2); } } diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenArctic.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenArctic.java similarity index 84% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenArctic.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenArctic.java index e2d5494b6..462fb8a0e 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenArctic.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenArctic.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -6,9 +6,9 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; -public class BiomeGenArctic extends BOPBiome +public class BiomeGenArctic extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0F, 0F); @@ -16,10 +16,8 @@ public class BiomeGenArctic extends BOPBiome { super(id); - //TODO: setHeight() this.setHeight(biomeHeight); this.setEnableSnow(); - //TODO: setColor() this.setColor(14540253); this.setTemperatureRainfall(0.05F, 0.5F); @@ -44,26 +42,22 @@ public class BiomeGenArctic extends BOPBiome int y = random.nextInt(28) + 4; int z = chunkZ + random.nextInt(16); - //TODO: getBlock() Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { - //TODO: setBlock() world.setBlock(x, y, z, BOPCBlocks.gemOre, 8, 2); } } } @Override - //TODO: getBiomeGrassColor() public int getBiomeGrassColor(int x, int y, int z) { return 11176526; } @Override - //TODO: getBiomeFoliageColor() public int getBiomeFoliageColor(int x, int y, int z) { return 11903827; diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBambooForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java similarity index 86% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBambooForest.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java index 9a42a29ba..b775c94d3 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBambooForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -10,11 +10,11 @@ import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.trees.WorldGenBulbTree; -public class BiomeGenBambooForest extends BOPBiome +public class BiomeGenBambooForest extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.3F); @@ -30,13 +30,13 @@ public class BiomeGenBambooForest extends BOPBiome this.theBiomeDecorator.grassPerChunk = 5; this.theBiomeDecorator.flowersPerChunk = -999; - this.bopWorldFeatures.setFeature("riverCanePerChunk", 6); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 6); - this.bopWorldFeatures.setFeature("bushesPerChunk", 5); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 15); - this.bopWorldFeatures.setFeature("algaePerChunk", 2); + this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 6; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 6; + this.theBiomeDecorator.bopFeatures.bushesPerChunk = 5; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 15; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 2; - this.bopWorldFeatures.setFeature("generatePumpkins", false); + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBayou.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java similarity index 67% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBayou.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java index 7be2277e3..6029e8d53 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBayou.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -6,9 +6,11 @@ import net.minecraft.block.Block; import net.minecraft.entity.monster.EntitySlime; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.WorldGenMoss; @@ -16,7 +18,7 @@ import biomesoplenty.common.world.features.trees.WorldGenBayou1; import biomesoplenty.common.world.features.trees.WorldGenBayou2; import biomesoplenty.common.world.features.trees.WorldGenBayou3; -public class BiomeGenBayou extends BOPBiome +public class BiomeGenBayou extends BOPOverworldBiome { private static final Height biomeHeight = new Height(-0.1F, 0.1F); @@ -41,25 +43,25 @@ public class BiomeGenBayou extends BOPBiome this.theBiomeDecorator.sandPerChunk = -999; this.theBiomeDecorator.sandPerChunk2 = -999; - this.bopWorldFeatures.setFeature("waterLakesPerChunk", 5); - this.bopWorldFeatures.setFeature("mudPerChunk", 1); - this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 2); - this.bopWorldFeatures.setFeature("cattailsPerChunk", 1); - this.bopWorldFeatures.setFeature("highCattailsPerChunk", 1); - this.bopWorldFeatures.setFeature("algaePerChunk", 1); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 2); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4); - this.bopWorldFeatures.setFeature("koruPerChunk", 1); - this.bopWorldFeatures.setFeature("seaweedPerChunk", 15); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 5); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 10); - this.bopWorldFeatures.setFeature("generatePumpkins", false); + this.theBiomeDecorator.bopFeatures.waterLakesPerChunk = 5; + this.theBiomeDecorator.bopFeatures.mudPerChunk = 1; + this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.cattailsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.highCattailsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 1; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4; + this.theBiomeDecorator.bopFeatures.koruPerChunk = 1; + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 15; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 5; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 15); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 15; - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBog.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java similarity index 58% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBog.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java index 22683867a..ba79295f4 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBog.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java @@ -1,18 +1,19 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBogBush; import biomesoplenty.common.world.features.trees.WorldGenCypress; -public class BiomeGenBog extends BOPBiome +public class BiomeGenBog extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.2F); @@ -34,27 +35,27 @@ public class BiomeGenBog extends BOPBiome this.theBiomeDecorator.sandPerChunk = -999; this.theBiomeDecorator.sandPerChunk2 = -999; - this.bopWorldFeatures.setFeature("bushesPerChunk", 6); - this.bopWorldFeatures.setFeature("mudPerChunk", 2); - this.bopWorldFeatures.setFeature("algaePerChunk", 3); - this.bopWorldFeatures.setFeature("riverCanePerChunk", 8); - this.bopWorldFeatures.setFeature("blueMilksPerChunk", 1); - this.bopWorldFeatures.setFeature("waterLakesPerChunk", 6); - this.bopWorldFeatures.setFeature("poisonLakesPerChunk", 2); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 8); - this.bopWorldFeatures.setFeature("koruPerChunk", 1); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 10); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 15); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 8); - this.bopWorldFeatures.setFeature("seaweedPerChunk", 15); - this.bopWorldFeatures.setFeature("generatePumpkins", false); + this.theBiomeDecorator.bopFeatures.bushesPerChunk = 6; + this.theBiomeDecorator.bopFeatures.mudPerChunk = 2; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 3; + this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 8; + this.theBiomeDecorator.bopFeatures.blueMilksPerChunk = 1; + this.theBiomeDecorator.bopFeatures.waterLakesPerChunk = 6; + this.theBiomeDecorator.bopFeatures.poisonLakesPerChunk = 2; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 8; + this.theBiomeDecorator.bopFeatures.koruPerChunk = 1; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 10; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 15; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 8; + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 15; + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5; - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBorealForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java similarity index 64% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBorealForest.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java index eb67cfc1f..6cfa04ba2 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBorealForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -6,16 +6,18 @@ import net.minecraft.block.Block; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenShrub; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2; import biomesoplenty.common.world.features.trees.WorldGenOriginalTree; -public class BiomeGenBorealForest extends BOPBiome +public class BiomeGenBorealForest extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.2F, 0.4F); @@ -32,20 +34,20 @@ public class BiomeGenBorealForest extends BOPBiome this.theBiomeDecorator.treesPerChunk = 20; this.theBiomeDecorator.grassPerChunk = 50; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 5); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 10); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 10); - this.bopWorldFeatures.setFeature("algaePerChunk", 2); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 10; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 2; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 50); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 50; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 10); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 10); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 2D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 2D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBrushland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBrushland.java similarity index 65% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBrushland.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBrushland.java index 0cca0ad0a..d33445b13 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBrushland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBrushland.java @@ -1,20 +1,21 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBrush1; import biomesoplenty.common.world.features.trees.WorldGenBrush2; import biomesoplenty.common.world.features.trees.WorldGenMiniShrub; -public class BiomeGenBrushland extends BOPBiome +public class BiomeGenBrushland extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.2F); @@ -30,19 +31,19 @@ public class BiomeGenBrushland extends BOPBiome this.theBiomeDecorator.grassPerChunk = 6; this.theBiomeDecorator.flowersPerChunk = -999; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 5); - this.bopWorldFeatures.setFeature("thornsPerChunk", 4); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 30); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2); - this.bopWorldFeatures.setFeature("generateQuicksand", true); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5; + this.theBiomeDecorator.bopFeatures.thornsPerChunk = 4; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 30; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.generateQuicksand = true; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 6); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 6; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 5); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 5); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenCanyon.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCanyon.java similarity index 75% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenCanyon.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCanyon.java index 3d27ce5f5..d644c25be 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenCanyon.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCanyon.java @@ -1,18 +1,19 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPShrub; import biomesoplenty.common.world.features.trees.WorldGenPineTree; -public class BiomeGenCanyon extends BOPBiome +public class BiomeGenCanyon extends BOPOverworldBiome { private static final Height biomeHeight = new Height(5.0F, 0.025F); @@ -34,14 +35,14 @@ public class BiomeGenCanyon extends BOPBiome this.theBiomeDecorator.treesPerChunk = 3; this.theBiomeDecorator.flowersPerChunk = -999; - this.bopWorldFeatures.setFeature("bromeliadsPerChunk", 3); - this.bopWorldFeatures.setFeature("grassSplatterPerChunk", 4); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4); - this.bopWorldFeatures.setFeature("generatePumpkins", false); + this.theBiomeDecorator.bopFeatures.bromeliadsPerChunk = 3; + this.theBiomeDecorator.bopFeatures.grassSplatterPerChunk = 4; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4; + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5; - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenChaparral.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java similarity index 58% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenChaparral.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java index 40233128d..8c57191b2 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenChaparral.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -6,16 +6,18 @@ import net.minecraft.block.Block; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPShrub; import biomesoplenty.common.world.features.trees.WorldGenChaparral3; import biomesoplenty.common.world.features.trees.WorldGenMiniShrub; -public class BiomeGenChaparral extends BOPBiome +public class BiomeGenChaparral extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.2F, 0.3F); @@ -34,26 +36,26 @@ public class BiomeGenChaparral extends BOPBiome this.theBiomeDecorator.treesPerChunk = 8; this.theBiomeDecorator.grassPerChunk = 20; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 5); - this.bopWorldFeatures.setFeature("bushesPerChunk", 10); - this.bopWorldFeatures.setFeature("berryBushesPerChunk", 2); - this.bopWorldFeatures.setFeature("generateStoneInGrass", true); - this.bopWorldFeatures.setFeature("wildCarrotsPerChunk", 1); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 10); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5); - this.bopWorldFeatures.setFeature("generatePumpkins", false); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5; + this.theBiomeDecorator.bopFeatures.bushesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 2; + this.theBiomeDecorator.bopFeatures.generateStoneInGrass = true; + this.theBiomeDecorator.bopFeatures.wildCarrotsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 10; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 5; + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 20); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 20; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 8); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 4); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 8); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 4); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenCherryBlossomGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java similarity index 57% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenCherryBlossomGrove.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java index 95c832a04..3c9f4dbce 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenCherryBlossomGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java @@ -1,19 +1,20 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPBigTree; -public class BiomeGenCherryBlossomGrove extends BOPBiome +public class BiomeGenCherryBlossomGrove extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.2F); @@ -31,23 +32,23 @@ public class BiomeGenCherryBlossomGrove extends BOPBiome this.theBiomeDecorator.grassPerChunk = 15; this.theBiomeDecorator.flowersPerChunk = -999; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 10); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 2); - this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 15); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 15); - this.bopWorldFeatures.setFeature("generatePumpkins", false); - this.bopWorldFeatures.setFeature("algaePerChunk", 2); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 10; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 15; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 15; + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 2; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 15); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 15; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 6), 12); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 8); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 0), 6); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 4); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 6), 12); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 8); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 0), 6); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 4); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenConiferousForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java similarity index 54% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenConiferousForest.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java index dffdfc8fe..1c39fe9e6 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenConiferousForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -6,16 +6,18 @@ import net.minecraft.block.Block; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga3; -public class BiomeGenConiferousForest extends BOPBiome +public class BiomeGenConiferousForest extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.3F); @@ -38,29 +40,29 @@ public class BiomeGenConiferousForest extends BOPBiome this.theBiomeDecorator.sandPerChunk = -999; this.theBiomeDecorator.sandPerChunk2 = -999; - this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 3); - this.bopWorldFeatures.setFeature("blueMilksPerChunk", 1); - this.bopWorldFeatures.setFeature("poisonIvyPerChunk", 1); - this.bopWorldFeatures.setFeature("berryBushesPerChunk", 1); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 8); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2); - this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 10); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 4); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 8); - this.bopWorldFeatures.setFeature("seaweedPerChunk", 5); - this.bopWorldFeatures.setFeature("algaePerChunk", 2); + this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 3; + this.theBiomeDecorator.bopFeatures.blueMilksPerChunk = 1; + this.theBiomeDecorator.bopFeatures.poisonIvyPerChunk = 1; + this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 1; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 8; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 4; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 8; + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 2; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 10); - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 25); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 10; + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 25; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers2, 5), 15); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers2, 5), 15); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(3, 64), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(3, 64), 0.5D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenConiferousForestSnow.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForestSnow.java similarity index 65% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenConiferousForestSnow.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForestSnow.java index 33600a12f..4949af906 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenConiferousForestSnow.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForestSnow.java @@ -1,20 +1,21 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga3; -public class BiomeGenConiferousForestSnow extends BOPBiome +public class BiomeGenConiferousForestSnow extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.3F); @@ -38,20 +39,20 @@ public class BiomeGenConiferousForestSnow extends BOPBiome this.theBiomeDecorator.sandPerChunk = -999; this.theBiomeDecorator.sandPerChunk2 = -999; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 3); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 4); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 8); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 3; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 4; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 8; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 8); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 8); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.25D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(3, 64), 0.25D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.25D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(3, 64), 0.25D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenCrag.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java similarity index 90% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenCrag.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java index dc7de93f9..c2271f431 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenCrag.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java @@ -1,16 +1,16 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import biomesoplenty.api.BOPBlockHelper; +import net.minecraft.world.biome.BiomeGenBase.Height; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; -public class BiomeGenCrag extends BOPBiome +public class BiomeGenCrag extends BOPOverworldBiome { private static final Height biomeHeight = new Height(2.0F, 3.0F); diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenDeadForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java similarity index 69% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenDeadForest.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java index 4fd281444..bc6b61552 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenDeadForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java @@ -1,20 +1,21 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2; import biomesoplenty.common.world.features.trees.WorldGenDeadTree; import biomesoplenty.common.world.features.trees.WorldGenOriginalTree; -public class BiomeGenDeadForest extends BOPBiome +public class BiomeGenDeadForest extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.3F); @@ -32,17 +33,17 @@ public class BiomeGenDeadForest extends BOPBiome this.theBiomeDecorator.flowersPerChunk = -999; this.theBiomeDecorator.reedsPerChunk = -999; - this.bopWorldFeatures.setFeature("shrubsPerChunk", 2); - this.bopWorldFeatures.setFeature("thornsPerChunk", 2); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 20); + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.thornsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 20; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 1); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 1; - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 0), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 0), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenDeadSwamp.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java similarity index 70% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenDeadSwamp.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java index 137217ad6..c54379e3d 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenDeadSwamp.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java @@ -1,19 +1,20 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenDeadTree; -public class BiomeGenDeadSwamp extends BOPBiome +public class BiomeGenDeadSwamp extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.0F, 0.1F); @@ -39,19 +40,19 @@ public class BiomeGenDeadSwamp extends BOPBiome this.theBiomeDecorator.sandPerChunk = -999; this.theBiomeDecorator.sandPerChunk2 = -999; - this.bopWorldFeatures.setFeature("mudPerChunk", 3); - this.bopWorldFeatures.setFeature("riverCanePerChunk", 2); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4); - this.bopWorldFeatures.setFeature("koruPerChunk", 1); - this.bopWorldFeatures.setFeature("seaweedPerChunk", 5); + this.theBiomeDecorator.bopFeatures.mudPerChunk = 3; + this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 2; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4; + this.theBiomeDecorator.bopFeatures.koruPerChunk = 1; + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 25); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 25; - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 0.25D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 0.25D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenDeciduousForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeciduousForest.java similarity index 60% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenDeciduousForest.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeciduousForest.java index cacceee0c..ffac027af 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenDeciduousForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeciduousForest.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -8,11 +8,11 @@ import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenShrub; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBulbTree; -public class BiomeGenDeciduousForest extends BOPBiome +public class BiomeGenDeciduousForest extends BOPOverworldBiome { //private static final Height biomeHeight = new Height(); Not set? @@ -29,23 +29,23 @@ public class BiomeGenDeciduousForest extends BOPBiome this.theBiomeDecorator.grassPerChunk = 10; this.theBiomeDecorator.flowersPerChunk = -999; - this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 1); - this.bopWorldFeatures.setFeature("bushesPerChunk", 8); - this.bopWorldFeatures.setFeature("berryBushesPerChunk", 2); - this.bopWorldFeatures.setFeature("blueMilksPerChunk", 2); - this.bopWorldFeatures.setFeature("poisonIvyPerChunk", 1); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 10); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 10); - this.bopWorldFeatures.setFeature("algaePerChunk", 3); + this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.bushesPerChunk = 8; + this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 2; + this.theBiomeDecorator.bopFeatures.blueMilksPerChunk = 2; + this.theBiomeDecorator.bopFeatures.poisonIvyPerChunk = 1; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 10; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 3; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 10); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 10; - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenFen.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java similarity index 57% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenFen.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java index 6388654f5..d01ce27c7 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenFen.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -6,9 +6,11 @@ import net.minecraft.block.Block; import net.minecraft.entity.monster.EntitySlime; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; @@ -17,7 +19,7 @@ import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga1; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2; import biomesoplenty.common.world.features.trees.WorldGenDeadTree; -public class BiomeGenFen extends BOPBiome +public class BiomeGenFen extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.3F); @@ -37,31 +39,31 @@ public class BiomeGenFen extends BOPBiome this.theBiomeDecorator.sandPerChunk = -999; this.theBiomeDecorator.sandPerChunk2 = -999; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 5); - this.bopWorldFeatures.setFeature("cattailsPerChunk", 1); - this.bopWorldFeatures.setFeature("highCattailsPerChunk", 1); - this.bopWorldFeatures.setFeature("waterSpringsPerChunk", 99); - this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 2); - this.bopWorldFeatures.setFeature("mudPerChunk", 1); - this.bopWorldFeatures.setFeature("riverCanePerChunk", 5); - this.bopWorldFeatures.setFeature("algaePerChunk", 3); - this.bopWorldFeatures.setFeature("portobellosPerChunk", 1); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 10); - this.bopWorldFeatures.setFeature("koruPerChunk", 1); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 7); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 10); - this.bopWorldFeatures.setFeature("seaweedPerChunk", 15); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5; + this.theBiomeDecorator.bopFeatures.cattailsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.highCattailsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.waterSpringsPerChunk = 99; + this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.mudPerChunk = 1; + this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 5; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 3; + this.theBiomeDecorator.bopFeatures.portobellosPerChunk = 1; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 10; + this.theBiomeDecorator.bopFeatures.koruPerChunk = 1; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 7; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 15; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 15); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 15; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 6); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 6); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 0.25D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 0.25D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenFlowerField.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java similarity index 65% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenFlowerField.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java index b2456eb4f..32d6d1bed 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenFlowerField.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java @@ -1,17 +1,18 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPFlora; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BiomeGenFlowerField extends BOPBiome +public class BiomeGenFlowerField extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.1F); @@ -25,12 +26,12 @@ public class BiomeGenFlowerField extends BOPBiome this.theBiomeDecorator.treesPerChunk = -999; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 999); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 999; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 7), 10); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 6), 10); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 5), 10); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 4), 10); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 7), 10); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 6), 10); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 5), 10); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 4), 10); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenFrostForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFrostForest.java similarity index 64% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenFrostForest.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFrostForest.java index 1f85a87d4..0d0ba725a 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenFrostForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFrostForest.java @@ -1,18 +1,19 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenTallGrass; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.world.features.WorldGenBOPFlora; -public class BiomeGenFrostForest extends BOPBiome +public class BiomeGenFrostForest extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.2F); @@ -30,20 +31,20 @@ public class BiomeGenFrostForest extends BOPBiome this.theBiomeDecorator.flowersPerChunk = -999; this.theBiomeDecorator.mushroomsPerChunk = -999; - this.bopWorldFeatures.setFeature("shrubsPerChunk", 1); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 2); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 4); - this.bopWorldFeatures.setFeature("generatePumpkins", false); + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 2; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 4; + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 3); - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 1); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 3; + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 1; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers2, 7), 8); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 8); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers2, 7), 8); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 8); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 11), 0.5D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenFungiForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFungiForest.java similarity index 61% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenFungiForest.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFungiForest.java index 05a3d5b4f..0633f2a72 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenFungiForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFungiForest.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -6,10 +6,12 @@ import net.minecraft.block.Block; import net.minecraft.entity.passive.EntityMooshroom; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenShrub; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; @@ -17,7 +19,7 @@ import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.WorldGenMoss; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga3; -public class BiomeGenFungiForest extends BOPBiome +public class BiomeGenFungiForest extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.2F, 0.5F); @@ -39,28 +41,28 @@ public class BiomeGenFungiForest extends BOPBiome this.theBiomeDecorator.mushroomsPerChunk = 8; this.theBiomeDecorator.bigMushroomsPerChunk = 8; - this.bopWorldFeatures.setFeature("sproutsPerChunk", 2); - this.bopWorldFeatures.setFeature("bushesPerChunk", 1); - this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 5); - this.bopWorldFeatures.setFeature("portobellosPerChunk", 7); - this.bopWorldFeatures.setFeature("blueMilksPerChunk", 2); - this.bopWorldFeatures.setFeature("glowshroomsPerChunk", 1); - this.bopWorldFeatures.setFeature("riverCanePerChunk", 1); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 1); - this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 20); - this.bopWorldFeatures.setFeature("generateMycelium", true); + this.theBiomeDecorator.bopFeatures.sproutsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.bushesPerChunk = 1; + this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 5; + this.theBiomeDecorator.bopFeatures.portobellosPerChunk = 7; + this.theBiomeDecorator.bopFeatures.blueMilksPerChunk = 2; + this.theBiomeDecorator.bopFeatures.glowshroomsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 1; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 20; + this.theBiomeDecorator.bopFeatures.generateMycelium = true; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 12); - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 3); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 12; + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 3; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 2D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 0.25D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 2D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 0.25D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenGarden.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGarden.java similarity index 56% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenGarden.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGarden.java index e5b38fbe0..5a974178c 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenGarden.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGarden.java @@ -1,21 +1,23 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenTallGrass; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.entities.EntityRosester; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.trees.WorldGenGiantFlower; -public class BiomeGenGarden extends BOPBiome +public class BiomeGenGarden extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.1F); @@ -35,24 +37,24 @@ public class BiomeGenGarden extends BOPBiome this.theBiomeDecorator.sandPerChunk = -999; this.theBiomeDecorator.sandPerChunk2 = -999; - this.bopWorldFeatures.setFeature("sproutsPerChunk", 2); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 10); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4); - this.bopWorldFeatures.setFeature("generateMelons", true); + this.theBiomeDecorator.bopFeatures.sproutsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 10; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4; + this.theBiomeDecorator.bopFeatures.generateMelons = true; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 20); - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 25); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 20; + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 25; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 0), 15); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 20); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(0, 3), 2); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 0), 15); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 20); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(0, 3), 2); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 1), 0.25D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 2), 0.25D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 0.75D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 1), 0.25D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 2), 0.25D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 0.75D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenGrassland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java similarity index 63% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenGrassland.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java index 28dcc3a00..b3a3254ce 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenGrassland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -10,11 +10,13 @@ import net.minecraft.entity.passive.EntityPig; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; -public class BiomeGenGrassland extends BOPBiome +public class BiomeGenGrassland extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.2F); @@ -40,19 +42,19 @@ public class BiomeGenGrassland extends BOPBiome this.theBiomeDecorator.reedsPerChunk = 35; this.theBiomeDecorator.mushroomsPerChunk = 20; - this.bopWorldFeatures.setFeature("waterLakesPerChunk", 5); - this.bopWorldFeatures.setFeature("portobellosPerChunk", 3); - this.bopWorldFeatures.setFeature("riverCanePerChunk", 5); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2); - this.bopWorldFeatures.setFeature("generatePumpkins", false); + this.theBiomeDecorator.bopFeatures.waterLakesPerChunk = 5; + this.theBiomeDecorator.bopFeatures.portobellosPerChunk = 3; + this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 5; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 3); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 3; - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 1), 0.25D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 2), 0.25D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 1), 0.25D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 2), 0.25D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(Blocks.tallgrass, 1), 1D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java similarity index 60% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenGrove.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java index ed33ba971..c73ae6a52 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java @@ -1,13 +1,14 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; @@ -15,7 +16,7 @@ import biomesoplenty.common.world.features.trees.WorldGenMiniShrub; import biomesoplenty.common.world.features.trees.WorldGenPoplar; import biomesoplenty.common.world.features.trees.WorldGenPoplar2; -public class BiomeGenGrove extends BOPBiome +public class BiomeGenGrove extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.2F); @@ -33,24 +34,24 @@ public class BiomeGenGrove extends BOPBiome this.theBiomeDecorator.flowersPerChunk = 5; this.theBiomeDecorator.grassPerChunk = 8; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 50); - this.bopWorldFeatures.setFeature("sproutsPerChunk", 1); - this.bopWorldFeatures.setFeature("berryBushesPerChunk", 2); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 3); - this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 20); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 5); - this.bopWorldFeatures.setFeature("generatePumpkins", false); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 50; + this.theBiomeDecorator.bopFeatures.sproutsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 2; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 3; + this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 20; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 5; + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 8); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 8; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 0), 16); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 6); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(5, 3), 4); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 0), 16); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 6); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(5, 3), 4); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenHeathland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java similarity index 61% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenHeathland.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java index 8bf7028a6..d903303b8 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenHeathland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -6,16 +6,18 @@ import net.minecraft.block.Block; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenShrub; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPShrub; -public class BiomeGenHeathland extends BOPBiome +public class BiomeGenHeathland extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.2F); @@ -35,22 +37,22 @@ public class BiomeGenHeathland extends BOPBiome this.theBiomeDecorator.grassPerChunk = 10; this.theBiomeDecorator.deadBushPerChunk = 2; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 20); - this.bopWorldFeatures.setFeature("berryBushesPerChunk", 1); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 5); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5); - this.bopWorldFeatures.setFeature("generatePumpkins", false); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 20; + this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 1; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 5; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 5; + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 10); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 10; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 7), 8); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 6); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 4); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 7), 8); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 6); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 4); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenHighland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHighland.java similarity index 58% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenHighland.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHighland.java index 8bb3d6195..691253ac1 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenHighland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHighland.java @@ -1,16 +1,17 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; -public class BiomeGenHighland extends BOPBiome +public class BiomeGenHighland extends BOPOverworldBiome { private static final Height biomeHeight = new Height(2.5F, 0.5F); @@ -25,15 +26,15 @@ public class BiomeGenHighland extends BOPBiome this.theBiomeDecorator.treesPerChunk = -999; this.theBiomeDecorator.grassPerChunk = 99; - this.bopWorldFeatures.setFeature("wildCarrotsPerChunk", 1); - this.bopWorldFeatures.setFeature("rockpilesPerChunk", 1); + this.theBiomeDecorator.bopFeatures.wildCarrotsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.rockpilesPerChunk = 1; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 99); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 99; - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.25D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.25D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.25D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.25D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 1D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenJadeCliffs.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenJadeCliffs.java similarity index 77% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenJadeCliffs.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenJadeCliffs.java index e6ea1bcf2..b8c90df3b 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenJadeCliffs.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenJadeCliffs.java @@ -1,21 +1,22 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.trees.WorldGenPineTree; -public class BiomeGenJadeCliffs extends BOPBiome +public class BiomeGenJadeCliffs extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.5F, 1.0F); @@ -30,14 +31,14 @@ public class BiomeGenJadeCliffs extends BOPBiome this.theBiomeDecorator.treesPerChunk = 12; this.theBiomeDecorator.grassPerChunk = 3; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 3); - this.bopWorldFeatures.setFeature("wildCarrotsPerChunk", 1); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 4); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 2); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 3; + this.theBiomeDecorator.bopFeatures.wildCarrotsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 4; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 2; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 3); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 3; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 6); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 6); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenLavenderFields.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLavenderFields.java similarity index 87% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenLavenderFields.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLavenderFields.java index bdc584748..c871a66bd 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenLavenderFields.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLavenderFields.java @@ -1,18 +1,19 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.trees.WorldGenOriginalTree; -public class BiomeGenLavenderFields extends BOPBiome +public class BiomeGenLavenderFields extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.1F); @@ -28,7 +29,7 @@ public class BiomeGenLavenderFields extends BOPBiome this.theBiomeDecorator.flowersPerChunk = -999; this.theBiomeDecorator.grassPerChunk = 20; - this.bopWorldFeatures.setFeature("lavenderPerChunk", 999); + this.theBiomeDecorator.bopFeatures.lavenderPerChunk = 999; } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenLushDesert.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java similarity index 67% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenLushDesert.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java index d126e0ca0..0a9ef5e1b 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenLushDesert.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -6,17 +6,19 @@ import net.minecraft.block.Block; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenShrub; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenCypress; import biomesoplenty.common.world.features.trees.WorldGenDeadTree; -public class BiomeGenLushDesert extends BOPBiome +public class BiomeGenLushDesert extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.2F, 0.5F); @@ -40,27 +42,27 @@ public class BiomeGenLushDesert extends BOPBiome this.theBiomeDecorator.cactiPerChunk = 20; this.theBiomeDecorator.deadBushPerChunk = 2; - this.bopWorldFeatures.setFeature("shrubsPerChunk", 10); - this.bopWorldFeatures.setFeature("oasesPerChunk", 999); - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 5); - this.bopWorldFeatures.setFeature("tinyCactiPerChunk", 5); - this.bopWorldFeatures.setFeature("waterLakesPerChunk", 5); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4); - this.bopWorldFeatures.setFeature("bromeliadsPerChunk", 3); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 2); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 4); - this.bopWorldFeatures.setFeature("generateSand", true); - this.bopWorldFeatures.setFeature("generatePumpkins", false); + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 10; + this.theBiomeDecorator.bopFeatures.oasesPerChunk = 999; + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5; + this.theBiomeDecorator.bopFeatures.tinyCactiPerChunk = 5; + this.theBiomeDecorator.bopFeatures.waterLakesPerChunk = 5; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4; + this.theBiomeDecorator.bopFeatures.bromeliadsPerChunk = 3; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 2; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 4; + this.theBiomeDecorator.bopFeatures.generateSand = true; + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 8); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 8; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 4); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 7), 8); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 4); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 7), 8); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.plants, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.plants, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenLushSwamp.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java similarity index 52% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenLushSwamp.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java index 0ee755e81..67cfa78e5 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenLushSwamp.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -6,14 +6,16 @@ import net.minecraft.block.Block; import net.minecraft.entity.monster.EntitySlime; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPSwampTree; -public class BiomeGenLushSwamp extends BOPBiome +public class BiomeGenLushSwamp extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.0F, 0.1F); @@ -32,28 +34,28 @@ public class BiomeGenLushSwamp extends BOPBiome this.theBiomeDecorator.mushroomsPerChunk = 8; this.theBiomeDecorator.reedsPerChunk = 16; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 1); - this.bopWorldFeatures.setFeature("cattailsPerChunk", 10); - this.bopWorldFeatures.setFeature("highCattailsPerChunk", 5); - this.bopWorldFeatures.setFeature("riverCanePerChunk", 5); - this.bopWorldFeatures.setFeature("algaePerChunk", 3); - this.bopWorldFeatures.setFeature("poisonLakesPerChunk", 2); - this.bopWorldFeatures.setFeature("wildCarrotsPerChunk", 1); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 5); - this.bopWorldFeatures.setFeature("koruPerChunk", 1); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 6); - this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 10); - this.bopWorldFeatures.setFeature("seaweedPerChunk", 10); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 1; + this.theBiomeDecorator.bopFeatures.cattailsPerChunk = 10; + this.theBiomeDecorator.bopFeatures.highCattailsPerChunk = 5; + this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 5; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 3; + this.theBiomeDecorator.bopFeatures.poisonLakesPerChunk = 2; + this.theBiomeDecorator.bopFeatures.wildCarrotsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 5; + this.theBiomeDecorator.bopFeatures.koruPerChunk = 1; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 6; + this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 10; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 4); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 4; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 4); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 6); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 4); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 6); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMapleWoods.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java similarity index 63% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMapleWoods.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java index 54a3de55a..ba162c715 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMapleWoods.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java @@ -1,19 +1,20 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2; import biomesoplenty.common.world.features.trees.WorldGenOriginalTree; -public class BiomeGenMapleWoods extends BOPBiome +public class BiomeGenMapleWoods extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.3F); @@ -28,18 +29,18 @@ public class BiomeGenMapleWoods extends BOPBiome this.theBiomeDecorator.treesPerChunk = 9; this.theBiomeDecorator.grassPerChunk = 1; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 2); - this.bopWorldFeatures.setFeature("poisonIvyPerChunk", 1); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 2); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 8); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 2; + this.theBiomeDecorator.bopFeatures.poisonIvyPerChunk = 1; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 8; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 1); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 1; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 1); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 1); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMarsh.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMarsh.java similarity index 58% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMarsh.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMarsh.java index 3f74904d9..dd0a0abf5 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMarsh.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMarsh.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -6,12 +6,14 @@ import net.minecraft.block.Block; import net.minecraft.entity.monster.EntitySlime; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; -public class BiomeGenMarsh extends BOPBiome +public class BiomeGenMarsh extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.1F); @@ -36,20 +38,20 @@ public class BiomeGenMarsh extends BOPBiome this.theBiomeDecorator.sandPerChunk = -999; this.theBiomeDecorator.sandPerChunk2 = -999; - this.bopWorldFeatures.setFeature("koruPerChunk", 1); - this.bopWorldFeatures.setFeature("mudPerChunk", 1); - this.bopWorldFeatures.setFeature("waterLakesPerChunk", 100); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 10); - this.bopWorldFeatures.setFeature("seaweedPerChunk", 15); - this.bopWorldFeatures.setFeature("algaePerChunk", 3); - this.bopWorldFeatures.setFeature("generatePumpkins", false); + this.theBiomeDecorator.bopFeatures.koruPerChunk = 1; + this.theBiomeDecorator.bopFeatures.mudPerChunk = 1; + this.theBiomeDecorator.bopFeatures.waterLakesPerChunk = 100; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 10; + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 15; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 3; + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 50); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 50; - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 0.25D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 0.25D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMeadow.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java similarity index 60% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMeadow.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java index a85c9045e..cf9719914 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMeadow.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -6,16 +6,17 @@ import net.minecraft.block.Block; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPShrub; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2; -public class BiomeGenMeadow extends BOPBiome +public class BiomeGenMeadow extends BOPOverworldBiome { public BiomeGenMeadow(int id) { @@ -34,25 +35,25 @@ public class BiomeGenMeadow extends BOPBiome this.theBiomeDecorator.mushroomsPerChunk = 2; this.theBiomeDecorator.flowersPerChunk = 10; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 14); - this.bopWorldFeatures.setFeature("wildCarrotsPerChunk", 1); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 5); - this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 15); - this.bopWorldFeatures.setFeature("seaweedPerChunk", 5); - this.bopWorldFeatures.setFeature("generatePumpkins", false); - this.bopWorldFeatures.setFeature("algaePerChunk", 2); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 14; + this.theBiomeDecorator.bopFeatures.wildCarrotsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 5; + this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 15; + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5; + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 2; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 10); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 10; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 0), 10); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(5, 3), 5); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 4); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(0, 3), 2); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 0), 10); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(5, 3), 5); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 4); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(0, 3), 2); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMoor.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java similarity index 61% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMoor.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java index 4ad472d4b..46e3e7377 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMoor.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java @@ -1,17 +1,18 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; -public class BiomeGenMoor extends BOPBiome +public class BiomeGenMoor extends BOPOverworldBiome { private static final Height biomeHeight = new Height(1.5F, 0.025F); @@ -37,22 +38,22 @@ public class BiomeGenMoor extends BOPBiome this.theBiomeDecorator.sandPerChunk = -999; this.theBiomeDecorator.sandPerChunk2 = -999; - this.bopWorldFeatures.setFeature("mudPerChunk", 1); - this.bopWorldFeatures.setFeature("waterLakesPerChunk", 10); - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 6); - this.bopWorldFeatures.setFeature("koruPerChunk", 6); - this.bopWorldFeatures.setFeature("seaweedPerChunk", 5); - this.bopWorldFeatures.setFeature("generatePumpkins", false); + this.theBiomeDecorator.bopFeatures.mudPerChunk = 1; + this.theBiomeDecorator.bopFeatures.waterLakesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 6; + this.theBiomeDecorator.bopFeatures.koruPerChunk = 6; + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5; + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 15); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 15; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 1), 14); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 1), 14); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMountain.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java similarity index 59% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMountain.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java index c7003d9eb..841377d98 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMountain.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java @@ -1,19 +1,20 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenPineTree; -public class BiomeGenMountain extends BOPBiome +public class BiomeGenMountain extends BOPOverworldBiome { private static final Height biomeHeight = new Height(2.5F, 0.5F); @@ -28,20 +29,20 @@ public class BiomeGenMountain extends BOPBiome this.theBiomeDecorator.treesPerChunk = 2; this.theBiomeDecorator.grassPerChunk = 3; - this.bopWorldFeatures.setFeature("berryBushesPerChunk", 3); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 10); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 10); - this.bopWorldFeatures.setFeature("algaePerChunk", 2); + this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 3; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 10; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 2; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 8); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 8; - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMysticGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java similarity index 60% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMysticGrove.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java index 8e50c2068..2a79dc0a8 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMysticGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -6,17 +6,18 @@ import net.minecraft.block.Block; import net.minecraft.entity.monster.EntityWitch; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; -import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPSwampTree; import biomesoplenty.common.world.features.trees.WorldGenOriginalTree; -public class BiomeGenMysticGrove extends BOPBiome +public class BiomeGenMysticGrove extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.2F); @@ -41,31 +42,31 @@ public class BiomeGenMysticGrove extends BOPBiome this.theBiomeDecorator.sandPerChunk2 = -999; this.theBiomeDecorator.flowersPerChunk = 8; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 10); - this.bopWorldFeatures.setFeature("sproutsPerChunk", 1); - this.bopWorldFeatures.setFeature("blueMilksPerChunk", 1); - this.bopWorldFeatures.setFeature("poisonLakesPerChunk", 1); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 10; + this.theBiomeDecorator.bopFeatures.sproutsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.blueMilksPerChunk = 1; + this.theBiomeDecorator.bopFeatures.poisonLakesPerChunk = 1; - this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 10); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 4); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10); - this.bopWorldFeatures.setFeature("seaweedPerChunk", 5); - this.bopWorldFeatures.setFeature("algaePerChunk", 2); + this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 4; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 2; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 15); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 15; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 6), 12); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 3), 10); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 3), 6); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 6); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 4); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 6), 12); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 3), 10); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 3), 6); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 6); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 4); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenOminousWoods.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java similarity index 71% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenOminousWoods.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java index bd2d9c8f2..3b74e2694 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenOminousWoods.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -8,18 +8,19 @@ import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.entity.passive.EntityBat; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenTallGrass; -import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.trees.WorldGenBOPSwampTree; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2; import biomesoplenty.common.world.features.trees.WorldGenDeadTree; -public class BiomeGenOminousWoods extends BOPBiome +public class BiomeGenOminousWoods extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.2F); @@ -51,21 +52,21 @@ public class BiomeGenOminousWoods extends BOPBiome this.theBiomeDecorator.sandPerChunk = -999; this.theBiomeDecorator.sandPerChunk2 = -999; - this.bopWorldFeatures.setFeature("thornsPerChunk", 9); - this.bopWorldFeatures.setFeature("poisonIvyPerChunk", 3); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 2); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 4); - this.bopWorldFeatures.setFeature("poisonLakesPerChunk", 15); + this.theBiomeDecorator.bopFeatures.thornsPerChunk = 9; + this.theBiomeDecorator.bopFeatures.poisonIvyPerChunk = 3; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 2; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 4; + this.theBiomeDecorator.bopFeatures.poisonLakesPerChunk = 15; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 1); - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 1); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 1; + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 1; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 2), 20); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 2), 20); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(Blocks.tallgrass, 0), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(Blocks.tallgrass, 0), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 11), 0.5D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenOriginValley.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginValley.java similarity index 66% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenOriginValley.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginValley.java index 8420e1d94..188f20c18 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenOriginValley.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginValley.java @@ -1,17 +1,17 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.init.Blocks; +import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; -import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.trees.WorldGenOriginalTree; -public class BiomeGenOriginValley extends BOPBiome +public class BiomeGenOriginValley extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.3F); @@ -33,16 +33,16 @@ public class BiomeGenOriginValley extends BOPBiome this.theBiomeDecorator.clayPerChunk = 0; this.theBiomeDecorator.flowersPerChunk = -999; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 4); - this.bopWorldFeatures.setFeature("rootsPerChunk", -999); - this.bopWorldFeatures.setFeature("stalagmitesPerChunk", -999); - this.bopWorldFeatures.setFeature("stalactitesPerChunk", -999); - this.bopWorldFeatures.setFeature("minersDelightPerChunk", -999); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 4; + this.theBiomeDecorator.bopFeatures.rootsPerChunk = -999; + this.theBiomeDecorator.bopFeatures.stalagmitesPerChunk = -999; + this.theBiomeDecorator.bopFeatures.stalactitesPerChunk = -999; + this.theBiomeDecorator.bopFeatures.minersDelightPerChunk = -999; //TODO: FEATURE this.theBiomeDecorator.generateUndergroundLakes = false; - this.bopWorldFeatures.setFeature("generatePumpkins", false); + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers2, 8), 8); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.yellow_flower, 0), 10); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers2, 8), 8); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.yellow_flower, 0), 10); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenOutback.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java similarity index 78% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenOutback.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java index ba30c9a00..e0f809a5d 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenOutback.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java @@ -1,17 +1,18 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.trees.WorldGenBOPShrub; import biomesoplenty.common.world.features.trees.WorldGenMiniShrub; -public class BiomeGenOutback extends BOPBiome +public class BiomeGenOutback extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.1F); @@ -34,11 +35,11 @@ public class BiomeGenOutback extends BOPBiome this.theBiomeDecorator.deadBushPerChunk = 7; this.theBiomeDecorator.cactiPerChunk = 4; - this.bopWorldFeatures.setFeature("grassSplatterPerChunk", 10); - this.bopWorldFeatures.setFeature("tinyCactiPerChunk", 2); - this.bopWorldFeatures.setFeature("bushesPerChunk", 5); - this.bopWorldFeatures.setFeature("redSandSplatterPerChunk", 4); - this.bopWorldFeatures.setFeature("generatePumpkins", false); + this.theBiomeDecorator.bopFeatures.grassSplatterPerChunk = 10; + this.theBiomeDecorator.bopFeatures.tinyCactiPerChunk = 2; + this.theBiomeDecorator.bopFeatures.bushesPerChunk = 5; + this.theBiomeDecorator.bopFeatures.redSandSplatterPerChunk = 4; + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenPrairie.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java similarity index 55% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenPrairie.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java index f3accd8ec..fab317d4b 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenPrairie.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -6,14 +6,16 @@ import net.minecraft.block.Block; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2; -public class BiomeGenPrairie extends BOPBiome +public class BiomeGenPrairie extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.1F); @@ -30,23 +32,23 @@ public class BiomeGenPrairie extends BOPBiome this.theBiomeDecorator.treesPerChunk = 1; this.theBiomeDecorator.grassPerChunk = 999; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 30); - this.bopWorldFeatures.setFeature("portobellosPerChunk", 2); - this.bopWorldFeatures.setFeature("berryBushesPerChunk", 2); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 3); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 15); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 30; + this.theBiomeDecorator.bopFeatures.portobellosPerChunk = 2; + this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 2; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 3; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 15; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 999); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 999; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers2, 4), 12); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 6); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers2, 4), 12); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 6); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenRainforest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java similarity index 71% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenRainforest.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java index 3ad73170e..10802dddc 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenRainforest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -6,17 +6,19 @@ import net.minecraft.block.Block; import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.entities.EntityJungleSpider; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.trees.WorldGenOriginalTree; -public class BiomeGenRainforest extends BOPBiome +public class BiomeGenRainforest extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.2F, 0.9F); @@ -42,18 +44,18 @@ public class BiomeGenRainforest extends BOPBiome customBiomeDecorator.rosesPerChunk = 10; customBiomeDecorator.orangeFlowersPerChunk = 6;*/ - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 25); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 5); - this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 20); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10); - this.bopWorldFeatures.setFeature("seaweedPerChunk", 15); - this.bopWorldFeatures.setFeature("algaePerChunk", 2); - this.bopWorldFeatures.setFeature("generatePumpkins", false); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 25; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 5; + this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 20; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 15; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 2; + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 6), 12); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 6); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 4); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 6); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 6), 12); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 6); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 4); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 6); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenRedwoodForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRedwoodForest.java similarity index 62% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenRedwoodForest.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRedwoodForest.java index d2690b12b..53d88d7cf 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenRedwoodForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRedwoodForest.java @@ -1,21 +1,22 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenShrub; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenRedwoodTree; import biomesoplenty.common.world.features.trees.WorldGenRedwoodTree2; -public class BiomeGenRedwoodForest extends BOPBiome +public class BiomeGenRedwoodForest extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.1F); @@ -30,24 +31,24 @@ public class BiomeGenRedwoodForest extends BOPBiome this.theBiomeDecorator.treesPerChunk = 99; this.theBiomeDecorator.grassPerChunk = 15; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 5); - this.bopWorldFeatures.setFeature("bushesPerChunk", 4); - this.bopWorldFeatures.setFeature("berryBushesPerChunk", 1); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 10); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 15); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5); - this.bopWorldFeatures.setFeature("generatePumpkins", false); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5; + this.theBiomeDecorator.bopFeatures.bushesPerChunk = 4; + this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 1; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 10; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 15; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 5; + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 15); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 15; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 10); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 8); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 10); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 8); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSacredSprings.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java similarity index 79% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSacredSprings.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java index a569c9bde..8d36d8e55 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSacredSprings.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -6,12 +6,13 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.entities.EntityJungleSpider; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; @@ -19,7 +20,7 @@ import biomesoplenty.common.world.features.trees.WorldGenSacredOak; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BiomeGenSacredSprings extends BOPBiome +public class BiomeGenSacredSprings extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.0F, 0.6F); @@ -36,14 +37,14 @@ public class BiomeGenSacredSprings extends BOPBiome this.theBiomeDecorator.grassPerChunk = 4; this.theBiomeDecorator.waterlilyPerChunk = 5; - this.bopWorldFeatures.setFeature("seaweedPerChunk", 15); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10); + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 15; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 2); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 2; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 6), 10); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 6); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(5, 5), 5); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 6), 10); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 6); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(5, 5), 5); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSeasonalForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java similarity index 70% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSeasonalForest.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java index 63a9ed90b..05814361f 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSeasonalForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -6,14 +6,16 @@ import net.minecraft.block.Block; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPBigTree; import biomesoplenty.common.world.features.trees.WorldGenOriginalTree; -public class BiomeGenSeasonalForest extends BOPBiome +public class BiomeGenSeasonalForest extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.2F, 0.4F); @@ -31,19 +33,19 @@ public class BiomeGenSeasonalForest extends BOPBiome this.theBiomeDecorator.grassPerChunk = 8; this.theBiomeDecorator.flowersPerChunk = -999; - this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 4); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 15); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 8); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 15); - this.bopWorldFeatures.setFeature("algaePerChunk", 3); + this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 4; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 15; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 8; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 15; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 3; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 8); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 8; - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenShield.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java similarity index 68% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenShield.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java index de7d0c682..a69a8a659 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenShield.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java @@ -1,20 +1,21 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenShrub; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.WorldGenMoss; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2; import biomesoplenty.common.world.features.trees.WorldGenPineTree; -public class BiomeGenShield extends BOPBiome +public class BiomeGenShield extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.0F, 0.2F); @@ -32,19 +33,19 @@ public class BiomeGenShield extends BOPBiome this.theBiomeDecorator.sandPerChunk = -999; this.theBiomeDecorator.sandPerChunk2 = -999; - this.bopWorldFeatures.setFeature("shrubsPerChunk", 4); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5); - this.bopWorldFeatures.setFeature("seaweedPerChunk", 5); - this.bopWorldFeatures.setFeature("algaePerChunk", 4); - this.bopWorldFeatures.setFeature("generateStoneInGrass2", true); + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 4; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 5; + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 4; + this.theBiomeDecorator.bopFeatures.generateStoneInGrass2 = true; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 12); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 12; - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenShrubland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java similarity index 54% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenShrubland.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java index 237ea2f01..e5aae6a59 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenShrubland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -6,14 +6,16 @@ import net.minecraft.block.Block; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenShrub; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; -public class BiomeGenShrubland extends BOPBiome +public class BiomeGenShrubland extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.1F); @@ -31,21 +33,21 @@ public class BiomeGenShrubland extends BOPBiome this.theBiomeDecorator.flowersPerChunk = 0; this.theBiomeDecorator.grassPerChunk = 5; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 5); - this.bopWorldFeatures.setFeature("bushesPerChunk", 7); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 5); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 3); - this.bopWorldFeatures.setFeature("generatePumpkins", false); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5; + this.theBiomeDecorator.bopFeatures.bushesPerChunk = 7; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 5; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 3; + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 1); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 1; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 4); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 4); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSludgepit.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSludgepit.java similarity index 70% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSludgepit.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSludgepit.java index 481506209..3af9e4f0c 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSludgepit.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSludgepit.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -6,15 +6,17 @@ import net.minecraft.block.Block; import net.minecraft.entity.monster.EntitySlime; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBogTree1; import biomesoplenty.common.world.features.trees.WorldGenBogTree2; -public class BiomeGenSludgepit extends BOPBiome +public class BiomeGenSludgepit extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.0F, 0.1F); @@ -43,20 +45,20 @@ public class BiomeGenSludgepit extends BOPBiome this.theBiomeDecorator.sandPerChunk2 = -999; this.theBiomeDecorator.deadBushPerChunk = 5; - this.bopWorldFeatures.setFeature("mudPerChunk", 5); - this.bopWorldFeatures.setFeature("algaePerChunk", 2); - this.bopWorldFeatures.setFeature("poisonLakesPerChunk", 5); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 6); - this.bopWorldFeatures.setFeature("koruPerChunk", 1); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 5); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5); + this.theBiomeDecorator.bopFeatures.mudPerChunk = 5; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 2; + this.theBiomeDecorator.bopFeatures.poisonLakesPerChunk = 5; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 6; + this.theBiomeDecorator.bopFeatures.koruPerChunk = 1; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 5; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 5; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 30); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 30; - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 0), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 0), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSteppe.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java similarity index 67% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSteppe.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java index 4e72afdce..56a6a74f5 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSteppe.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -6,11 +6,13 @@ import net.minecraft.block.Block; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; -public class BiomeGenSteppe extends BOPBiome +public class BiomeGenSteppe extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.3F); @@ -27,16 +29,16 @@ public class BiomeGenSteppe extends BOPBiome this.theBiomeDecorator.treesPerChunk = -999; this.theBiomeDecorator.deadBushPerChunk = 7; - this.bopWorldFeatures.setFeature("tinyCactiPerChunk", 1); - this.bopWorldFeatures.setFeature("bromeliadsPerChunk", 2); - this.bopWorldFeatures.setFeature("sandSplatterPerChunk", 2); - this.bopWorldFeatures.setFeature("gravelSplatterPerChunk", 6); - this.bopWorldFeatures.setFeature("dirtSplatterPerChunk", 4); - this.bopWorldFeatures.setFeature("generateQuicksand", true); + this.theBiomeDecorator.bopFeatures.tinyCactiPerChunk = 1; + this.theBiomeDecorator.bopFeatures.bromeliadsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.sandSplatterPerChunk = 2; + this.theBiomeDecorator.bopFeatures.gravelSplatterPerChunk = 6; + this.theBiomeDecorator.bopFeatures.dirtSplatterPerChunk = 4; + this.theBiomeDecorator.bopFeatures.generateQuicksand = true; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 15); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 15; - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 1D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenTemperateRainforest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java similarity index 66% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenTemperateRainforest.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java index c4bffe05e..2f15eef8a 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenTemperateRainforest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java @@ -1,14 +1,15 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenShrub; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; @@ -17,7 +18,7 @@ import biomesoplenty.common.world.features.trees.WorldGenBOPSwampTree; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga3; -public class BiomeGenTemperateRainforest extends BOPBiome +public class BiomeGenTemperateRainforest extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.0F, 0.3F); @@ -35,25 +36,25 @@ public class BiomeGenTemperateRainforest extends BOPBiome this.theBiomeDecorator.sandPerChunk = -999; this.theBiomeDecorator.sandPerChunk2 = -999; - this.bopWorldFeatures.setFeature("generatePumpkins", false); - this.bopWorldFeatures.setFeature("blueMilksPerChunk", 3); - this.bopWorldFeatures.setFeature("poisonIvyPerChunk", 1); - this.bopWorldFeatures.setFeature("wildCarrotsPerChunk", 1); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 10); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 6); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 15); - this.bopWorldFeatures.setFeature("seaweedPerChunk", 15); - this.bopWorldFeatures.setFeature("algaePerChunk", 5); + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; + this.theBiomeDecorator.bopFeatures.blueMilksPerChunk = 3; + this.theBiomeDecorator.bopFeatures.poisonIvyPerChunk = 1; + this.theBiomeDecorator.bopFeatures.wildCarrotsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 10; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 6; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 15; + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 15; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 5; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 25); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 25; - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 2D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(3), 0.25D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 2D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(3), 0.25D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenThicket.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenThicket.java similarity index 76% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenThicket.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenThicket.java index 313023ca3..ba7e34ba7 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenThicket.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenThicket.java @@ -1,19 +1,20 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPFlora; -public class BiomeGenThicket extends BOPBiome +public class BiomeGenThicket extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.1F); @@ -30,13 +31,13 @@ public class BiomeGenThicket extends BOPBiome this.theBiomeDecorator.treesPerChunk = 17; this.theBiomeDecorator.grassPerChunk = 1; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 5); - this.bopWorldFeatures.setFeature("thornsPerChunk", 55); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 5); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 5); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 10); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5; + this.theBiomeDecorator.bopFeatures.thornsPerChunk = 55; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 5; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 5; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 10; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 4); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 4); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenTropicalRainforest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java similarity index 67% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenTropicalRainforest.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java index e5c2b3020..3acd80e06 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenTropicalRainforest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -6,10 +6,12 @@ import net.minecraft.block.Block; import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenTrees; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.entities.EntityJungleSpider; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; @@ -17,7 +19,7 @@ import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenRainforestTree1; -public class BiomeGenTropicalRainforest extends BOPBiome +public class BiomeGenTropicalRainforest extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.2F, 0.3F); @@ -39,25 +41,25 @@ public class BiomeGenTropicalRainforest extends BOPBiome this.theBiomeDecorator.reedsPerChunk = 10; this.theBiomeDecorator.waterlilyPerChunk = 2; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 10); - this.bopWorldFeatures.setFeature("generatePumpkins", false); - this.bopWorldFeatures.setFeature("generateMelons", true); - this.bopWorldFeatures.setFeature("sproutsPerChunk", 2); - this.bopWorldFeatures.setFeature("generateQuicksand", true); - this.bopWorldFeatures.setFeature("poisonIvyPerChunk", 4); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 15); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10); - this.bopWorldFeatures.setFeature("seaweedPerChunk", 15); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 10; + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; + this.theBiomeDecorator.bopFeatures.generateMelons = true; + this.theBiomeDecorator.bopFeatures.sproutsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.generateQuicksand = true; + this.theBiomeDecorator.bopFeatures.poisonIvyPerChunk = 4; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 15; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 15; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 9); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 9; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 5), 12); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 5), 12); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.75D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(3), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.75D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(3), 1D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenTundra.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java similarity index 62% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenTundra.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java index e039127d8..6a8b6c5d7 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenTundra.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java @@ -1,18 +1,19 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenShrub; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; -public class BiomeGenTundra extends BOPBiome +public class BiomeGenTundra extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.0F, 0.1F); @@ -34,21 +35,21 @@ public class BiomeGenTundra extends BOPBiome this.theBiomeDecorator.reedsPerChunk = -999; this.theBiomeDecorator.sandPerChunk = 8; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 1); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 2); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2); - this.bopWorldFeatures.setFeature("rockpilesPerChunk", 2); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 5); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 1; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.rockpilesPerChunk = 2; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 5; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 5; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 8); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 8; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 4); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 4); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenWasteland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java similarity index 74% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenWasteland.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java index 1e0001965..29807906d 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenWasteland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java @@ -1,18 +1,19 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenDeadTree; -public class BiomeGenWasteland extends BOPBiome +public class BiomeGenWasteland extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.1F); @@ -35,17 +36,17 @@ public class BiomeGenWasteland extends BOPBiome this.theBiomeDecorator.treesPerChunk = 0; this.theBiomeDecorator.grassPerChunk = 20; - this.bopWorldFeatures.setFeature("poisonLakesPerChunk", 10); - this.bopWorldFeatures.setFeature("waterLakesPerChunk", 2); - this.bopWorldFeatures.setFeature("wasteland1PerChunk", 1); - this.bopWorldFeatures.setFeature("wasteland2PerChunk", 1); - this.bopWorldFeatures.setFeature("wasteland3PerChunk", 1); - this.bopWorldFeatures.setFeature("wasteland4PerChunk", 1); - this.bopWorldFeatures.setFeature("wastelandRockPilesPerChunk", 2); + this.theBiomeDecorator.bopFeatures.poisonLakesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.waterLakesPerChunk = 2; + this.theBiomeDecorator.bopFeatures.wasteland1PerChunk = 1; + this.theBiomeDecorator.bopFeatures.wasteland2PerChunk = 1; + this.theBiomeDecorator.bopFeatures.wasteland3PerChunk = 1; + this.theBiomeDecorator.bopFeatures.wasteland4PerChunk = 1; + this.theBiomeDecorator.bopFeatures.wastelandRockPilesPerChunk = 2; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 20); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 20; - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.plants, 0), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.plants, 0), 1D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenWetland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java similarity index 59% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenWetland.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java index 05e6a40bc..4e9e5a227 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenWetland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; @@ -6,9 +6,11 @@ import net.minecraft.block.Block; import net.minecraft.entity.monster.EntitySlime; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; @@ -16,7 +18,7 @@ import biomesoplenty.common.world.features.WorldGenMoss; import biomesoplenty.common.world.features.trees.WorldGenBOPSwampTree; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2; -public class BiomeGenWetland extends BOPBiome +public class BiomeGenWetland extends BOPOverworldBiome { private static final Height biomeHeight = new Height(-0.1F, 0.2F); @@ -36,7 +38,6 @@ public class BiomeGenWetland extends BOPBiome this.waterColorMultiplier = 6512772; this.theBiomeDecorator.treesPerChunk = 6; - this.theBiomeDecorator.grassPerChunk = 10; this.theBiomeDecorator.flowersPerChunk = -999; this.theBiomeDecorator.mushroomsPerChunk = 8; this.theBiomeDecorator.reedsPerChunk = 15; @@ -45,34 +46,34 @@ public class BiomeGenWetland extends BOPBiome this.theBiomeDecorator.sandPerChunk2 = -999; this.theBiomeDecorator.waterlilyPerChunk = 4; - this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 1); - this.bopWorldFeatures.setFeature("riverCanePerChunk", 15); - this.bopWorldFeatures.setFeature("mudPerChunk", 5); - this.bopWorldFeatures.setFeature("cattailsPerChunk", 20); - this.bopWorldFeatures.setFeature("highCattailsPerChunk", 10); - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 6); - this.bopWorldFeatures.setFeature("blueMilksPerChunk", 1); - this.bopWorldFeatures.setFeature("portobellosPerChunk", 1); - this.bopWorldFeatures.setFeature("berryBushesPerChunk", 1); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 10); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 8); - this.bopWorldFeatures.setFeature("koruPerChunk", 1); - this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 15); - this.bopWorldFeatures.setFeature("seaweedPerChunk", 15); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5); - this.bopWorldFeatures.setFeature("algaePerChunk", 5); + this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 15; + this.theBiomeDecorator.bopFeatures.mudPerChunk = 5; + this.theBiomeDecorator.bopFeatures.cattailsPerChunk = 20; + this.theBiomeDecorator.bopFeatures.highCattailsPerChunk = 10; + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 6; + this.theBiomeDecorator.bopFeatures.blueMilksPerChunk = 1; + this.theBiomeDecorator.bopFeatures.portobellosPerChunk = 1; + this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 1; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 10; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 8; + this.theBiomeDecorator.bopFeatures.koruPerChunk = 1; + this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 15; + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 15; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 5; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 5; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 10); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 10; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 1), 10); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 6); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 1), 10); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 6); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(3), 0.75D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(3), 0.75D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenWoodland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java similarity index 53% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenWoodland.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java index e57e35b46..f512bc8b6 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenWoodland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java @@ -1,17 +1,18 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; -public class BiomeGenWoodland extends BOPBiome +public class BiomeGenWoodland extends BOPOverworldBiome { private static final Height biomeHeight = new Height(0.1F, 0.2F); @@ -27,23 +28,23 @@ public class BiomeGenWoodland extends BOPBiome this.theBiomeDecorator.grassPerChunk = 7; this.theBiomeDecorator.mushroomsPerChunk = 4; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 5); - this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 3); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 20); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2); - this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 10); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 10); - this.bopWorldFeatures.setFeature("logsPerChunk", 10); - this.bopWorldFeatures.setFeature("algaePerChunk", 3); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5; + this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 3; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 20; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.logsPerChunk = 10; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 3; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 7); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 7; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 6); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 6); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); } diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/ocean/BiomeGenCoralReef.java b/src/main/java/biomesoplenty/common/biome/overworld/ocean/BiomeGenCoralReef.java similarity index 74% rename from src/main/java/biomesoplenty/common/biomes/overworld/ocean/BiomeGenCoralReef.java rename to src/main/java/biomesoplenty/common/biome/overworld/ocean/BiomeGenCoralReef.java index 1128f7a1c..c18504b71 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/ocean/BiomeGenCoralReef.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/ocean/BiomeGenCoralReef.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld.ocean; +package biomesoplenty.common.biome.overworld.ocean; import java.util.Random; @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPOceanBiome; +import biomesoplenty.common.biome.BOPOceanBiome; public class BiomeGenCoralReef extends BOPOceanBiome { @@ -23,10 +23,10 @@ public class BiomeGenCoralReef extends BOPOceanBiome this.setColor(18285); this.setTemperatureRainfall(0.5F, 0.9F); - this.bopWorldFeatures.setFeature("coralPerChunk", 300); - this.bopWorldFeatures.setFeature("shortKelpPerChunk", 100); - this.bopWorldFeatures.setFeature("generateSponge", true); - this.bopWorldFeatures.setFeature("seaweedPerChunk", 20); + this.theBiomeDecorator.bopFeatures.coralPerChunk = 300; + this.theBiomeDecorator.bopFeatures.shortKelpPerChunk = 100; + this.theBiomeDecorator.bopFeatures.generateSponge = true; + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 20; } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/ocean/BiomeGenKelpForest.java b/src/main/java/biomesoplenty/common/biome/overworld/ocean/BiomeGenKelpForest.java similarity index 74% rename from src/main/java/biomesoplenty/common/biomes/overworld/ocean/BiomeGenKelpForest.java rename to src/main/java/biomesoplenty/common/biome/overworld/ocean/BiomeGenKelpForest.java index 79c6e5c9d..04557b341 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/ocean/BiomeGenKelpForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/ocean/BiomeGenKelpForest.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld.ocean; +package biomesoplenty.common.biome.overworld.ocean; import java.util.Random; @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPOceanBiome; +import biomesoplenty.common.biome.BOPOceanBiome; public class BiomeGenKelpForest extends BOPOceanBiome { @@ -23,10 +23,10 @@ public class BiomeGenKelpForest extends BOPOceanBiome this.setColor(27468); this.setTemperatureRainfall(0.5F, 0.9F); - this.bopWorldFeatures.setFeature("kelpPerChunk", 999); - this.bopWorldFeatures.setFeature("kelpThickPerChunk", 999); - this.bopWorldFeatures.setFeature("shortKelpPerChunk", 200); - this.bopWorldFeatures.setFeature("seaweedPerChunk", 20); + this.theBiomeDecorator.bopFeatures.kelpPerChunk = 999; + this.theBiomeDecorator.bopFeatures.kelpThickPerChunk = 999; + this.theBiomeDecorator.bopFeatures.shortKelpPerChunk = 200; + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 20; } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenAlpsForest.java b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenAlpsForest.java similarity index 72% rename from src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenAlpsForest.java rename to src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenAlpsForest.java index a3636e0de..ab19590c0 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenAlpsForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenAlpsForest.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld.sub; +package biomesoplenty.common.biome.overworld.sub; import java.util.Random; @@ -7,7 +7,7 @@ import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPSubBiome; +import biomesoplenty.common.biome.BOPSubBiome; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2; @@ -33,13 +33,13 @@ public class BiomeGenAlpsForest extends BOPSubBiome this.theBiomeDecorator.sandPerChunk = -999; this.theBiomeDecorator.sandPerChunk2 = -999; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5; - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenCanyonRavine.java b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenCanyonRavine.java similarity index 79% rename from src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenCanyonRavine.java rename to src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenCanyonRavine.java index 4df952a5d..9d69430dd 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenCanyonRavine.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenCanyonRavine.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld.sub; +package biomesoplenty.common.biome.overworld.sub; import java.util.Random; @@ -7,7 +7,7 @@ import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPSubBiome; +import biomesoplenty.common.biome.BOPSubBiome; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPShrub; import biomesoplenty.common.world.features.trees.WorldGenPineTree; @@ -37,14 +37,14 @@ public class BiomeGenCanyonRavine extends BOPSubBiome this.theBiomeDecorator.treesPerChunk = 1; this.theBiomeDecorator.flowersPerChunk = -999; - this.bopWorldFeatures.setFeature("bromeliadsPerChunk", 3); - this.bopWorldFeatures.setFeature("grassSplatterPerChunk", 4); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4); - this.bopWorldFeatures.setFeature("generatePumpkins", false); + this.theBiomeDecorator.bopFeatures.bromeliadsPerChunk = 3; + this.theBiomeDecorator.bopFeatures.grassSplatterPerChunk = 4; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4; + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5; - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenGlacier.java b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenGlacier.java similarity index 92% rename from src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenGlacier.java rename to src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenGlacier.java index f794eae52..3cbfa45b9 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenGlacier.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenGlacier.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld.sub; +package biomesoplenty.common.biome.overworld.sub; import java.util.Random; @@ -7,7 +7,7 @@ import net.minecraft.init.Blocks; import net.minecraft.world.World; import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPSubBiome; +import biomesoplenty.common.biome.BOPSubBiome; public class BiomeGenGlacier extends BOPSubBiome { diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenMangrove.java b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenMangrove.java similarity index 80% rename from src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenMangrove.java rename to src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenMangrove.java index 392d75171..8f2fdf12f 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenMangrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenMangrove.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld.sub; +package biomesoplenty.common.biome.overworld.sub; import java.util.Random; @@ -7,7 +7,7 @@ import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPSubBiome; +import biomesoplenty.common.biome.BOPSubBiome; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPShrub; import biomesoplenty.common.world.features.trees.WorldGenMangrove; @@ -35,13 +35,13 @@ public class BiomeGenMangrove extends BOPSubBiome this.theBiomeDecorator.reedsPerChunk = -999; this.theBiomeDecorator.cactiPerChunk = -999; - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2); - this.bopWorldFeatures.setFeature("desertSproutsPerChunk", 1); - this.bopWorldFeatures.setFeature("waterLakesPerChunk", 10); + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.desertSproutsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.waterLakesPerChunk = 10; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 9); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 9; - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.plants, 0), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.plants, 0), 1D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenMeadowForest.java b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenMeadowForest.java similarity index 65% rename from src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenMeadowForest.java rename to src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenMeadowForest.java index d376ed650..7c37cc7ad 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenMeadowForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenMeadowForest.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld.sub; +package biomesoplenty.common.biome.overworld.sub; import java.util.Random; @@ -8,7 +8,7 @@ import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPSubBiome; +import biomesoplenty.common.biome.BOPSubBiome; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2; @@ -35,22 +35,22 @@ public class BiomeGenMeadowForest extends BOPSubBiome this.theBiomeDecorator.mushroomsPerChunk = 2; this.theBiomeDecorator.flowersPerChunk = 5; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 7); - this.bopWorldFeatures.setFeature("wildCarrotsPerChunk", 1); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 2); - this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 5); - this.bopWorldFeatures.setFeature("seaweedPerChunk", 5); - this.bopWorldFeatures.setFeature("generatePumpkins", false); - this.bopWorldFeatures.setFeature("algaePerChunk", 2); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 7; + this.theBiomeDecorator.bopFeatures.wildCarrotsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 5; + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5; + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 2; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 0), 10); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 0), 10); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenOasis.java b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenOasis.java similarity index 66% rename from src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenOasis.java rename to src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenOasis.java index 3e3cafffe..f3016702d 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenOasis.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenOasis.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld.sub; +package biomesoplenty.common.biome.overworld.sub; import java.util.Random; @@ -7,7 +7,7 @@ import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPSubBiome; +import biomesoplenty.common.biome.BOPSubBiome; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenPalmTree1; @@ -33,18 +33,18 @@ public class BiomeGenOasis extends BOPSubBiome this.theBiomeDecorator.cactiPerChunk = 7; this.theBiomeDecorator.reedsPerChunk = 100; - this.bopWorldFeatures.setFeature("tinyCactiPerChunk", 2); - this.bopWorldFeatures.setFeature("desertSproutsPerChunk", 3); - this.bopWorldFeatures.setFeature("bromeliadsPerChunk", 4); - this.bopWorldFeatures.setFeature("waterLakesPerChunk", 4); - this.bopWorldFeatures.setFeature("generateQuicksand", true); - this.bopWorldFeatures.setFeature("generateMelons", true); - this.bopWorldFeatures.setFeature("generatePumpkins", false); + this.theBiomeDecorator.bopFeatures.tinyCactiPerChunk = 2; + this.theBiomeDecorator.bopFeatures.desertSproutsPerChunk = 3; + this.theBiomeDecorator.bopFeatures.bromeliadsPerChunk = 4; + this.theBiomeDecorator.bopFeatures.waterLakesPerChunk = 4; + this.theBiomeDecorator.bopFeatures.generateQuicksand = true; + this.theBiomeDecorator.bopFeatures.generateMelons = true; + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 11); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 11; - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenOrchard.java b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenOrchard.java similarity index 64% rename from src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenOrchard.java rename to src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenOrchard.java index f50440378..431bd4d62 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenOrchard.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenOrchard.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld.sub; +package biomesoplenty.common.biome.overworld.sub; import java.util.Random; @@ -10,7 +10,7 @@ import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenTallGrass; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPSubBiome; +import biomesoplenty.common.biome.BOPSubBiome; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.trees.WorldGenOriginalTree; @@ -34,22 +34,22 @@ public class BiomeGenOrchard extends BOPSubBiome this.theBiomeDecorator.treesPerChunk = 2; - this.bopWorldFeatures.setFeature("portobellosPerChunk", 2); - this.bopWorldFeatures.setFeature("berryBushesPerChunk", 3); - this.bopWorldFeatures.setFeature("wildCarrotsPerChunk", 1); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 10); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4); - this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 15); + this.theBiomeDecorator.bopFeatures.portobellosPerChunk = 2; + this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 3; + this.theBiomeDecorator.bopFeatures.wildCarrotsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 10; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4; + this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 15; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 20); - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 15); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 20; + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 15; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 0), 20); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 20); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(0, 3), 2); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 0), 20); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 20); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(0, 3), 2); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 10), 0.5D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenQuagmire.java b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenQuagmire.java similarity index 77% rename from src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenQuagmire.java rename to src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenQuagmire.java index 622a13cb6..1868167fe 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenQuagmire.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenQuagmire.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld.sub; +package biomesoplenty.common.biome.overworld.sub; import java.util.Random; @@ -7,7 +7,7 @@ import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPSubBiome; +import biomesoplenty.common.biome.BOPSubBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenDeadTree; @@ -42,18 +42,18 @@ public class BiomeGenQuagmire extends BOPSubBiome this.theBiomeDecorator.flowersPerChunk = -999; this.theBiomeDecorator.sandPerChunk = -999; this.theBiomeDecorator.sandPerChunk2 = -999; - this.bopWorldFeatures.setFeature("algaePerChunk", 1); + this.theBiomeDecorator.bopFeatures.algaePerChunk = 1; - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2); - this.bopWorldFeatures.setFeature("koruPerChunk", 1); - this.bopWorldFeatures.setFeature("generateQuagmire", true); - this.bopWorldFeatures.setFeature("grassSplatterPerChunk", 5); + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.koruPerChunk = 1; + this.theBiomeDecorator.bopFeatures.generateQuagmire = true; + this.theBiomeDecorator.bopFeatures.grassSplatterPerChunk = 5; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 10); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 10; - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenScrubland.java b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenScrubland.java similarity index 67% rename from src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenScrubland.java rename to src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenScrubland.java index 7782b2ac0..e15c72f09 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenScrubland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenScrubland.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld.sub; +package biomesoplenty.common.biome.overworld.sub; import java.util.Random; @@ -8,7 +8,7 @@ import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenShrub; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPSubBiome; +import biomesoplenty.common.biome.BOPSubBiome; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenOriginalTree; @@ -30,16 +30,16 @@ public class BiomeGenScrubland extends BOPSubBiome this.theBiomeDecorator.treesPerChunk = 7; - this.bopWorldFeatures.setFeature("shrubsPerChunk", 2); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2); - this.bopWorldFeatures.setFeature("generatePumpkins", false); + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 30); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 30; - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 0), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 0), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 0.5D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenSilkglades.java b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenSilkglades.java similarity index 76% rename from src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenSilkglades.java rename to src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenSilkglades.java index e5ca73409..c3e778fbb 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenSilkglades.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenSilkglades.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld.sub; +package biomesoplenty.common.biome.overworld.sub; import java.util.Random; @@ -8,7 +8,7 @@ import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPSubBiome; +import biomesoplenty.common.biome.BOPSubBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPSwampTree; @@ -46,20 +46,20 @@ public class BiomeGenSilkglades extends BOPSubBiome this.theBiomeDecorator.sandPerChunk = -999; this.theBiomeDecorator.sandPerChunk2 = -999; - this.bopWorldFeatures.setFeature("sproutsPerChunk", 2); - this.bopWorldFeatures.setFeature("poisonIvyPerChunk", 2); - this.bopWorldFeatures.setFeature("cobwebsPerChunk", 9); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4); - this.bopWorldFeatures.setFeature("koruPerChunk", 1); - this.bopWorldFeatures.setFeature("cobwebNestsPerChunk", 2); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 15); - this.bopWorldFeatures.setFeature("algaePerChunk", 2); + this.theBiomeDecorator.bopFeatures.sproutsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.poisonIvyPerChunk = 2; + this.theBiomeDecorator.bopFeatures.cobwebsPerChunk = 9; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4; + this.theBiomeDecorator.bopFeatures.koruPerChunk = 1; + this.theBiomeDecorator.bopFeatures.cobwebNestsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 15; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 2; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 2); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 2; - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 0), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 0), 1D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenSpruceWoods.java b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenSpruceWoods.java similarity index 62% rename from src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenSpruceWoods.java rename to src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenSpruceWoods.java index cb36e572b..89f25527a 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenSpruceWoods.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenSpruceWoods.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld.sub; +package biomesoplenty.common.biome.overworld.sub; import java.util.Random; @@ -9,7 +9,7 @@ import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenTaiga2; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPSubBiome; +import biomesoplenty.common.biome.BOPSubBiome; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2; @@ -31,21 +31,21 @@ public class BiomeGenSpruceWoods extends BOPSubBiome this.theBiomeDecorator.grassPerChunk = 6; this.theBiomeDecorator.mushroomsPerChunk = 4; - this.bopWorldFeatures.setFeature("poisonIvyPerChunk", 1); - this.bopWorldFeatures.setFeature("sproutsPerChunk", 3); - this.bopWorldFeatures.setFeature("berryBushesPerChunk", 3); - this.bopWorldFeatures.setFeature("wildCarrotsPerChunk", 1); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 5); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 6); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 3); - this.bopWorldFeatures.setFeature("algaePerChunk", 2); + this.theBiomeDecorator.bopFeatures.poisonIvyPerChunk = 1; + this.theBiomeDecorator.bopFeatures.sproutsPerChunk = 3; + this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 3; + this.theBiomeDecorator.bopFeatures.wildCarrotsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 5; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 6; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 3; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 2; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 100); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 100; - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenTropics.java b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenTropics.java similarity index 65% rename from src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenTropics.java rename to src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenTropics.java index f2a30b335..8f8914f0b 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenTropics.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenTropics.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld.sub; +package biomesoplenty.common.biome.overworld.sub; import java.util.Random; @@ -8,7 +8,7 @@ import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenShrub; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPSubBiome; +import biomesoplenty.common.biome.BOPSubBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.entities.EntityJungleSpider; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; @@ -44,25 +44,25 @@ public class BiomeGenTropics extends BOPSubBiome this.theBiomeDecorator.sandPerChunk = 50; this.theBiomeDecorator.sandPerChunk2 = 50; - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 30); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 4); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10); - this.bopWorldFeatures.setFeature("seaweedPerChunk", 10); - this.bopWorldFeatures.setFeature("generatePumpkins", false); + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 30; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 4; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10; + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 10; + this.theBiomeDecorator.bopFeatures.generatePumpkins = false; - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 7); + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 7; - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 8); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 5), 10); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers2, 0), 15); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 7); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 6); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(0, 3), 2); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 8); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 5), 10); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers2, 0), 15); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 7); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 6); + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(0, 3), 2); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(3), 0.25D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(3), 0.25D); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenVolcano.java b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenVolcano.java similarity index 86% rename from src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenVolcano.java rename to src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenVolcano.java index 342983707..9ecf52148 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenVolcano.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenVolcano.java @@ -1,4 +1,4 @@ -package biomesoplenty.common.biomes.overworld.sub; +package biomesoplenty.common.biome.overworld.sub; import java.util.Random; @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPSubBiome; +import biomesoplenty.common.biome.BOPSubBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; public class BiomeGenVolcano extends BOPSubBiome @@ -33,9 +33,9 @@ public class BiomeGenVolcano extends BOPSubBiome this.theBiomeDecorator.flowersPerChunk = -999; this.theBiomeDecorator.grassPerChunk = -999; - this.bopWorldFeatures.setFeature("lavaLakesPerChunk", 20); - this.bopWorldFeatures.setFeature("lavaSpoutsPerChunk", 1); - this.bopWorldFeatures.setFeature("generateAsh", true); + this.theBiomeDecorator.bopFeatures.lavaLakesPerChunk = 20; + this.theBiomeDecorator.bopFeatures.lavaSpoutsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.generateAsh = true; } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/tech/BiomeGenDryRiver.java b/src/main/java/biomesoplenty/common/biome/overworld/tech/BiomeGenDryRiver.java similarity index 71% rename from src/main/java/biomesoplenty/common/biomes/overworld/tech/BiomeGenDryRiver.java rename to src/main/java/biomesoplenty/common/biome/overworld/tech/BiomeGenDryRiver.java index 3c624d5a0..b908abc9d 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/tech/BiomeGenDryRiver.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/tech/BiomeGenDryRiver.java @@ -1,9 +1,10 @@ -package biomesoplenty.common.biomes.overworld.tech; +package biomesoplenty.common.biome.overworld.tech; import net.minecraft.init.Blocks; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.common.biome.BOPOverworldBiome; -public class BiomeGenDryRiver extends BOPBiome +public class BiomeGenDryRiver extends BOPOverworldBiome { private static final Height biomeHeight = new Height(-0.2F, 0.0F); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/tech/BiomeGenLushRiver.java b/src/main/java/biomesoplenty/common/biome/overworld/tech/BiomeGenLushRiver.java new file mode 100644 index 000000000..bc802e06e --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/overworld/tech/BiomeGenLushRiver.java @@ -0,0 +1,50 @@ +package biomesoplenty.common.biome.overworld.tech; + +import java.util.Random; + +import net.minecraft.init.Blocks; +import net.minecraft.world.gen.feature.WorldGenAbstractTree; +import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.common.biome.BOPOverworldBiome; +import biomesoplenty.common.world.features.WorldGenBOPTallGrass; +import biomesoplenty.common.world.features.trees.WorldGenBOPShrub; + +public class BiomeGenLushRiver extends BOPOverworldBiome +{ + private static final Height biomeHeight = new Height(-0.5F, 0.0F); + + public BiomeGenLushRiver(int par1) + { + super(par1); + this.spawnableCreatureList.clear(); + this.setTemperatureRainfall(0.6F, 0.7F); + + this.setHeight(biomeHeight); + + this.theBiomeDecorator.treesPerChunk = 10; + this.theBiomeDecorator.grassPerChunk = 10; + this.theBiomeDecorator.reedsPerChunk = 10; + this.theBiomeDecorator.waterlilyPerChunk = 8; + + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 8; + this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 10; + this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 15; + this.theBiomeDecorator.bopFeatures.algaePerChunk = 10; + + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 30; + + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + } + + @Override + //TODO: getRandomWorldGenForTrees() + public WorldGenAbstractTree func_150567_a(Random random) + { + return new WorldGenBOPShrub(Blocks.log, Blocks.leaves, 0, 0, Blocks.grass); + } +} \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/biomes/BOPBiome.java b/src/main/java/biomesoplenty/common/biomes/BOPBiome.java deleted file mode 100644 index b4fd796ea..000000000 --- a/src/main/java/biomesoplenty/common/biomes/BOPBiome.java +++ /dev/null @@ -1,48 +0,0 @@ -package biomesoplenty.common.biomes; - -import biomesoplenty.common.world.decoration.BOPDecorationManager; -import biomesoplenty.common.world.decoration.BOPWorldFeatures; -import biomesoplenty.common.world.decoration.IBOPBiome; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; - -import java.util.Random; - -public abstract class BOPBiome extends BiomeGenBase implements IBOPBiome -{ - protected BOPWorldFeatures bopWorldFeatures; - - public BOPBiome(int biomeID) - { - super(biomeID); - - bopWorldFeatures = BOPDecorationManager.getOrCreateBiomeFeatures(biomeID); - } - - @Override - public void decorate(World world, Random random, int x, int z) - { - try - { - super.decorate(world, random, x, z); - } - catch (Exception e) - { - Throwable cause = e.getCause(); - - if (e.getMessage() != null && e.getMessage().equals("Already decorating!!") || (cause != null && cause.getMessage() != null && cause.getMessage().equals("Already decorating!!"))) - { - } - else - { - e.printStackTrace(); - } - } - } - - @Override - public BOPWorldFeatures getBiomeFeatures() - { - return bopWorldFeatures; - } -} diff --git a/src/main/java/biomesoplenty/common/biomes/nether/BiomeGenBoneyard.java b/src/main/java/biomesoplenty/common/biomes/nether/BiomeGenBoneyard.java deleted file mode 100644 index 916680588..000000000 --- a/src/main/java/biomesoplenty/common/biomes/nether/BiomeGenBoneyard.java +++ /dev/null @@ -1,22 +0,0 @@ -package biomesoplenty.common.biomes.nether; - -import net.minecraft.init.Blocks; -import biomesoplenty.common.biomes.BOPNetherBiome; - -public class BiomeGenBoneyard extends BOPNetherBiome -{ - public BiomeGenBoneyard(int id) - { - super(id); - - this.setColor(15657658); - - this.topBlock = Blocks.netherrack; - this.fillerBlock = Blocks.netherrack; - - this.bopWorldFeatures.setFeature("boneSpinesUpPerChunk", 9); - this.bopWorldFeatures.setFeature("boneSpinesDownPerChunk", 12); - this.bopWorldFeatures.setFeature("gravesPerChunk", 1); - this.bopWorldFeatures.setFeature("waspHivesPerChunk", 1); - } -} diff --git a/src/main/java/biomesoplenty/common/biomes/nether/BiomeGenPhantasmagoricInferno.java b/src/main/java/biomesoplenty/common/biomes/nether/BiomeGenPhantasmagoricInferno.java deleted file mode 100644 index abae4c218..000000000 --- a/src/main/java/biomesoplenty/common/biomes/nether/BiomeGenPhantasmagoricInferno.java +++ /dev/null @@ -1,28 +0,0 @@ -package biomesoplenty.common.biomes.nether; - -import net.minecraft.world.gen.feature.WorldGenFire; -import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPNetherBiome; - -public class BiomeGenPhantasmagoricInferno extends BOPNetherBiome -{ - public BiomeGenPhantasmagoricInferno(int id) - { - super(id); - - this.setColor(14247446); - - this.topBlock = BOPCBlocks.ash; - this.fillerBlock = BOPCBlocks.ash; - - this.bopWorldFeatures.setFeature("netherLavaLakesPerChunk", 20); - this.bopWorldFeatures.setFeature("smolderingGrassPerChunk", 30); - this.bopWorldFeatures.setFeature("gravesPerChunk", 1); - this.bopWorldFeatures.setFeature("waspHivesPerChunk", 1); - this.bopWorldFeatures.setFeature("generateAsh", true); - - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 8); - - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenFire(), 1D); - } -} diff --git a/src/main/java/biomesoplenty/common/biomes/nether/BiomeGenUndergarden.java b/src/main/java/biomesoplenty/common/biomes/nether/BiomeGenUndergarden.java deleted file mode 100644 index 30b6bb135..000000000 --- a/src/main/java/biomesoplenty/common/biomes/nether/BiomeGenUndergarden.java +++ /dev/null @@ -1,49 +0,0 @@ -package biomesoplenty.common.biomes.nether; - -import java.util.Random; - -import net.minecraft.init.Blocks; -import net.minecraft.world.gen.feature.WorldGenAbstractTree; -import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPNetherBiome; -import biomesoplenty.common.world.features.WorldGenBOPTallGrass; -import biomesoplenty.common.world.features.trees.WorldGenMiniShrub; - -public class BiomeGenUndergarden extends BOPNetherBiome -{ - public BiomeGenUndergarden(int id) - { - super(id); - - this.setColor(15657658); - - this.topBlock = BOPCBlocks.overgrownNetherrack; - this.fillerBlock = Blocks.netherrack; - - this.theBiomeDecorator.treesPerChunk = 50; - - this.bopWorldFeatures.setFeature("netherVinesPerChunk", 20); - this.bopWorldFeatures.setFeature("netherrackSplatterPerChunk", 45); - this.bopWorldFeatures.setFeature("bopBigMushroomsPerChunk", 30); - this.bopWorldFeatures.setFeature("gravesPerChunk", 1); - this.bopWorldFeatures.setFeature("waspHivesPerChunk", 1); - this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 10); - this.bopWorldFeatures.setFeature("glowshroomsPerChunk", 5); - - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 50); - - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 0), 0.25D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - } - - @Override - //TODO: getRandomWorldGenForTrees() - public WorldGenAbstractTree func_150567_a(Random random) - { - return new WorldGenMiniShrub(BOPCBlocks.logs4, BOPCBlocks.leaves4, 1, 0, BOPCBlocks.overgrownNetherrack); - } -} diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/tech/BiomeGenLushRiver.java b/src/main/java/biomesoplenty/common/biomes/overworld/tech/BiomeGenLushRiver.java deleted file mode 100644 index 594d3943e..000000000 --- a/src/main/java/biomesoplenty/common/biomes/overworld/tech/BiomeGenLushRiver.java +++ /dev/null @@ -1,49 +0,0 @@ -package biomesoplenty.common.biomes.overworld.tech; - -import java.util.Random; - -import net.minecraft.init.Blocks; -import net.minecraft.world.gen.feature.WorldGenAbstractTree; -import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.biomes.BOPBiome; -import biomesoplenty.common.world.features.WorldGenBOPTallGrass; -import biomesoplenty.common.world.features.trees.WorldGenBOPShrub; - -public class BiomeGenLushRiver extends BOPBiome -{ - private static final Height biomeHeight = new Height(-0.5F, 0.0F); - - public BiomeGenLushRiver(int par1) - { - super(par1); - this.spawnableCreatureList.clear(); - this.setTemperatureRainfall(0.6F, 0.7F); - - this.setHeight(biomeHeight); - - this.theBiomeDecorator.treesPerChunk = 10; - this.theBiomeDecorator.grassPerChunk = 10; - this.theBiomeDecorator.reedsPerChunk = 10; - this.theBiomeDecorator.waterlilyPerChunk = 8; - - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 8); - this.bopWorldFeatures.setFeature("riverCanePerChunk", 10); - this.bopWorldFeatures.setFeature("seaweedPerChunk", 15); - this.bopWorldFeatures.setFeature("algaePerChunk", 10); - - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 30); - - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - } - - @Override - //TODO: getRandomWorldGenForTrees() - public WorldGenAbstractTree func_150567_a(Random random) - { - return new WorldGenBOPShrub(Blocks.log, Blocks.leaves, 0, 0, Blocks.grass); - } -} \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/core/BOPBiomes.java b/src/main/java/biomesoplenty/common/core/BOPBiomes.java index 0ed79f9e4..f8b702ab7 100644 --- a/src/main/java/biomesoplenty/common/core/BOPBiomes.java +++ b/src/main/java/biomesoplenty/common/core/BOPBiomes.java @@ -2,10 +2,13 @@ package biomesoplenty.common.core; import static biomesoplenty.api.content.BOPCBiomes.*; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.List; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.BiomeGenPlains; import net.minecraft.world.biome.WorldChunkManager; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.BiomeDictionary.Type; @@ -14,93 +17,114 @@ import net.minecraftforge.common.BiomeManager.BiomeEntry; import org.apache.logging.log4j.Level; +import biomesoplenty.api.BOPObfuscationHelper; +import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.biome.BOPOverriddenBiome; import biomesoplenty.api.content.BOPCBiomes; -import biomesoplenty.common.biomes.nether.BiomeGenBoneyard; -import biomesoplenty.common.biomes.nether.BiomeGenCorruptedSands; -import biomesoplenty.common.biomes.nether.BiomeGenPhantasmagoricInferno; -import biomesoplenty.common.biomes.nether.BiomeGenUndergarden; -import biomesoplenty.common.biomes.nether.BiomeGenVisceralHeap; -import biomesoplenty.common.biomes.overworld.BiomeGenAlps; -import biomesoplenty.common.biomes.overworld.BiomeGenArctic; -import biomesoplenty.common.biomes.overworld.BiomeGenBambooForest; -import biomesoplenty.common.biomes.overworld.BiomeGenBayou; -import biomesoplenty.common.biomes.overworld.BiomeGenBog; -import biomesoplenty.common.biomes.overworld.BiomeGenBorealForest; -import biomesoplenty.common.biomes.overworld.BiomeGenBrushland; -import biomesoplenty.common.biomes.overworld.BiomeGenCanyon; -import biomesoplenty.common.biomes.overworld.BiomeGenChaparral; -import biomesoplenty.common.biomes.overworld.BiomeGenCherryBlossomGrove; -import biomesoplenty.common.biomes.overworld.BiomeGenConiferousForest; -import biomesoplenty.common.biomes.overworld.BiomeGenConiferousForestSnow; -import biomesoplenty.common.biomes.overworld.BiomeGenCrag; -import biomesoplenty.common.biomes.overworld.BiomeGenDeadForest; -import biomesoplenty.common.biomes.overworld.BiomeGenDeadSwamp; -import biomesoplenty.common.biomes.overworld.BiomeGenDeciduousForest; -import biomesoplenty.common.biomes.overworld.BiomeGenFen; -import biomesoplenty.common.biomes.overworld.BiomeGenFlowerField; -import biomesoplenty.common.biomes.overworld.BiomeGenFrostForest; -import biomesoplenty.common.biomes.overworld.BiomeGenFungiForest; -import biomesoplenty.common.biomes.overworld.BiomeGenGarden; -import biomesoplenty.common.biomes.overworld.BiomeGenGrassland; -import biomesoplenty.common.biomes.overworld.BiomeGenGrove; -import biomesoplenty.common.biomes.overworld.BiomeGenHeathland; -import biomesoplenty.common.biomes.overworld.BiomeGenHighland; -import biomesoplenty.common.biomes.overworld.BiomeGenJadeCliffs; -import biomesoplenty.common.biomes.overworld.BiomeGenLavenderFields; -import biomesoplenty.common.biomes.overworld.BiomeGenLushDesert; -import biomesoplenty.common.biomes.overworld.BiomeGenLushSwamp; -import biomesoplenty.common.biomes.overworld.BiomeGenMapleWoods; -import biomesoplenty.common.biomes.overworld.BiomeGenMarsh; -import biomesoplenty.common.biomes.overworld.BiomeGenMeadow; -import biomesoplenty.common.biomes.overworld.BiomeGenMoor; -import biomesoplenty.common.biomes.overworld.BiomeGenMountain; -import biomesoplenty.common.biomes.overworld.BiomeGenMysticGrove; -import biomesoplenty.common.biomes.overworld.BiomeGenOminousWoods; -import biomesoplenty.common.biomes.overworld.BiomeGenOriginValley; -import biomesoplenty.common.biomes.overworld.BiomeGenOutback; -import biomesoplenty.common.biomes.overworld.BiomeGenPrairie; -import biomesoplenty.common.biomes.overworld.BiomeGenRainforest; -import biomesoplenty.common.biomes.overworld.BiomeGenRedwoodForest; -import biomesoplenty.common.biomes.overworld.BiomeGenSacredSprings; -import biomesoplenty.common.biomes.overworld.BiomeGenSeasonalForest; -import biomesoplenty.common.biomes.overworld.BiomeGenShield; -import biomesoplenty.common.biomes.overworld.BiomeGenShrubland; -import biomesoplenty.common.biomes.overworld.BiomeGenSludgepit; -import biomesoplenty.common.biomes.overworld.BiomeGenSteppe; -import biomesoplenty.common.biomes.overworld.BiomeGenTemperateRainforest; -import biomesoplenty.common.biomes.overworld.BiomeGenThicket; -import biomesoplenty.common.biomes.overworld.BiomeGenTropicalRainforest; -import biomesoplenty.common.biomes.overworld.BiomeGenTundra; -import biomesoplenty.common.biomes.overworld.BiomeGenWasteland; -import biomesoplenty.common.biomes.overworld.BiomeGenWetland; -import biomesoplenty.common.biomes.overworld.BiomeGenWoodland; -import biomesoplenty.common.biomes.overworld.ocean.BiomeGenCoralReef; -import biomesoplenty.common.biomes.overworld.ocean.BiomeGenKelpForest; -import biomesoplenty.common.biomes.overworld.sub.BiomeGenAlpsForest; -import biomesoplenty.common.biomes.overworld.sub.BiomeGenCanyonRavine; -import biomesoplenty.common.biomes.overworld.sub.BiomeGenGlacier; -import biomesoplenty.common.biomes.overworld.sub.BiomeGenMangrove; -import biomesoplenty.common.biomes.overworld.sub.BiomeGenMeadowForest; -import biomesoplenty.common.biomes.overworld.sub.BiomeGenOasis; -import biomesoplenty.common.biomes.overworld.sub.BiomeGenOrchard; -import biomesoplenty.common.biomes.overworld.sub.BiomeGenQuagmire; -import biomesoplenty.common.biomes.overworld.sub.BiomeGenScrubland; -import biomesoplenty.common.biomes.overworld.sub.BiomeGenSilkglades; -import biomesoplenty.common.biomes.overworld.sub.BiomeGenSpruceWoods; -import biomesoplenty.common.biomes.overworld.sub.BiomeGenTropics; -import biomesoplenty.common.biomes.overworld.sub.BiomeGenVolcano; -import biomesoplenty.common.biomes.overworld.tech.BiomeGenDryRiver; -import biomesoplenty.common.biomes.overworld.tech.BiomeGenLushRiver; +import biomesoplenty.common.biome.nether.BiomeGenBoneyard; +import biomesoplenty.common.biome.nether.BiomeGenCorruptedSands; +import biomesoplenty.common.biome.nether.BiomeGenPhantasmagoricInferno; +import biomesoplenty.common.biome.nether.BiomeGenUndergarden; +import biomesoplenty.common.biome.nether.BiomeGenVisceralHeap; +import biomesoplenty.common.biome.overridden.BiomeGenBOPBirchForest; +import biomesoplenty.common.biome.overridden.BiomeGenBOPDesert; +import biomesoplenty.common.biome.overridden.BiomeGenBOPExtremeHills; +import biomesoplenty.common.biome.overridden.BiomeGenBOPForest; +import biomesoplenty.common.biome.overridden.BiomeGenBOPHell; +import biomesoplenty.common.biome.overridden.BiomeGenBOPIcePlains; +import biomesoplenty.common.biome.overridden.BiomeGenBOPJungle; +import biomesoplenty.common.biome.overridden.BiomeGenBOPMesa; +import biomesoplenty.common.biome.overridden.BiomeGenBOPMushroomIsland; +import biomesoplenty.common.biome.overridden.BiomeGenBOPOcean; +import biomesoplenty.common.biome.overridden.BiomeGenBOPPlains; +import biomesoplenty.common.biome.overridden.BiomeGenBOPRiver; +import biomesoplenty.common.biome.overridden.BiomeGenBOPRoofedForest; +import biomesoplenty.common.biome.overridden.BiomeGenBOPSavanna; +import biomesoplenty.common.biome.overridden.BiomeGenBOPSwamp; +import biomesoplenty.common.biome.overridden.BiomeGenBOPTaiga; +import biomesoplenty.common.biome.overworld.BiomeGenAlps; +import biomesoplenty.common.biome.overworld.BiomeGenArctic; +import biomesoplenty.common.biome.overworld.BiomeGenBambooForest; +import biomesoplenty.common.biome.overworld.BiomeGenBayou; +import biomesoplenty.common.biome.overworld.BiomeGenBog; +import biomesoplenty.common.biome.overworld.BiomeGenBorealForest; +import biomesoplenty.common.biome.overworld.BiomeGenBrushland; +import biomesoplenty.common.biome.overworld.BiomeGenCanyon; +import biomesoplenty.common.biome.overworld.BiomeGenChaparral; +import biomesoplenty.common.biome.overworld.BiomeGenCherryBlossomGrove; +import biomesoplenty.common.biome.overworld.BiomeGenConiferousForest; +import biomesoplenty.common.biome.overworld.BiomeGenConiferousForestSnow; +import biomesoplenty.common.biome.overworld.BiomeGenCrag; +import biomesoplenty.common.biome.overworld.BiomeGenDeadForest; +import biomesoplenty.common.biome.overworld.BiomeGenDeadSwamp; +import biomesoplenty.common.biome.overworld.BiomeGenDeciduousForest; +import biomesoplenty.common.biome.overworld.BiomeGenFen; +import biomesoplenty.common.biome.overworld.BiomeGenFlowerField; +import biomesoplenty.common.biome.overworld.BiomeGenFrostForest; +import biomesoplenty.common.biome.overworld.BiomeGenFungiForest; +import biomesoplenty.common.biome.overworld.BiomeGenGarden; +import biomesoplenty.common.biome.overworld.BiomeGenGrassland; +import biomesoplenty.common.biome.overworld.BiomeGenGrove; +import biomesoplenty.common.biome.overworld.BiomeGenHeathland; +import biomesoplenty.common.biome.overworld.BiomeGenHighland; +import biomesoplenty.common.biome.overworld.BiomeGenJadeCliffs; +import biomesoplenty.common.biome.overworld.BiomeGenLavenderFields; +import biomesoplenty.common.biome.overworld.BiomeGenLushDesert; +import biomesoplenty.common.biome.overworld.BiomeGenLushSwamp; +import biomesoplenty.common.biome.overworld.BiomeGenMapleWoods; +import biomesoplenty.common.biome.overworld.BiomeGenMarsh; +import biomesoplenty.common.biome.overworld.BiomeGenMeadow; +import biomesoplenty.common.biome.overworld.BiomeGenMoor; +import biomesoplenty.common.biome.overworld.BiomeGenMountain; +import biomesoplenty.common.biome.overworld.BiomeGenMysticGrove; +import biomesoplenty.common.biome.overworld.BiomeGenOminousWoods; +import biomesoplenty.common.biome.overworld.BiomeGenOriginValley; +import biomesoplenty.common.biome.overworld.BiomeGenOutback; +import biomesoplenty.common.biome.overworld.BiomeGenPrairie; +import biomesoplenty.common.biome.overworld.BiomeGenRainforest; +import biomesoplenty.common.biome.overworld.BiomeGenRedwoodForest; +import biomesoplenty.common.biome.overworld.BiomeGenSacredSprings; +import biomesoplenty.common.biome.overworld.BiomeGenSeasonalForest; +import biomesoplenty.common.biome.overworld.BiomeGenShield; +import biomesoplenty.common.biome.overworld.BiomeGenShrubland; +import biomesoplenty.common.biome.overworld.BiomeGenSludgepit; +import biomesoplenty.common.biome.overworld.BiomeGenSteppe; +import biomesoplenty.common.biome.overworld.BiomeGenTemperateRainforest; +import biomesoplenty.common.biome.overworld.BiomeGenThicket; +import biomesoplenty.common.biome.overworld.BiomeGenTropicalRainforest; +import biomesoplenty.common.biome.overworld.BiomeGenTundra; +import biomesoplenty.common.biome.overworld.BiomeGenWasteland; +import biomesoplenty.common.biome.overworld.BiomeGenWetland; +import biomesoplenty.common.biome.overworld.BiomeGenWoodland; +import biomesoplenty.common.biome.overworld.ocean.BiomeGenCoralReef; +import biomesoplenty.common.biome.overworld.ocean.BiomeGenKelpForest; +import biomesoplenty.common.biome.overworld.sub.BiomeGenAlpsForest; +import biomesoplenty.common.biome.overworld.sub.BiomeGenCanyonRavine; +import biomesoplenty.common.biome.overworld.sub.BiomeGenGlacier; +import biomesoplenty.common.biome.overworld.sub.BiomeGenMangrove; +import biomesoplenty.common.biome.overworld.sub.BiomeGenMeadowForest; +import biomesoplenty.common.biome.overworld.sub.BiomeGenOasis; +import biomesoplenty.common.biome.overworld.sub.BiomeGenOrchard; +import biomesoplenty.common.biome.overworld.sub.BiomeGenQuagmire; +import biomesoplenty.common.biome.overworld.sub.BiomeGenScrubland; +import biomesoplenty.common.biome.overworld.sub.BiomeGenSilkglades; +import biomesoplenty.common.biome.overworld.sub.BiomeGenSpruceWoods; +import biomesoplenty.common.biome.overworld.sub.BiomeGenTropics; +import biomesoplenty.common.biome.overworld.sub.BiomeGenVolcano; +import biomesoplenty.common.biome.overworld.tech.BiomeGenDryRiver; +import biomesoplenty.common.biome.overworld.tech.BiomeGenLushRiver; import biomesoplenty.common.configuration.BOPConfigurationBiomeGen; import biomesoplenty.common.configuration.BOPConfigurationBiomeWeights; import biomesoplenty.common.configuration.BOPConfigurationIDs; import biomesoplenty.common.configuration.BOPConfigurationMisc; +import biomesoplenty.common.helpers.BOPReflectionHelper; import biomesoplenty.common.utils.BOPLogger; import biomesoplenty.common.world.BOPBiomeManager; import biomesoplenty.common.world.WorldTypeBOP; import biomesoplenty.common.world.BOPBiomeManager.TemperatureType; -import biomesoplenty.common.world.decoration.BOPDecorationManager; +import cpw.mods.fml.common.ObfuscationReflectionHelper; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.ReflectionHelper; public class BOPBiomes { @@ -110,14 +134,13 @@ public class BOPBiomes public static void init() { - GameRegistry.registerWorldGenerator(new BOPDecorationManager(), 0); - try { BOPConfigurationIDs.config.load(); BOPConfigurationBiomeGen.config.load(); BOPConfigurationBiomeWeights.config.load(); registerBiomes(); + registerOverriddenBiomes(); } catch (Exception e) { @@ -223,6 +246,38 @@ public class BOPBiomes dryRiver = registerOverworldRiverBiome(BiomeGenDryRiver.class, "Dry River", outback, steppe, BiomeGenBase.desert, BiomeGenBase.desertHills); } + private static void registerOverriddenBiomes() + { + registerOverriddenBiome(BiomeGenBOPBirchForest.class, BOPObfuscationHelper.birchForest, BOPObfuscationHelper.birchForestHills); + + registerOverriddenBiome(BiomeGenBOPDesert.class, BOPObfuscationHelper.desert, BOPObfuscationHelper.desertHills); + + registerOverriddenBiome(BiomeGenBOPExtremeHills.class, BOPObfuscationHelper.extremeHills, BOPObfuscationHelper.extremeHillsEdge); + + registerOverriddenBiome(BiomeGenBOPForest.class, BOPObfuscationHelper.forest, BOPObfuscationHelper.forestHills); + + registerOverriddenBiome(BiomeGenBOPIcePlains.class, BOPObfuscationHelper.icePlains); + + registerOverriddenBiome(BiomeGenBOPJungle.class, BOPObfuscationHelper.jungle, BOPObfuscationHelper.jungleEdge, BOPObfuscationHelper.jungleHills); + + registerOverriddenBiome(BiomeGenBOPMesa.class, BOPObfuscationHelper.mesa, BOPObfuscationHelper.mesaPlateau, BOPObfuscationHelper.mesaPlateau_F); + + registerOverriddenBiome(BiomeGenBOPMushroomIsland.class, BOPObfuscationHelper.mushroomIsland, BOPObfuscationHelper.mushroomIslandShore); + + registerOverriddenBiome(BiomeGenBOPOcean.class, BOPObfuscationHelper.ocean); + registerOverriddenBiome(BiomeGenBOPPlains.class, BOPObfuscationHelper.plains); + registerOverriddenBiome(BiomeGenBOPRiver.class, BOPObfuscationHelper.river); + registerOverriddenBiome(BiomeGenBOPRoofedForest.class, BOPObfuscationHelper.roofedForest); + + registerOverriddenBiome(BiomeGenBOPSavanna.class, BOPObfuscationHelper.savanna, BOPObfuscationHelper.savannaPlateau); + + registerOverriddenBiome(BiomeGenBOPSwamp.class, BOPObfuscationHelper.swampland); + + registerOverriddenBiome(BiomeGenBOPTaiga.class, BOPObfuscationHelper.taiga, BOPObfuscationHelper.taigaHills, BOPObfuscationHelper.coldTaiga, BOPObfuscationHelper.coldTaigaHills); + + registerOverriddenBiome(BiomeGenBOPHell.class, BOPObfuscationHelper.hell); + } + private static void addBiomesToDictionary() { BiomeDictionary.registerBiomeType(BOPCBiomes.alps, Type.FROZEN, Type.MOUNTAIN); @@ -404,6 +459,34 @@ public class BOPBiomes return BOPBiomeManager.createAndRegisterBiome(biomeClass, "Nether", biomeName, BOPBiomeManager.netherBiomes, weight); } + private static void registerOverriddenBiome(Class biomeClass, String[]...overriddenBiomeNames) + { + for (String[] overriddenBiomeName : overriddenBiomeNames) + { + Field field = BOPReflectionHelper.removeFinal(BiomeGenBase.class, null, overriddenBiomeName); + + try + { + BiomeGenBase biomeToOverride = (BiomeGenBase)field.get(null); + + if (biomeToOverride != null) + { + BiomeGenBase newBiome = BOPBiomeManager.createBiome(biomeClass, biomeToOverride.biomeName, biomeToOverride.biomeID); + + if (BOPConfigurationBiomeGen.config.get("Vanilla Biomes To Override", biomeToOverride.biomeName, true).getBoolean(false)) + { + field.set(null, newBiome); + BiomeGenBase.getBiomeGenArray()[biomeToOverride.biomeID] = newBiome; + } + } + } + catch (Exception e) + { + e.printStackTrace(); + } + } + } + public static void addSpawnBiome(BiomeGenBase biome) { BiomeManager.addSpawnBiome(biome); diff --git a/src/main/java/biomesoplenty/common/core/BOPVanillaCompat.java b/src/main/java/biomesoplenty/common/core/BOPVanillaCompat.java index 31f8935b9..b1cb640b9 100644 --- a/src/main/java/biomesoplenty/common/core/BOPVanillaCompat.java +++ b/src/main/java/biomesoplenty/common/core/BOPVanillaCompat.java @@ -2,13 +2,13 @@ package biomesoplenty.common.core; import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.api.BOPItemHelper; +import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.biome.BiomeFeatures; import biomesoplenty.api.content.BOPCBlocks; import biomesoplenty.api.content.BOPCItems; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.entities.projectiles.dispenser.DispenserBehaviourDart; import biomesoplenty.common.entities.projectiles.dispenser.DispenserBehaviourMudball; -import biomesoplenty.common.world.decoration.BOPDecorationManager; -import biomesoplenty.common.world.decoration.BOPWorldFeatures; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import net.minecraft.block.BlockDispenser; @@ -16,6 +16,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraftforge.common.ChestGenHooks; import java.util.HashMap; @@ -74,31 +75,29 @@ public class BOPVanillaCompat private static void addBonemealFlowers() { - for (BiomeGenBase biome : BiomeGenBase.getBiomeGenArray()) - { - if (biome != null) - { - BOPWorldFeatures biomeFeatures = BOPDecorationManager.getBiomeFeatures(biome.biomeID); + for (BiomeGenBase biome : BiomeGenBase.getBiomeGenArray()) + { + if (biome != null && biome instanceof BOPBiome) + { + BOPBiome bopBiome = (BOPBiome)biome; + BiomeFeatures biomeFeatures = bopBiome.theBiomeDecorator.bopFeatures; - if (biomeFeatures != null) - { - if (biomeFeatures.weightedFlowerGen != null && !biomeFeatures.weightedFlowerGen.isEmpty()) - { - HashMap flowerMap = biomeFeatures.weightedFlowerGen; + if (biomeFeatures.weightedFlowerGen != null && !biomeFeatures.weightedFlowerGen.isEmpty()) + { + HashMap flowerMap = biomeFeatures.weightedFlowerGen; - for (Entry entry : flowerMap.entrySet()) - { - if (!(entry.getKey() instanceof WorldGenBOPDoubleFlora)) - { - WorldGenBOPFlora flowerGenerator = entry.getKey(); - int weight = entry.getValue(); + for (Entry entry : flowerMap.entrySet()) + { + if (entry.getKey() instanceof WorldGenBOPFlora && !(entry.getKey() instanceof WorldGenBOPDoubleFlora)) + { + WorldGenBOPFlora flowerGenerator = (WorldGenBOPFlora)entry.getKey(); + int weight = entry.getValue(); - biome.addFlower(flowerGenerator.flora, flowerGenerator.floraMeta, weight); - } - } - } - } - } - } + biome.addFlower(flowerGenerator.flora, flowerGenerator.floraMeta, weight); + } + } + } + } + } } } diff --git a/src/main/java/biomesoplenty/common/eventhandler/world/DecorationModificationEventHandler.java b/src/main/java/biomesoplenty/common/eventhandler/world/DecorationModificationEventHandler.java index 98c63eebb..160c50af9 100644 --- a/src/main/java/biomesoplenty/common/eventhandler/world/DecorationModificationEventHandler.java +++ b/src/main/java/biomesoplenty/common/eventhandler/world/DecorationModificationEventHandler.java @@ -1,27 +1,19 @@ package biomesoplenty.common.eventhandler.world; -import biomesoplenty.common.world.decoration.BiomeTweaker; -import biomesoplenty.common.world.decoration.IBOPBiome; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import java.util.Random; + import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate; -import net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate; - -import java.util.Random; +import biomesoplenty.api.biome.BOPBiome; +import cpw.mods.fml.common.eventhandler.Event.Result; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class DecorationModificationEventHandler { @SubscribeEvent public void modifyDecor(Decorate event) { - if (event.type == Decorate.EventType.LAKE) - { - event.setResult(Result.DENY); - return; - } - World world = event.world; int chunkX = event.chunkX; @@ -30,22 +22,20 @@ public class DecorationModificationEventHandler Random random = event.rand; BiomeGenBase biome = world.getBiomeGenForCoordsBody(chunkX + 16, chunkZ + 16); - IBOPBiome bopDecoration = null; - - if (biome instanceof IBOPBiome) - { - bopDecoration = (IBOPBiome)biome; - } - else if (BiomeTweaker.biomeHasForcedDecorator(biome.biomeID)) - { - bopDecoration = BiomeTweaker.getForcedDecorator(biome.biomeID); - } - if (bopDecoration != null) + if (biome instanceof BOPBiome) { + BOPBiome bopBiome = (BOPBiome)biome; + + if (event.type == Decorate.EventType.LAKE) + { + event.setResult(Result.DENY); + return; + } + if (event.type == Decorate.EventType.PUMPKIN) { - if (!(Boolean)bopDecoration.getBiomeFeatures().getFeature("generatePumpkins")) + if (!(Boolean)bopBiome.theBiomeDecorator.bopFeatures.getFeature("generatePumpkins")) { event.setResult(Result.DENY); } diff --git a/src/main/java/biomesoplenty/common/helpers/BOPReflectionHelper.java b/src/main/java/biomesoplenty/common/helpers/BOPReflectionHelper.java index dc02c0f4d..944ef6dd9 100755 --- a/src/main/java/biomesoplenty/common/helpers/BOPReflectionHelper.java +++ b/src/main/java/biomesoplenty/common/helpers/BOPReflectionHelper.java @@ -9,6 +9,24 @@ import cpw.mods.fml.relauncher.ReflectionHelper; public class BOPReflectionHelper { + public static Field removeFinal(Class classToAccess, T instance, String... fieldNames) + { + Field field = ReflectionHelper.findField(classToAccess, ObfuscationReflectionHelper.remapFieldNames(classToAccess.getName(), fieldNames)); + + try + { + Field modifiersField = Field.class.getDeclaredField("modifiers"); + modifiersField.setAccessible(true); + modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL); + } + catch (Exception e) + { + e.printStackTrace(); + } + + return field; + } + public static void setPrivateFinalValue(Class classToAccess, T instance, E value, String... fieldNames) { Field field = ReflectionHelper.findField(classToAccess, ObfuscationReflectionHelper.remapFieldNames(classToAccess.getName(), fieldNames)); diff --git a/src/main/java/biomesoplenty/common/world/BOPBiomeManager.java b/src/main/java/biomesoplenty/common/world/BOPBiomeManager.java index ad48cfcdd..5eb353587 100644 --- a/src/main/java/biomesoplenty/common/world/BOPBiomeManager.java +++ b/src/main/java/biomesoplenty/common/world/BOPBiomeManager.java @@ -5,6 +5,7 @@ import java.util.List; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.BiomeManager.BiomeEntry; +import biomesoplenty.api.biome.BOPInheritedBiome; import biomesoplenty.common.configuration.BOPConfigurationBiomeGen; import biomesoplenty.common.configuration.BOPConfigurationBiomeWeights; import biomesoplenty.common.configuration.BOPConfigurationIDs; @@ -38,15 +39,24 @@ public class BOPBiomeManager return null; } - public static BiomeGenBase createBiome(Class biomeClass, String biomeName) + public static BiomeGenBase createBiome(Class biomeClass, String biomeName, int biomeId) { - int biomeId = BOPConfigurationIDs.config.get("Biome IDs", biomeName + " ID", getNextFreeBiomeId()).getInt(); + if (biomeId == -1) biomeId = BOPConfigurationIDs.config.get("Biome IDs", biomeName + " ID", getNextFreeBiomeId()).getInt(); if (biomeId != -1) { try { - BiomeGenBase biome = biomeClass.getConstructor(int.class).newInstance(biomeId).setBiomeName(biomeName); + BiomeGenBase biome; + + if (BOPInheritedBiome.class.isAssignableFrom(biomeClass)) + { + biome = biomeClass.getConstructor(int.class, BiomeGenBase.class).newInstance(biomeId, BiomeGenBase.getBiome(biomeId)).setBiomeName(biomeName); + } + else + { + biome = biomeClass.getConstructor(int.class).newInstance(biomeId).setBiomeName(biomeName); + } return biome; } @@ -59,6 +69,11 @@ public class BOPBiomeManager return null; } + public static BiomeGenBase createBiome(Class biomeClass, String biomeName) + { + return createBiome(biomeClass, biomeName, -1); + } + public static int getNextFreeBiomeId() { for (int i = nextBiomeId; i < 256; i++) diff --git a/src/main/java/biomesoplenty/common/world/ChunkProviderBOPHell.java b/src/main/java/biomesoplenty/common/world/ChunkProviderBOPHell.java index 29da7f50e..2eb088244 100644 --- a/src/main/java/biomesoplenty/common/world/ChunkProviderBOPHell.java +++ b/src/main/java/biomesoplenty/common/world/ChunkProviderBOPHell.java @@ -481,6 +481,10 @@ public class ChunkProviderBOPHell implements IChunkProvider int k = par2 * 16; int l = par3 * 16; BiomeGenBase var6 = worldObj.getBiomeGenForCoords(k + 16, l + 16); + this.hellRNG.setSeed(this.worldObj.getSeed()); + long rand1 = this.hellRNG.nextLong() / 2L * 2L + 1L; + long rand2 = this.hellRNG.nextLong() / 2L * 2L + 1L; + this.hellRNG.setSeed((long)par2 * rand1 + (long)par3 * rand2 ^ this.worldObj.getSeed()); genNetherBridge.generateStructuresInChunk(worldObj, hellRNG, par2, par3); int i1; @@ -566,31 +570,9 @@ public class ChunkProviderBOPHell implements IChunkProvider (new WorldGenHellLava(Blocks.flowing_lava, true)).generate(worldObj, hellRNG, l1, i2, j2); } - i1 = var6.theBiomeDecorator.treesPerChunk; - - if (this.hellRNG.nextInt(10) == 0) - { - ++i1; - } - - for (j1 = 0; j1 < i1; ++j1) - { - k1 = k + this.hellRNG.nextInt(16) + 8; - l1 = l + this.hellRNG.nextInt(16) + 8; - i2 = this.hellRNG.nextInt(128); - WorldGenAbstractTree worldgenabstracttree = var6.func_150567_a(this.hellRNG); - worldgenabstracttree.setScale(1.0D, 1.0D, 1.0D); - - if (worldgenabstracttree.generate(this.worldObj, this.hellRNG, k1, i2, l1)) - { - worldgenabstracttree.func_150524_b(this.worldObj, this.hellRNG, k1, i2, l1); - } - } - + var6.decorate(worldObj, hellRNG, k, l); + MinecraftForge.EVENT_BUS.post(new DecorateBiomeEvent.Post(worldObj, hellRNG, k, l)); - - //var6.decorate(worldObj, hellRNG, k, l); - MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Post(par1IChunkProvider, worldObj, hellRNG, par2, par3, false)); BlockFalling.fallInstantly = false; diff --git a/src/main/java/biomesoplenty/common/world/decoration/BOPDecorationManager.java b/src/main/java/biomesoplenty/common/world/decoration/BOPDecorationManager.java deleted file mode 100644 index 4b468472e..000000000 --- a/src/main/java/biomesoplenty/common/world/decoration/BOPDecorationManager.java +++ /dev/null @@ -1,109 +0,0 @@ -package biomesoplenty.common.world.decoration; - -import biomesoplenty.common.utils.BOPLogger; -import biomesoplenty.common.world.generation.IBOPWorldGenerator; -import biomesoplenty.common.world.generation.WorldGenFieldAssociation; -import cpw.mods.fml.common.IWorldGenerator; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.chunk.IChunkProvider; -import net.minecraft.world.gen.feature.WorldGenerator; -import net.minecraftforge.event.terraingen.DecorateBiomeEvent; -import net.minecraftforge.event.terraingen.TerrainGen; - -import java.util.HashMap; -import java.util.Map; -import java.util.Random; - -public class BOPDecorationManager implements IWorldGenerator -{ - private static BOPWorldFeatures[] biomeFeaturesMap = new BOPWorldFeatures[BiomeGenBase.getBiomeGenArray().length]; - - @Override - public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) - { - if (world.provider.terrainType.getWorldTypeName().equals("BIOMESOP")) - { - chunkX <<= 4; - chunkZ <<= 4; - - BiomeGenBase biome = world.getBiomeGenForCoords(chunkX + 16, chunkZ + 16); - BOPWorldFeatures biomeFeatures = getBiomeFeatures(biome.biomeID); - - if (biomeFeatures != null) - { - for (String featureName : biomeFeatures.getFeatureNames()) - { - try - { - if (featureName.equals("bopFlowersPerChunk")) - { - if (!TerrainGen.decorate(world, random, chunkX, chunkZ, DecorateBiomeEvent.Decorate.EventType.FLOWERS)) continue; - } - else if (featureName.equals("bopGrassPerChunk")) - { - if (!TerrainGen.decorate(world, random, chunkX, chunkZ, DecorateBiomeEvent.Decorate.EventType.GRASS)) continue; - } - - WorldGenFieldAssociation.WorldFeature worldFeature = WorldGenFieldAssociation.getAssociatedFeature(featureName); - - if (worldFeature != null) - { - IBOPWorldGenerator worldGenerator = worldFeature.getBOPWorldGenerator(); - - if (worldGenerator != null) - { - worldGenerator.setupGeneration(world, random, biome, featureName, chunkX, chunkZ); - } - } - } - catch (Exception e) - { - Throwable cause = e.getCause(); - - if (e.getMessage() != null && e.getMessage().equals("Already decorating!!") || (cause != null && cause.getMessage() != null && cause.getMessage().equals("Already decorating!!"))) - { - } - else - { - BOPLogger.severe("Exception on generating " + featureName, e); - } - } - } - } - } - } - - public static T getRandomWeightedWorldGenerator(HashMap worldGeneratorMap) - { - double completeWeight = 0D; - - for (Number weight : worldGeneratorMap.values()) - { - completeWeight += Double.parseDouble(weight.toString()); - } - - double random = Math.random() * completeWeight; - double countWeight = 0D; - - for (Map.Entry entry : worldGeneratorMap.entrySet()) - { - countWeight += Double.parseDouble(entry.getValue().toString()); - - if (countWeight >= random) return entry.getKey(); - } - - return null; - } - - public static BOPWorldFeatures getOrCreateBiomeFeatures(int biomeID) - { - if (biomeFeaturesMap[biomeID] == null) return biomeFeaturesMap[biomeID] = new BOPWorldFeatures(); - else return biomeFeaturesMap[biomeID]; - } - - public static BOPWorldFeatures getBiomeFeatures(int biomeID) - { - return biomeFeaturesMap[biomeID]; - } -} diff --git a/src/main/java/biomesoplenty/common/world/decoration/BOPWorldFeatures.java b/src/main/java/biomesoplenty/common/world/decoration/BOPWorldFeatures.java deleted file mode 100644 index aba1e57eb..000000000 --- a/src/main/java/biomesoplenty/common/world/decoration/BOPWorldFeatures.java +++ /dev/null @@ -1,150 +0,0 @@ -package biomesoplenty.common.world.decoration; - -import biomesoplenty.common.world.features.WorldGenBOPFlora; -import biomesoplenty.common.world.generation.WorldGenFieldAssociation; -import net.minecraft.world.gen.feature.WorldGenerator; - -import java.util.HashMap; -import java.util.Set; - -public class BOPWorldFeatures -{ - public HashMap weightedGrassGen = new HashMap(); - public HashMap weightedFlowerGen = new HashMap(); - - private HashMap featureValueMap = new HashMap(); - - static - { - WorldGenFieldAssociation.init(); - } - - protected BOPWorldFeatures() - { - addFeature("generatePumpkins", true); - addFeature("generateQuicksand", false); - addFeature("generateCanyon", false); - addFeature("generateStoneInGrass", false); - addFeature("generateStoneInGrass2", false); - addFeature("generateGrass", false); - addFeature("generateSand", false); - addFeature("generateQuagmire", false); - addFeature("generateAsh", false); - addFeature("generateMelons", false); - addFeature("generateMycelium", false); - addFeature("generateSponge", false); - - addFeature("waterSpringsPerChunk", 50); - addFeature("lavaSpringsPerChunk", 20); - - addFeature("waterLakesPerChunk", 0); - addFeature("lavaLakesPerChunk", 0); - addFeature("poisonLakesPerChunk", 0); - - addFeature("mudPerChunk", 0); - addFeature("riverCanePerChunk", 0); - addFeature("shrubsPerChunk", 0); - addFeature("bushesPerChunk", 0); - addFeature("cloverPatchesPerChunk", 0); - addFeature("leafPilesPerChunk", 0); - addFeature("deadLeafPilesPerChunk", 0); - addFeature("lavenderPerChunk", 0); - addFeature("thornsPerChunk", 0); - addFeature("stalagmitesPerChunk", 3); - addFeature("stalactitesPerChunk", 6); - addFeature("desertSproutsPerChunk", 0); - addFeature("bromeliadsPerChunk", 0); - addFeature("waterReedsPerChunk", 0); - addFeature("wildCarrotsPerChunk", 0); - addFeature("poisonIvyPerChunk", 0); - addFeature("berryBushesPerChunk", 0); - addFeature("portobellosPerChunk", 0); - addFeature("koruPerChunk", 0); - addFeature("toadstoolsPerChunk", 0); - addFeature("blueMilksPerChunk", 0); - addFeature("cattailsPerChunk", 0); - addFeature("highCattailsPerChunk", 0); - addFeature("algaePerChunk", 0); - addFeature("sproutsPerChunk", 0); - addFeature("tinyCactiPerChunk", 0); - addFeature("oasesPerChunk", 0); - addFeature("minersDelightPerChunk", 2); - addFeature("rootsPerChunk", 9); - addFeature("grassSplatterPerChunk", 0); - addFeature("rockpilesPerChunk", 0); - addFeature("logsPerChunk", 0); - addFeature("lavaSpoutsPerChunk", 0); - addFeature("cobwebsPerChunk", 0); - addFeature("cobwebNestsPerChunk", 0); - addFeature("wasteland1PerChunk", 0); - addFeature("wasteland2PerChunk", 0); - addFeature("wasteland3PerChunk", 0); - addFeature("wasteland4PerChunk", 0); - addFeature("wastelandRockPilesPerChunk", 0); - addFeature("smolderingGrassPerChunk", 0); - addFeature("sandSplatterPerChunk", 0); - addFeature("gravelSplatterPerChunk", 0); - addFeature("redSandSplatterPerChunk", 0); - addFeature("dirtSplatterPerChunk", 0); - addFeature("sandstoneSpikesPerChunk", 0); - addFeature("glowshroomsPerChunk", 0); - addFeature("bopBigMushroomsPerChunk", 0); - - //Ocean Features - addFeature("seaweedPerChunk", 0); - addFeature("coralPerChunk", 0); - addFeature("kelpPerChunk", 0); - addFeature("kelpThickPerChunk", 0); - addFeature("shortKelpPerChunk", 0); - - //Nether Features - addFeature("waspHivesPerChunk", 0); - addFeature("boneSpinesUpPerChunk", 0); - addFeature("boneSpinesDownPerChunk", 0); - addFeature("netherLavaLakesPerChunk", 0); - addFeature("netherVinesPerChunk", 0); - addFeature("netherrackSplatterPerChunk", 0); - addFeature("gravesPerChunk", 0); - - addFeature("bopFlowersPerChunk", 0); - addFeature("bopGrassPerChunk", 0); - } - - private void setFeature(String name, T value, boolean initialize) - { - if (!initialize) - { - if (!featureValueMap.containsKey(name)) throw new NoSuchFeatureException(name); - } - - featureValueMap.put(name, value); - } - - public void setFeature(String name, T value) - { - this.setFeature(name, value, false); - } - - protected void addFeature(String name, T value) - { - this.setFeature(name, value, true); - } - - public Object getFeature(String name) - { - return featureValueMap.get(name); - } - - public Set getFeatureNames() - { - return featureValueMap.keySet(); - } - - public class NoSuchFeatureException extends RuntimeException - { - public NoSuchFeatureException(String name) - { - super("Feature " + name + " does not exist!"); - } - } -} diff --git a/src/main/java/biomesoplenty/common/world/decoration/BiomeTweaker.java b/src/main/java/biomesoplenty/common/world/decoration/BiomeTweaker.java deleted file mode 100644 index 838ed4302..000000000 --- a/src/main/java/biomesoplenty/common/world/decoration/BiomeTweaker.java +++ /dev/null @@ -1,132 +0,0 @@ -package biomesoplenty.common.world.decoration; - -import java.util.HashMap; -import java.util.List; - -import net.minecraft.init.Blocks; -import net.minecraft.world.biome.BiomeGenBase; -import biomesoplenty.common.world.forceddecorators.nether.ForcedDecoratorHell; -import biomesoplenty.common.world.forceddecorators.overworld.BirchForestForcedDecorator; -import biomesoplenty.common.world.forceddecorators.overworld.DesertForcedDecorator; -import biomesoplenty.common.world.forceddecorators.overworld.ExtremeHillsForcedDecorator; -import biomesoplenty.common.world.forceddecorators.overworld.ForestForcedDecorator; -import biomesoplenty.common.world.forceddecorators.overworld.IcePlainsForcedDecorator; -import biomesoplenty.common.world.forceddecorators.overworld.JungleForcedDecorator; -import biomesoplenty.common.world.forceddecorators.overworld.MesaForcedDecorator; -import biomesoplenty.common.world.forceddecorators.overworld.MushroomIslandForcedDecorator; -import biomesoplenty.common.world.forceddecorators.overworld.OceanForcedDecorator; -import biomesoplenty.common.world.forceddecorators.overworld.PlainsForcedDecorator; -import biomesoplenty.common.world.forceddecorators.overworld.RiverForcedDecorator; -import biomesoplenty.common.world.forceddecorators.overworld.RoofedForestForcedDecorator; -import biomesoplenty.common.world.forceddecorators.overworld.SavannaForcedDecorator; -import biomesoplenty.common.world.forceddecorators.overworld.SwampForcedDecorator; -import biomesoplenty.common.world.forceddecorators.overworld.TaigaForcedDecorator; -import cpw.mods.fml.relauncher.ReflectionHelper; - -public class BiomeTweaker -{ - public static HashMap forcedDecoratorMap = new HashMap(); - - public static void init() - { - addForcedDecorators(); - tweakDecorationProperties(); - } - - private static void addForcedDecorators() - { - addForcedDecorator(BiomeGenBase.birchForest.biomeID, BirchForestForcedDecorator.class); - addForcedDecorator(BiomeGenBase.birchForestHills.biomeID, BirchForestForcedDecorator.class); - - addForcedDecorator(BiomeGenBase.desert.biomeID, DesertForcedDecorator.class); - addForcedDecorator(BiomeGenBase.desertHills.biomeID, DesertForcedDecorator.class); - - addForcedDecorator(BiomeGenBase.extremeHills.biomeID, ExtremeHillsForcedDecorator.class); - addForcedDecorator(BiomeGenBase.extremeHillsEdge.biomeID, ExtremeHillsForcedDecorator.class); - - addForcedDecorator(BiomeGenBase.forest.biomeID, ForestForcedDecorator.class); - addForcedDecorator(BiomeGenBase.forestHills.biomeID, ForestForcedDecorator.class); - - addForcedDecorator(BiomeGenBase.icePlains.biomeID, IcePlainsForcedDecorator.class); - - addForcedDecorator(BiomeGenBase.jungle.biomeID, JungleForcedDecorator.class); - addForcedDecorator(BiomeGenBase.jungleEdge.biomeID, JungleForcedDecorator.class); - addForcedDecorator(BiomeGenBase.jungleHills.biomeID, JungleForcedDecorator.class); - - addForcedDecorator(BiomeGenBase.mesa.biomeID, MesaForcedDecorator.class); - addForcedDecorator(BiomeGenBase.mesaPlateau.biomeID, MesaForcedDecorator.class); - addForcedDecorator(BiomeGenBase.mesaPlateau_F.biomeID, MesaForcedDecorator.class); - - addForcedDecorator(BiomeGenBase.mushroomIsland.biomeID, MushroomIslandForcedDecorator.class); - addForcedDecorator(BiomeGenBase.mushroomIslandShore.biomeID, MushroomIslandForcedDecorator.class); - - addForcedDecorator(BiomeGenBase.ocean.biomeID, OceanForcedDecorator.class); - addForcedDecorator(BiomeGenBase.plains.biomeID, PlainsForcedDecorator.class); - addForcedDecorator(BiomeGenBase.river.biomeID, RiverForcedDecorator.class); - addForcedDecorator(BiomeGenBase.roofedForest.biomeID, RoofedForestForcedDecorator.class); - - addForcedDecorator(BiomeGenBase.savanna.biomeID, SavannaForcedDecorator.class); - addForcedDecorator(BiomeGenBase.savannaPlateau.biomeID, SavannaForcedDecorator.class); - - addForcedDecorator(BiomeGenBase.swampland.biomeID, SwampForcedDecorator.class); - - addForcedDecorator(BiomeGenBase.taiga.biomeID, TaigaForcedDecorator.class); - addForcedDecorator(BiomeGenBase.taigaHills.biomeID, TaigaForcedDecorator.class); - addForcedDecorator(BiomeGenBase.coldTaiga.biomeID, TaigaForcedDecorator.class); - addForcedDecorator(BiomeGenBase.coldTaigaHills.biomeID, TaigaForcedDecorator.class); - - addForcedDecorator(BiomeGenBase.hell.biomeID, ForcedDecoratorHell.class); - } - - private static void tweakDecorationProperties() - { - BiomeGenBase.hell.topBlock = Blocks.netherrack; - BiomeGenBase.hell.fillerBlock = Blocks.netherrack; - - for (int i = 0; i < BiomeGenBase.getBiomeGenArray().length; i++) - { - BiomeGenBase biome = BiomeGenBase.getBiome(i); - - if (biome != null) - { - BOPWorldFeatures biomeFeatures = BOPDecorationManager.getBiomeFeatures(i); - - if (biomeFeatures != null) - { - List flowers = ReflectionHelper.getPrivateValue(BiomeGenBase.class, biome, "flowers"); - - flowers.clear(); - - biome.addDefaultFlowers(); - - biome.theBiomeDecorator.flowersPerChunk = 0; - biome.theBiomeDecorator.grassPerChunk = 0; - } - } - } - } - - public static void addForcedDecorator(int biomeID, Class decoratorClass) - { - try - { - ForcedDecorator decorator = decoratorClass.getConstructor(int.class).newInstance(biomeID); - - forcedDecoratorMap.put(biomeID, decorator); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - - public static IBOPBiome getForcedDecorator(int biomeID) - { - return forcedDecoratorMap.get(biomeID); - } - - public static boolean biomeHasForcedDecorator(int biomeID) - { - return forcedDecoratorMap.containsKey(biomeID); - } -} diff --git a/src/main/java/biomesoplenty/common/world/decoration/ForcedDecorator.java b/src/main/java/biomesoplenty/common/world/decoration/ForcedDecorator.java deleted file mode 100644 index c71d0701e..000000000 --- a/src/main/java/biomesoplenty/common/world/decoration/ForcedDecorator.java +++ /dev/null @@ -1,17 +0,0 @@ -package biomesoplenty.common.world.decoration; - -public class ForcedDecorator implements IBOPBiome -{ - protected BOPWorldFeatures bopWorldFeatures; - - public ForcedDecorator(int id) - { - bopWorldFeatures = BOPDecorationManager.getOrCreateBiomeFeatures(id); - } - - @Override - public BOPWorldFeatures getBiomeFeatures() - { - return bopWorldFeatures; - } -} diff --git a/src/main/java/biomesoplenty/common/world/decoration/IBOPBiome.java b/src/main/java/biomesoplenty/common/world/decoration/IBOPBiome.java deleted file mode 100644 index 573d603b4..000000000 --- a/src/main/java/biomesoplenty/common/world/decoration/IBOPBiome.java +++ /dev/null @@ -1,6 +0,0 @@ -package biomesoplenty.common.world.decoration; - -public interface IBOPBiome -{ - public BOPWorldFeatures getBiomeFeatures(); -} diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPBigMushroom.java b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPBigMushroom.java index eddd2fa01..0242b7ca3 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPBigMushroom.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPBigMushroom.java @@ -7,8 +7,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import biomesoplenty.common.world.decoration.BOPDecorationManager; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenBOPBigMushroom extends WorldGeneratorBOP @@ -216,9 +215,9 @@ public class WorldGenBOPBigMushroom extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPBlob.java b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPBlob.java index 9041103e6..8220226c1 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPBlob.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPBlob.java @@ -5,8 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import biomesoplenty.common.world.decoration.BOPDecorationManager; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenBOPBlob extends WorldGeneratorBOP @@ -87,9 +86,9 @@ public class WorldGenBOPBlob extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPCoral.java b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPCoral.java index 518f2e3db..aa7f545fc 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPCoral.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPCoral.java @@ -6,8 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import biomesoplenty.common.world.decoration.BOPDecorationManager; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenBOPCoral extends WorldGeneratorBOP @@ -56,9 +55,9 @@ public class WorldGenBOPCoral extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPDoubleFlora.java b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPDoubleFlora.java index 3ee40d576..497a334c3 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPDoubleFlora.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPDoubleFlora.java @@ -6,8 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import biomesoplenty.common.world.decoration.BOPDecorationManager; +import biomesoplenty.api.biome.BOPBiome; public class WorldGenBOPDoubleFlora extends WorldGenBOPFlora { @@ -84,9 +83,9 @@ public class WorldGenBOPDoubleFlora extends WorldGenBOPFlora } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPFlora.java b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPFlora.java index 613f04637..55eb5d605 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPFlora.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPFlora.java @@ -6,9 +6,8 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.BOPDecorationManager; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenBOPFlora extends WorldGeneratorBOP @@ -53,9 +52,9 @@ public class WorldGenBOPFlora extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPTallGrass.java b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPTallGrass.java index 167650984..7cd578057 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPTallGrass.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPTallGrass.java @@ -3,10 +3,10 @@ package biomesoplenty.common.world.features; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import biomesoplenty.common.world.decoration.BOPDecorationManager; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenBOPTallGrass extends WorldGeneratorBOP @@ -27,12 +27,12 @@ public class WorldGenBOPTallGrass extends WorldGeneratorBOP do { - block = world.getBlock(x, y, z); - if (!(block.isLeaves(world, x, y, z) || block.isAir(world, x, y, z))) - { - break; - } - --y; + block = world.getBlock(x, y, z); + if (!(block.isLeaves(world, x, y, z) || block.isAir(world, x, y, z))) + { + break; + } + --y; } while (y > 0); for (int l = 0; l < 128; ++l) @@ -51,13 +51,13 @@ public class WorldGenBOPTallGrass extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; - int randY = random.nextInt(world.getHeightValue(randX, randZ) * 2); + int randY = world.provider.isHellWorld ? random.nextInt(128) : random.nextInt(world.getHeightValue(randX, randZ) * 2); this.generate(world, random, randX, randY, randZ); } diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPUndergroundDecoration.java b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPUndergroundDecoration.java index 166b500f1..445f6a2f7 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPUndergroundDecoration.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPUndergroundDecoration.java @@ -5,8 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import biomesoplenty.common.world.decoration.BOPDecorationManager; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenBOPUndergroundDecoration extends WorldGeneratorBOP @@ -51,9 +50,9 @@ public class WorldGenBOPUndergroundDecoration extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenCobwebNest.java b/src/main/java/biomesoplenty/common/world/features/WorldGenCobwebNest.java index 873efbaee..6dfd653ea 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenCobwebNest.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenCobwebNest.java @@ -6,8 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.entity.monster.EntitySpider; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import biomesoplenty.common.world.decoration.BOPDecorationManager; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenCobwebNest extends WorldGeneratorBOP @@ -65,9 +64,9 @@ public class WorldGenCobwebNest extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenGrassSplatter.java b/src/main/java/biomesoplenty/common/world/features/WorldGenGrassSplatter.java index 7967270af..6d133bbde 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenGrassSplatter.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenGrassSplatter.java @@ -5,9 +5,8 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.BOPDecorationManager; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenGrassSplatter extends WorldGeneratorBOP @@ -63,9 +62,9 @@ public class WorldGenGrassSplatter extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenKelp.java b/src/main/java/biomesoplenty/common/world/features/WorldGenKelp.java index 117ae56bd..f2bf22b89 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenKelp.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenKelp.java @@ -4,10 +4,9 @@ import java.util.Random; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.content.BOPCBlocks; import biomesoplenty.common.blocks.BlockBOPCoral; -import biomesoplenty.common.world.decoration.BOPDecorationManager; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenKelp extends WorldGeneratorBOP @@ -62,11 +61,11 @@ public class WorldGenKelp extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { if (featureName == "kelpPerChunk") { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16); int randZ = z + random.nextInt(16); @@ -77,7 +76,7 @@ public class WorldGenKelp extends WorldGeneratorBOP } else if (featureName == "kelpThickPerChunk") { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(8); int randZ = z + random.nextInt(8); @@ -88,7 +87,7 @@ public class WorldGenKelp extends WorldGeneratorBOP } else if (featureName == "shortKelpPerChunk") { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16); int randZ = z + random.nextInt(16); diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenLavaSpout.java b/src/main/java/biomesoplenty/common/world/features/WorldGenLavaSpout.java index 05cee1c25..af1fea44a 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenLavaSpout.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenLavaSpout.java @@ -5,9 +5,8 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.BOPDecorationManager; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenLavaSpout extends WorldGeneratorBOP @@ -55,9 +54,9 @@ public class WorldGenLavaSpout extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenLog.java b/src/main/java/biomesoplenty/common/world/features/WorldGenLog.java index 88035cc8a..f3b2c89e3 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenLog.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenLog.java @@ -4,8 +4,7 @@ import java.util.Random; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import biomesoplenty.common.world.decoration.BOPDecorationManager; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenLog extends WorldGeneratorBOP @@ -54,9 +53,9 @@ public class WorldGenLog extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenLongVine.java b/src/main/java/biomesoplenty/common/world/features/WorldGenLongVine.java index c87c9fd11..45fab33b1 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenLongVine.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenLongVine.java @@ -5,8 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import biomesoplenty.common.world.decoration.BOPDecorationManager; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenLongVine extends WorldGeneratorBOP @@ -61,9 +60,9 @@ public class WorldGenLongVine extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenMoss.java b/src/main/java/biomesoplenty/common/world/features/WorldGenMoss.java index 988c8c2e0..f4f45d533 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenMoss.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenMoss.java @@ -5,9 +5,8 @@ import java.util.Random; import net.minecraft.util.Direction; import net.minecraft.util.Facing; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.BOPDecorationManager; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenMoss extends WorldGeneratorBOP @@ -49,9 +48,9 @@ public class WorldGenMoss extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenOvergrownNetherrack.java b/src/main/java/biomesoplenty/common/world/features/WorldGenOvergrownNetherrack.java index 3e429edea..72da16a00 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenOvergrownNetherrack.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenOvergrownNetherrack.java @@ -5,9 +5,8 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.BOPDecorationManager; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenOvergrownNetherrack extends WorldGeneratorBOP @@ -63,9 +62,9 @@ public class WorldGenOvergrownNetherrack extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenRiverCane.java b/src/main/java/biomesoplenty/common/world/features/WorldGenRiverCane.java index 632eba2bf..5023e085d 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenRiverCane.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenRiverCane.java @@ -4,9 +4,8 @@ import java.util.Random; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.BOPDecorationManager; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenRiverCane extends WorldGeneratorBOP @@ -41,9 +40,9 @@ public class WorldGenRiverCane extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenRockpile.java b/src/main/java/biomesoplenty/common/world/features/WorldGenRockpile.java index 26802c2e4..4a4be92b1 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenRockpile.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenRockpile.java @@ -4,8 +4,7 @@ import java.util.Random; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import biomesoplenty.common.world.decoration.BOPDecorationManager; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenRockpile extends WorldGeneratorBOP @@ -82,9 +81,9 @@ public class WorldGenRockpile extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenSandstoneSpike.java b/src/main/java/biomesoplenty/common/world/features/WorldGenSandstoneSpike.java index 288b39149..58d5df36f 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenSandstoneSpike.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenSandstoneSpike.java @@ -7,8 +7,7 @@ import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import biomesoplenty.common.world.decoration.BOPDecorationManager; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenSandstoneSpike extends WorldGeneratorBOP @@ -131,9 +130,9 @@ public class WorldGenSandstoneSpike extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenSplatter.java b/src/main/java/biomesoplenty/common/world/features/WorldGenSplatter.java index fbd258c5f..6cc6e42fc 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenSplatter.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenSplatter.java @@ -6,8 +6,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import biomesoplenty.common.world.decoration.BOPDecorationManager; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenSplatter extends WorldGeneratorBOP @@ -60,9 +59,9 @@ public class WorldGenSplatter extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randY = random.nextInt(256); diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenSplotches.java b/src/main/java/biomesoplenty/common/world/features/WorldGenSplotches.java index 1c4c69bc6..27b521d63 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenSplotches.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenSplotches.java @@ -8,8 +8,7 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import biomesoplenty.common.world.decoration.BOPDecorationManager; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenSplotches extends WorldGeneratorBOP @@ -91,9 +90,9 @@ public class WorldGenSplotches extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - if (featureName.equals("generateQuicksand") && (Boolean)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature("generateQuicksand")) + if (featureName.equals("generateQuicksand") && (Boolean)biome.theBiomeDecorator.bopFeatures.getFeature("generateQuicksand")) { for (int i = 0; i < 5; ++i) { @@ -104,7 +103,7 @@ public class WorldGenSplotches extends WorldGeneratorBOP this.generate(world, random, randX, randY, randZ); } } - else if (featureName.equals("generateCanyon") && (Boolean)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature("generateCanyon")) + else if (featureName.equals("generateCanyon") && (Boolean)biome.theBiomeDecorator.bopFeatures.getFeature("generateCanyon")) { for (int i = 0; i < 15; ++i) { @@ -115,7 +114,7 @@ public class WorldGenSplotches extends WorldGeneratorBOP this.generate(world, random, randX, randY, randZ); } } - else if (featureName.equals("generateStoneInGrass") && (Boolean)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature("generateStoneInGrass")) + else if (featureName.equals("generateStoneInGrass") && (Boolean)biome.theBiomeDecorator.bopFeatures.getFeature("generateStoneInGrass")) { for (int i = 0; i < 15; ++i) { @@ -126,7 +125,7 @@ public class WorldGenSplotches extends WorldGeneratorBOP this.generate(world, random, randX, randY, randZ); } } - else if (featureName.equals("generateStoneInGrass2") && (Boolean)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature("generateStoneInGrass2")) + else if (featureName.equals("generateStoneInGrass2") && (Boolean)biome.theBiomeDecorator.bopFeatures.getFeature("generateStoneInGrass2")) { for (int i = 0; i < 20; ++i) { @@ -137,7 +136,7 @@ public class WorldGenSplotches extends WorldGeneratorBOP this.generate(world, random, randX, randY, randZ); } } - else if (featureName.equals("generateGrass") && (Boolean)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature("generateGrass")) + else if (featureName.equals("generateGrass") && (Boolean)biome.theBiomeDecorator.bopFeatures.getFeature("generateGrass")) { for (int i = 0; i < 15; ++i) { @@ -148,7 +147,7 @@ public class WorldGenSplotches extends WorldGeneratorBOP this.generate(world, random, randX, randY, randZ); } } - else if (featureName.equals("generateSand") && (Boolean)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature("generateSand")) + else if (featureName.equals("generateSand") && (Boolean)biome.theBiomeDecorator.bopFeatures.getFeature("generateSand")) { for (int i = 0; i < 15; ++i) { @@ -159,7 +158,7 @@ public class WorldGenSplotches extends WorldGeneratorBOP this.generate(world, random, randX, randY, randZ); } } - else if (featureName.equals("generateQuagmire") && (Boolean)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature("generateQuagmire")) + else if (featureName.equals("generateQuagmire") && (Boolean)biome.theBiomeDecorator.bopFeatures.getFeature("generateQuagmire")) { for (int i = 0; i < 15; ++i) { @@ -170,7 +169,7 @@ public class WorldGenSplotches extends WorldGeneratorBOP this.generate(world, random, randX, randY, randZ); } } - else if (featureName.equals("generateAsh") && (Boolean)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature("generateAsh")) + else if (featureName.equals("generateAsh") && (Boolean)biome.theBiomeDecorator.bopFeatures.getFeature("generateAsh")) { for (int i = 0; i < 10; ++i) { @@ -181,7 +180,7 @@ public class WorldGenSplotches extends WorldGeneratorBOP this.generate(world, random, randX, randY, randZ); } } - else if (featureName.equals("generateMycelium") && (Boolean)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature("generateMycelium")) + else if (featureName.equals("generateMycelium") && (Boolean)biome.theBiomeDecorator.bopFeatures.getFeature("generateMycelium")) { for (int i = 0; i < 10; ++i) { @@ -192,7 +191,7 @@ public class WorldGenSplotches extends WorldGeneratorBOP this.generate(world, random, randX, randY, randZ); } } - else if (featureName.equals("generateSponge") && (Boolean)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature("generateSponge")) + else if (featureName.equals("generateSponge") && (Boolean)biome.theBiomeDecorator.bopFeatures.getFeature("generateSponge")) { for (int i = 0; i < 5; ++i) { diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland.java b/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland.java index f13466cc7..08ee255f9 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland.java @@ -4,9 +4,8 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.BOPDecorationManager; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenWasteland extends WorldGeneratorBOP @@ -135,9 +134,9 @@ public class WorldGenWasteland extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland2.java b/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland2.java index 1884ae4aa..9b94c1468 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland2.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland2.java @@ -4,9 +4,8 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.BOPDecorationManager; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenWasteland2 extends WorldGeneratorBOP @@ -178,9 +177,9 @@ public class WorldGenWasteland2 extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland3.java b/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland3.java index 7df0ad952..965f61f47 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland3.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland3.java @@ -4,9 +4,8 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.BOPDecorationManager; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenWasteland3 extends WorldGeneratorBOP @@ -71,9 +70,9 @@ public class WorldGenWasteland3 extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland4.java b/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland4.java index 6237f21e9..b98cea562 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland4.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland4.java @@ -5,9 +5,8 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.BOPDecorationManager; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenWasteland4 extends WorldGeneratorBOP @@ -67,9 +66,9 @@ public class WorldGenWasteland4 extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenWaterReeds.java b/src/main/java/biomesoplenty/common/world/features/WorldGenWaterReeds.java index be1b4c58f..0cff93ecc 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenWaterReeds.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenWaterReeds.java @@ -5,9 +5,8 @@ import java.util.Random; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.BOPDecorationManager; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenWaterReeds extends WorldGeneratorBOP @@ -40,9 +39,9 @@ public class WorldGenWaterReeds extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenWaterside.java b/src/main/java/biomesoplenty/common/world/features/WorldGenWaterside.java index 021de423d..efb912a4f 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenWaterside.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenWaterside.java @@ -7,8 +7,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import biomesoplenty.common.world.decoration.BOPDecorationManager; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenWaterside extends WorldGeneratorBOP @@ -67,9 +66,9 @@ public class WorldGenWaterside extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/features/managers/WorldGenBOPFlowerManager.java b/src/main/java/biomesoplenty/common/world/features/managers/WorldGenBOPFlowerManager.java index 80d68a0d0..d284bec91 100644 --- a/src/main/java/biomesoplenty/common/world/features/managers/WorldGenBOPFlowerManager.java +++ b/src/main/java/biomesoplenty/common/world/features/managers/WorldGenBOPFlowerManager.java @@ -1,17 +1,17 @@ package biomesoplenty.common.world.features.managers; -import biomesoplenty.common.world.decoration.BOPDecorationManager; -import biomesoplenty.common.world.decoration.BOPWorldFeatures; -import biomesoplenty.common.world.features.WorldGenBOPFlora; -import biomesoplenty.common.world.generation.WorldGeneratorBOP; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; - import java.util.Random; +import net.minecraft.world.World; +import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.biome.BOPBiomeDecorator; +import biomesoplenty.api.biome.BiomeFeatures; +import biomesoplenty.common.world.features.WorldGenBOPFlora; +import biomesoplenty.common.world.generation.WorldGeneratorBOP; + public class WorldGenBOPFlowerManager extends WorldGeneratorBOP { - private BOPWorldFeatures biomeFeatures; + private BiomeFeatures biomeFeatures; @Override public boolean generate(World world, Random random, int x, int y, int z) @@ -20,7 +20,7 @@ public class WorldGenBOPFlowerManager extends WorldGeneratorBOP { if (biomeFeatures.weightedFlowerGen != null && !biomeFeatures.weightedFlowerGen.isEmpty()) { - WorldGenBOPFlora flowerGenerator = BOPDecorationManager.getRandomWeightedWorldGenerator(biomeFeatures.weightedFlowerGen); + WorldGenBOPFlora flowerGenerator = (WorldGenBOPFlora)BOPBiomeDecorator.getRandomWeightedWorldGenerator(biomeFeatures.weightedFlowerGen); return flowerGenerator.generate(world, random, x, y, z); } @@ -30,15 +30,15 @@ public class WorldGenBOPFlowerManager extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - this.biomeFeatures = BOPDecorationManager.getBiomeFeatures(biome.biomeID); + this.biomeFeatures = biome.theBiomeDecorator.bopFeatures; for (int i = 0; i < (Integer)biomeFeatures.getFeature(featureName); ++i) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; - int randY = random.nextInt(world.getHeightValue(randX, randZ) + 32); + int randY = world.provider.isHellWorld ? random.nextInt(128) : random.nextInt(world.getHeightValue(randX, randZ) + 32); this.generate(world, random, randX, randY, randZ); } diff --git a/src/main/java/biomesoplenty/common/world/features/managers/WorldGenBOPGrassManager.java b/src/main/java/biomesoplenty/common/world/features/managers/WorldGenBOPGrassManager.java index 440cea2df..e910ff434 100644 --- a/src/main/java/biomesoplenty/common/world/features/managers/WorldGenBOPGrassManager.java +++ b/src/main/java/biomesoplenty/common/world/features/managers/WorldGenBOPGrassManager.java @@ -1,17 +1,18 @@ package biomesoplenty.common.world.features.managers; -import biomesoplenty.common.world.decoration.BOPDecorationManager; -import biomesoplenty.common.world.decoration.BOPWorldFeatures; -import biomesoplenty.common.world.generation.WorldGeneratorBOP; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.gen.feature.WorldGenerator; - import java.util.Random; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; +import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.biome.BOPBiomeDecorator; +import biomesoplenty.api.biome.BiomeFeatures; +import biomesoplenty.common.world.features.WorldGenBOPFlora; +import biomesoplenty.common.world.generation.WorldGeneratorBOP; + public class WorldGenBOPGrassManager extends WorldGeneratorBOP { - private BOPWorldFeatures biomeFeatures; + private BiomeFeatures biomeFeatures; @Override public boolean generate(World world, Random random, int x, int y, int z) @@ -20,7 +21,7 @@ public class WorldGenBOPGrassManager extends WorldGeneratorBOP { if (biomeFeatures.weightedGrassGen != null && !biomeFeatures.weightedGrassGen.isEmpty()) { - WorldGenerator grassGenerator = BOPDecorationManager.getRandomWeightedWorldGenerator(biomeFeatures.weightedGrassGen); + WorldGenerator grassGenerator = BOPBiomeDecorator.getRandomWeightedWorldGenerator(biomeFeatures.weightedGrassGen); return grassGenerator.generate(world, random, x, y, z); } @@ -30,15 +31,15 @@ public class WorldGenBOPGrassManager extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - this.biomeFeatures = BOPDecorationManager.getBiomeFeatures(biome.biomeID); + this.biomeFeatures = biome.theBiomeDecorator.bopFeatures; for (int i = 0; i < (Integer)biomeFeatures.getFeature(featureName); ++i) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; - int randY = random.nextInt(256); + int randY = world.provider.isHellWorld ? random.nextInt(128) : random.nextInt(256); this.generate(world, random, randX, randY, randZ); } diff --git a/src/main/java/biomesoplenty/common/world/features/nether/WorldGenBoneSpine.java b/src/main/java/biomesoplenty/common/world/features/nether/WorldGenBoneSpine.java index 5aa4f4581..90c03a471 100644 --- a/src/main/java/biomesoplenty/common/world/features/nether/WorldGenBoneSpine.java +++ b/src/main/java/biomesoplenty/common/world/features/nether/WorldGenBoneSpine.java @@ -4,9 +4,8 @@ import java.util.Random; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.BOPDecorationManager; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenBoneSpine extends WorldGeneratorBOP @@ -80,9 +79,9 @@ public class WorldGenBoneSpine extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/features/nether/WorldGenGrave.java b/src/main/java/biomesoplenty/common/world/features/nether/WorldGenGrave.java index 56823755e..a69cb1b80 100644 --- a/src/main/java/biomesoplenty/common/world/features/nether/WorldGenGrave.java +++ b/src/main/java/biomesoplenty/common/world/features/nether/WorldGenGrave.java @@ -5,9 +5,8 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.BOPDecorationManager; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenGrave extends WorldGeneratorBOP @@ -55,9 +54,9 @@ public class WorldGenGrave extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/features/nether/WorldGenLakesNether.java b/src/main/java/biomesoplenty/common/world/features/nether/WorldGenLakesNether.java index 9b6e4de28..6755f7604 100644 --- a/src/main/java/biomesoplenty/common/world/features/nether/WorldGenLakesNether.java +++ b/src/main/java/biomesoplenty/common/world/features/nether/WorldGenLakesNether.java @@ -5,8 +5,7 @@ import java.util.Random; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import biomesoplenty.common.world.decoration.BOPDecorationManager; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenLakesNether extends WorldGeneratorBOP @@ -125,9 +124,9 @@ public class WorldGenLakesNether extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { int randX = x + random.nextInt(16) + 8; int randY = random.nextInt(random.nextInt(random.nextInt(112) + 8) + 8); diff --git a/src/main/java/biomesoplenty/common/world/features/nether/WorldGenWaspHive.java b/src/main/java/biomesoplenty/common/world/features/nether/WorldGenWaspHive.java index c4a2b11a6..c1f32b3d9 100644 --- a/src/main/java/biomesoplenty/common/world/features/nether/WorldGenWaspHive.java +++ b/src/main/java/biomesoplenty/common/world/features/nether/WorldGenWaspHive.java @@ -5,10 +5,8 @@ import java.util.Random; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntityMobSpawner; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import biomesoplenty.api.BOPBlockHelper; +import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.BOPDecorationManager; import biomesoplenty.common.world.generation.WorldGeneratorBOP; public class WorldGenWaspHive extends WorldGeneratorBOP @@ -84,9 +82,9 @@ public class WorldGenWaspHive extends WorldGeneratorBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); ++i) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); ++i) { int j = random.nextInt(4); diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenMiniShrub.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenMiniShrub.java index e7924994c..1bed8db9f 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenMiniShrub.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenMiniShrub.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; @@ -34,12 +35,17 @@ public class WorldGenMiniShrub extends WorldGenAbstractTree @Override public boolean generate(World world, Random random, int x, int y, int z) { - while (world.isAirBlock(x, y, z) && y > 2) - { - --y; - } + Block block; - Block block = world.getBlock(x, y, z); + do + { + block = world.getBlock(x, y, z); + if (!(block == Blocks.netherrack || block == Blocks.bedrock || block.isAir(world, x, y, z))) + { + break; + } + --y; + } while (y > 0); if (!soilBlocks.contains(block)) { @@ -47,14 +53,14 @@ public class WorldGenMiniShrub extends WorldGenAbstractTree } else { - for (int var7 = -2; var7 <= 2; ++var7) + /*for (int var7 = -2; var7 <= 2; ++var7) { for (int var8 = -2; var8 <= 2; ++var8) { - if (world.isAirBlock(x + var7, y - 1, z + var8) && world.isAirBlock(x + var7, y - 2, z + var8)) + if (world.isAirBlock(x + var7, y + 1, z + var8) && world.isAirBlock(x + var7, y + 2, z + var8)) return false; } - } + }*/ world.getBlock(x, y, z).onPlantGrow(world, x, y, z, x, y, z); diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/nether/ForcedDecoratorHell.java b/src/main/java/biomesoplenty/common/world/forceddecorators/nether/ForcedDecoratorHell.java deleted file mode 100644 index c5e294fe5..000000000 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/nether/ForcedDecoratorHell.java +++ /dev/null @@ -1,20 +0,0 @@ -package biomesoplenty.common.world.forceddecorators.nether; - -import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.ForcedDecorator; -import biomesoplenty.common.world.features.WorldGenBOPFlora; - -public class ForcedDecoratorHell extends ForcedDecorator -{ - public ForcedDecoratorHell(int id) - { - super(id); - - this.bopWorldFeatures.setFeature("gravesPerChunk", 1); - this.bopWorldFeatures.setFeature("waspHivesPerChunk", 1); - - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 4); - - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers2, 2), 10); - } -} diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/BirchForestForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/BirchForestForcedDecorator.java deleted file mode 100644 index 9c50b21b7..000000000 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/BirchForestForcedDecorator.java +++ /dev/null @@ -1,30 +0,0 @@ -package biomesoplenty.common.world.forceddecorators.overworld; - -import net.minecraft.init.Blocks; -import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.ForcedDecorator; -import biomesoplenty.common.world.features.WorldGenBOPFlora; -import biomesoplenty.common.world.features.WorldGenBOPTallGrass; - -public class BirchForestForcedDecorator extends ForcedDecorator -{ - public BirchForestForcedDecorator(int id) - { - super(id); - - this.bopWorldFeatures.setFeature("poisonIvyPerChunk", 3); - this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 15); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 4); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 2); - - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5); - - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 0), 10); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 1), 15); - - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.25D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.25D); - } -} diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/DesertForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/DesertForcedDecorator.java deleted file mode 100644 index 815bc92c1..000000000 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/DesertForcedDecorator.java +++ /dev/null @@ -1,14 +0,0 @@ -package biomesoplenty.common.world.forceddecorators.overworld; - -import biomesoplenty.common.world.decoration.ForcedDecorator; - -public class DesertForcedDecorator extends ForcedDecorator -{ - public DesertForcedDecorator(int id) - { - super(id); - - this.bopWorldFeatures.setFeature("tinyCactiPerChunk", 10); - this.bopWorldFeatures.setFeature("generateQuicksand", true); - } -} diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/ExtremeHillsForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/ExtremeHillsForcedDecorator.java deleted file mode 100644 index b634381c3..000000000 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/ExtremeHillsForcedDecorator.java +++ /dev/null @@ -1,29 +0,0 @@ -package biomesoplenty.common.world.forceddecorators.overworld; - -import net.minecraft.init.Blocks; -import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.ForcedDecorator; -import biomesoplenty.common.world.features.WorldGenBOPFlora; -import biomesoplenty.common.world.features.WorldGenBOPTallGrass; - -public class ExtremeHillsForcedDecorator extends ForcedDecorator -{ - public ExtremeHillsForcedDecorator(int id) - { - super(id); - - this.bopWorldFeatures.setFeature("shrubsPerChunk", 1); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 3); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 1); - - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 3); - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5); - - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 8); - - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - } -} diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/ForestForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/ForestForcedDecorator.java deleted file mode 100644 index acda4cc97..000000000 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/ForestForcedDecorator.java +++ /dev/null @@ -1,37 +0,0 @@ -package biomesoplenty.common.world.forceddecorators.overworld; - -import net.minecraft.init.Blocks; -import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.ForcedDecorator; -import biomesoplenty.common.world.features.WorldGenBOPFlora; -import biomesoplenty.common.world.features.WorldGenBOPTallGrass; - -public class ForestForcedDecorator extends ForcedDecorator -{ - public ForestForcedDecorator(int id) - { - super(id); - - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 15); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5); - this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 5); - this.bopWorldFeatures.setFeature("riverCanePerChunk", 5); - this.bopWorldFeatures.setFeature("shrubsPerChunk", 2); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 6); - this.bopWorldFeatures.setFeature("poisonIvyPerChunk", 1); - this.bopWorldFeatures.setFeature("bushesPerChunk", 2); - this.bopWorldFeatures.setFeature("berryBushesPerChunk", 1); - this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 2); - - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 5); - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5); - - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8); - - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - } -} diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/IcePlainsForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/IcePlainsForcedDecorator.java deleted file mode 100644 index 5dfd3c2a8..000000000 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/IcePlainsForcedDecorator.java +++ /dev/null @@ -1,18 +0,0 @@ -package biomesoplenty.common.world.forceddecorators.overworld; - -import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.ForcedDecorator; -import biomesoplenty.common.world.features.WorldGenBOPFlora; - -public class IcePlainsForcedDecorator extends ForcedDecorator -{ - public IcePlainsForcedDecorator(int id) - { - super(id); - - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 1); - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5); - - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 8); - } -} diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/JungleForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/JungleForcedDecorator.java deleted file mode 100644 index 4c64bb0e9..000000000 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/JungleForcedDecorator.java +++ /dev/null @@ -1,31 +0,0 @@ -package biomesoplenty.common.world.forceddecorators.overworld; - -import net.minecraft.init.Blocks; -import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.ForcedDecorator; -import biomesoplenty.common.world.features.WorldGenBOPFlora; -import biomesoplenty.common.world.features.WorldGenBOPTallGrass; - -public class JungleForcedDecorator extends ForcedDecorator -{ - public JungleForcedDecorator(int id) - { - super(id); - - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10); - this.bopWorldFeatures.setFeature("seaweedPerChunk", 15); - this.bopWorldFeatures.setFeature("poisonIvyPerChunk", 1); - - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 10); - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5); - - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 5), 12); - - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - } -} diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/MesaForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/MesaForcedDecorator.java deleted file mode 100644 index f356ab445..000000000 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/MesaForcedDecorator.java +++ /dev/null @@ -1,22 +0,0 @@ -package biomesoplenty.common.world.forceddecorators.overworld; - -import net.minecraft.init.Blocks; -import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.ForcedDecorator; -import biomesoplenty.common.world.features.WorldGenBOPTallGrass; - -public class MesaForcedDecorator extends ForcedDecorator -{ - public MesaForcedDecorator(int id) - { - super(id); - - this.bopWorldFeatures.setFeature("tinyCactiPerChunk", 10); - this.bopWorldFeatures.setFeature("bromeliadsPerChunk", 10); - - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5); - - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.plants, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - } -} diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/MushroomIslandForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/MushroomIslandForcedDecorator.java deleted file mode 100644 index 81a3fc512..000000000 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/MushroomIslandForcedDecorator.java +++ /dev/null @@ -1,15 +0,0 @@ -package biomesoplenty.common.world.forceddecorators.overworld; - -import biomesoplenty.common.world.decoration.ForcedDecorator; - -public class MushroomIslandForcedDecorator extends ForcedDecorator -{ - public MushroomIslandForcedDecorator(int id) - { - super(id); - - this.bopWorldFeatures.setFeature("blueMilksPerChunk", 2); - this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 8); - this.bopWorldFeatures.setFeature("portobellosPerChunk", 6); - } -} diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/OceanForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/OceanForcedDecorator.java deleted file mode 100644 index d1e2626d2..000000000 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/OceanForcedDecorator.java +++ /dev/null @@ -1,13 +0,0 @@ -package biomesoplenty.common.world.forceddecorators.overworld; - -import biomesoplenty.common.world.decoration.ForcedDecorator; - -public class OceanForcedDecorator extends ForcedDecorator -{ - public OceanForcedDecorator(int id) - { - super(id); - - this.bopWorldFeatures.setFeature("seaweedPerChunk", 20); - } -} diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/PlainsForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/PlainsForcedDecorator.java deleted file mode 100644 index dd29842c6..000000000 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/PlainsForcedDecorator.java +++ /dev/null @@ -1,27 +0,0 @@ -package biomesoplenty.common.world.forceddecorators.overworld; - -import net.minecraft.init.Blocks; -import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.ForcedDecorator; -import biomesoplenty.common.world.features.WorldGenBOPFlora; -import biomesoplenty.common.world.features.WorldGenBOPTallGrass; - -public class PlainsForcedDecorator extends ForcedDecorator -{ - public PlainsForcedDecorator(int id) - { - super(id); - - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 8); - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5); - - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 0), 10); - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 5); - - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - } -} diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/RiverForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/RiverForcedDecorator.java deleted file mode 100644 index cc38971fd..000000000 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/RiverForcedDecorator.java +++ /dev/null @@ -1,15 +0,0 @@ -package biomesoplenty.common.world.forceddecorators.overworld; - -import biomesoplenty.common.world.decoration.ForcedDecorator; - -public class RiverForcedDecorator extends ForcedDecorator -{ - public RiverForcedDecorator(int id) - { - super(id); - - this.bopWorldFeatures.setFeature("seaweedPerChunk", 5); - this.bopWorldFeatures.setFeature("riverCanePerChunk", 10); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4); - } -} diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/RoofedForestForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/RoofedForestForcedDecorator.java deleted file mode 100644 index 02203a79a..000000000 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/RoofedForestForcedDecorator.java +++ /dev/null @@ -1,29 +0,0 @@ -package biomesoplenty.common.world.forceddecorators.overworld; - -import net.minecraft.init.Blocks; -import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.ForcedDecorator; -import biomesoplenty.common.world.features.WorldGenBOPTallGrass; - -public class RoofedForestForcedDecorator extends ForcedDecorator -{ - public RoofedForestForcedDecorator(int id) - { - super(id); - - this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 1); - this.bopWorldFeatures.setFeature("blueMilksPerChunk", 1); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 8); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 4); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2); - - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5); - - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.25D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.25D); - } -} diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/SavannaForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/SavannaForcedDecorator.java deleted file mode 100644 index 33f5e1653..000000000 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/SavannaForcedDecorator.java +++ /dev/null @@ -1,30 +0,0 @@ -package biomesoplenty.common.world.forceddecorators.overworld; - -import net.minecraft.init.Blocks; -import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.ForcedDecorator; -import biomesoplenty.common.world.features.WorldGenBOPFlora; -import biomesoplenty.common.world.features.WorldGenBOPTallGrass; - -public class SavannaForcedDecorator extends ForcedDecorator -{ - public SavannaForcedDecorator(int id) - { - super(id); - - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5); - this.bopWorldFeatures.setFeature("bushesPerChunk", 3); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 5); - - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 10); - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 20); - - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 7), 8); - - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - } -} diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/SwampForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/SwampForcedDecorator.java deleted file mode 100644 index f3ef4f8b7..000000000 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/SwampForcedDecorator.java +++ /dev/null @@ -1,37 +0,0 @@ -package biomesoplenty.common.world.forceddecorators.overworld; - -import net.minecraft.init.Blocks; -import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.ForcedDecorator; -import biomesoplenty.common.world.features.WorldGenBOPFlora; -import biomesoplenty.common.world.features.WorldGenBOPTallGrass; - -public class SwampForcedDecorator extends ForcedDecorator -{ - public SwampForcedDecorator(int id) - { - super(id); - - this.bopWorldFeatures.setFeature("mudPerChunk", 3); - this.bopWorldFeatures.setFeature("seaweedPerChunk", 10); - this.bopWorldFeatures.setFeature("cattailsPerChunk", 10); - this.bopWorldFeatures.setFeature("highCattailsPerChunk", 5); - this.bopWorldFeatures.setFeature("algaePerChunk", 3); - this.bopWorldFeatures.setFeature("koruPerChunk", 25); - this.bopWorldFeatures.setFeature("waterReedsPerChunk", 5); - this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 1); - this.bopWorldFeatures.setFeature("blueMilksPerChunk", 1); - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 2); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 4); - - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5); - - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 1), 15); - - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); - this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - } -} diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/TaigaForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/TaigaForcedDecorator.java deleted file mode 100644 index acba7ffd1..000000000 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/overworld/TaigaForcedDecorator.java +++ /dev/null @@ -1,21 +0,0 @@ -package biomesoplenty.common.world.forceddecorators.overworld; - -import biomesoplenty.api.content.BOPCBlocks; -import biomesoplenty.common.world.decoration.ForcedDecorator; -import biomesoplenty.common.world.features.WorldGenBOPFlora; - -public class TaigaForcedDecorator extends ForcedDecorator -{ - public TaigaForcedDecorator(int id) - { - super(id); - - this.bopWorldFeatures.setFeature("leafPilesPerChunk", 2); - this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 4); - - this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 2); - this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5); - - this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 8); - } -} diff --git a/src/main/java/biomesoplenty/common/world/forcedgenerators/LakesForcedGenerator.java b/src/main/java/biomesoplenty/common/world/forcedgenerators/LakesForcedGenerator.java index 743c6dcbb..55ff49298 100644 --- a/src/main/java/biomesoplenty/common/world/forcedgenerators/LakesForcedGenerator.java +++ b/src/main/java/biomesoplenty/common/world/forcedgenerators/LakesForcedGenerator.java @@ -1,13 +1,12 @@ package biomesoplenty.common.world.forcedgenerators; -import biomesoplenty.common.world.decoration.BOPDecorationManager; -import biomesoplenty.common.world.generation.ForcedWorldFeatureBOP; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.gen.feature.WorldGenerator; - import java.util.Random; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; +import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.common.world.generation.ForcedWorldFeatureBOP; + public class LakesForcedGenerator extends ForcedWorldFeatureBOP { public LakesForcedGenerator(WorldGenerator worldGenerator) @@ -16,9 +15,9 @@ public class LakesForcedGenerator extends ForcedWorldFeatureBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature(featureName); i++) { if (featureName.equals("waterLakesPerChunk")) { diff --git a/src/main/java/biomesoplenty/common/world/forcedgenerators/MelonForcedGenerator.java b/src/main/java/biomesoplenty/common/world/forcedgenerators/MelonForcedGenerator.java index 42078f362..3d9e7a2ed 100644 --- a/src/main/java/biomesoplenty/common/world/forcedgenerators/MelonForcedGenerator.java +++ b/src/main/java/biomesoplenty/common/world/forcedgenerators/MelonForcedGenerator.java @@ -1,13 +1,12 @@ package biomesoplenty.common.world.forcedgenerators; -import biomesoplenty.common.world.decoration.BOPDecorationManager; -import biomesoplenty.common.world.generation.ForcedWorldFeatureBOP; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.gen.feature.WorldGenerator; - import java.util.Random; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; +import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.common.world.generation.ForcedWorldFeatureBOP; + public class MelonForcedGenerator extends ForcedWorldFeatureBOP { public MelonForcedGenerator(WorldGenerator worldGenerator) @@ -16,9 +15,9 @@ public class MelonForcedGenerator extends ForcedWorldFeatureBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { - if ((Boolean)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature("generateMelons")) + if ((Boolean)biome.theBiomeDecorator.bopFeatures.getFeature("generateMelons")) { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; diff --git a/src/main/java/biomesoplenty/common/world/forcedgenerators/SpringForcedGenerator.java b/src/main/java/biomesoplenty/common/world/forcedgenerators/SpringForcedGenerator.java index ac1d240f1..9ce942b62 100644 --- a/src/main/java/biomesoplenty/common/world/forcedgenerators/SpringForcedGenerator.java +++ b/src/main/java/biomesoplenty/common/world/forcedgenerators/SpringForcedGenerator.java @@ -1,14 +1,12 @@ package biomesoplenty.common.world.forcedgenerators; -import biomesoplenty.common.world.decoration.BOPDecorationManager; -import biomesoplenty.common.world.decoration.BOPWorldFeatures; -import biomesoplenty.common.world.generation.ForcedWorldFeatureBOP; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.gen.feature.WorldGenerator; - import java.util.Random; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; +import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.common.world.generation.ForcedWorldFeatureBOP; + public class SpringForcedGenerator extends ForcedWorldFeatureBOP { public SpringForcedGenerator(WorldGenerator worldGenerator) @@ -17,13 +15,11 @@ public class SpringForcedGenerator extends ForcedWorldFeatureBOP } @Override - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z) + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z) { if (biome.theBiomeDecorator.generateLakes) { - BOPWorldFeatures worldFeatures = BOPDecorationManager.getBiomeFeatures(biome.biomeID); - - for (int i = 0; i < (Integer)worldFeatures.getFeature("waterSpringsPerChunk"); ++i) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature("waterSpringsPerChunk"); ++i) { int randX = x + random.nextInt(16) + 8; int randY = random.nextInt(random.nextInt(120) + 8); @@ -32,7 +28,7 @@ public class SpringForcedGenerator extends ForcedWorldFeatureBOP this.generate(world, random, randX, randY, randZ); } - for (int i = 0; i < (Integer)worldFeatures.getFeature("lavaSpringsPerChunk"); ++i) + for (int i = 0; i < (Integer)biome.theBiomeDecorator.bopFeatures.getFeature("lavaSpringsPerChunk"); ++i) { int randX = x + random.nextInt(16) + 8; int randY = random.nextInt(random.nextInt(random.nextInt(112) + 8) + 8); diff --git a/src/main/java/biomesoplenty/common/world/generation/IBOPWorldGenerator.java b/src/main/java/biomesoplenty/common/world/generation/IBOPWorldGenerator.java index 5a43db6b7..76b2efa3d 100644 --- a/src/main/java/biomesoplenty/common/world/generation/IBOPWorldGenerator.java +++ b/src/main/java/biomesoplenty/common/world/generation/IBOPWorldGenerator.java @@ -2,12 +2,13 @@ package biomesoplenty.common.world.generation; import java.util.Random; +import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.biome.BOPBiomeDecorator; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; public interface IBOPWorldGenerator { public boolean generate(World world, Random random, int x, int y, int z); - public void setupGeneration(World world, Random random, BiomeGenBase biome, String featureName, int x, int z); + public void setupGeneration(World world, Random random, BOPBiome biome, String featureName, int x, int z); } diff --git a/src/main/java/biomesoplenty/common/world/layer/GenLayerSubBiome.java b/src/main/java/biomesoplenty/common/world/layer/GenLayerSubBiome.java index b2118921b..fe6070af8 100644 --- a/src/main/java/biomesoplenty/common/world/layer/GenLayerSubBiome.java +++ b/src/main/java/biomesoplenty/common/world/layer/GenLayerSubBiome.java @@ -9,7 +9,7 @@ import net.minecraftforge.common.BiomeManager.BiomeEntry; import org.apache.commons.lang3.tuple.Pair; -import biomesoplenty.common.biomes.BOPSubBiome; +import biomesoplenty.common.biome.BOPSubBiome; import biomesoplenty.common.world.BOPBiomeManager; import biomesoplenty.common.world.noise.SimplexNoise;