From f1e6102888a8198e6c877ae1b09783c9faed5ed1 Mon Sep 17 00:00:00 2001 From: Amnet Date: Wed, 10 Apr 2013 17:13:12 +0200 Subject: [PATCH] Refactored code a little - moved stuff around/removed some warnings/changed some names. Corrected Forestry Integration part. --- .../tdwp_ftw/biomesop/ClientProxy.java | 4 +- .../tdwp_ftw/biomesop/CommonProxy.java | 2 - .../biomesop/armor/ArmorAmethyst.java | 3 +- .../tdwp_ftw/biomesop/armor/ArmorMuddy.java | 3 +- .../biomesop/biomes/BiomeDecoratorBOP.java | 2 +- .../biomesop/biomes/BiomeGenArctic.java | 2 +- .../biomesop/biomes/BiomeGenBadlands.java | 4 +- .../biomesop/biomes/BiomeGenBambooForest.java | 2 +- .../biomesop/biomes/BiomeGenBayou.java | 2 +- .../biomesop/biomes/BiomeGenBirchForest.java | 2 +- .../tdwp_ftw/biomesop/biomes/BiomeGenBog.java | 4 +- .../biomesop/biomes/BiomeGenCanyon.java | 2 +- .../biomesop/biomes/BiomeGenChaparral.java | 2 +- .../biomes/BiomeGenConiferousForest.java | 2 +- .../biomesop/biomes/BiomeGenCrag.java | 4 +- .../biomesop/biomes/BiomeGenDeadForest.java | 4 +- .../biomesop/biomes/BiomeGenDeadSwamp.java | 4 +- .../biomesop/biomes/BiomeGenDeadlands.java | 4 +- .../biomes/BiomeGenDeciduousForest.java | 2 +- .../biomesop/biomes/BiomeGenDunes.java | 2 +- .../tdwp_ftw/biomesop/biomes/BiomeGenFen.java | 2 +- .../biomesop/biomes/BiomeGenFrostForest.java | 2 +- .../biomesop/biomes/BiomeGenFungiForest.java | 2 +- .../biomesop/biomes/BiomeGenGarden.java | 2 +- .../biomesop/biomes/BiomeGenGlacier.java | 2 +- .../biomesop/biomes/BiomeGenGrassland.java | 2 +- .../biomesop/biomes/BiomeGenIcyHills.java | 2 +- .../biomesop/biomes/BiomeGenJadeCliffs.java | 2 +- .../biomesop/biomes/BiomeGenJungleNew.java | 2 +- .../biomesop/biomes/BiomeGenLushDesert.java | 2 +- .../biomesop/biomes/BiomeGenMarsh.java | 2 +- .../biomesop/biomes/BiomeGenMesa.java | 4 +- .../biomesop/biomes/BiomeGenMoor.java | 4 +- .../biomesop/biomes/BiomeGenMysticGrove.java | 2 +- .../biomesop/biomes/BiomeGenOminousWoods.java | 2 +- .../biomesop/biomes/BiomeGenOriginValley.java | 4 +- .../biomesop/biomes/BiomeGenOutback.java | 2 +- .../biomesop/biomes/BiomeGenPasture.java | 2 +- .../biomesop/biomes/BiomeGenPlainsNew.java | 2 +- .../biomesop/biomes/BiomeGenPrairie.java | 2 +- .../biomesop/biomes/BiomeGenPromisedLand.java | 4 +- .../biomesop/biomes/BiomeGenQuagmire.java | 4 +- .../biomes/BiomeGenSacredSprings.java | 2 +- .../biomesop/biomes/BiomeGenSavanna.java | 2 +- .../biomes/BiomeGenSeasonalForest.java | 2 +- .../biomesop/biomes/BiomeGenShrubland.java | 2 +- .../biomesop/biomes/BiomeGenSnowyWoods.java | 4 +- .../biomesop/biomes/BiomeGenSteppe.java | 2 +- .../biomesop/biomes/BiomeGenSwampwoods.java | 2 +- .../biomesop/biomes/BiomeGenTaigaNew.java | 2 +- .../biomes/BiomeGenTemperateRainforest.java | 2 +- .../biomes/BiomeGenTropicalRainforest.java | 2 +- .../biomesop/biomes/BiomeGenTropics.java | 2 +- .../biomesop/biomes/BiomeGenVolcano.java | 4 +- .../biomesop/biomes/BiomeGenWasteland.java | 4 +- .../biomesop/blocks/BlockAcaciaLeaves.java | 2 +- .../biomesop/blocks/BlockAcaciaLog.java | 2 +- .../biomesop/blocks/BlockAcaciaSlab.java | 2 +- .../biomesop/blocks/BlockAmethystBlock.java | 2 +- .../biomesop/blocks/BlockAmethystOre.java | 2 +- .../biomesop/blocks/BlockAppleLeaves.java | 2 +- .../blocks/BlockAppleLeavesFruitless.java | 2 +- .../tdwp_ftw/biomesop/blocks/BlockAsh.java | 2 +- .../biomesop/blocks/BlockAutumnLeaves.java | 2 +- .../tdwp_ftw/biomesop/blocks/BlockBamboo.java | 2 +- .../biomesop/blocks/BlockBambooLeaves.java | 2 +- .../biomesop/blocks/BlockBambooThatching.java | 2 +- .../tdwp_ftw/biomesop/blocks/BlockBarley.java | 2 +- .../biomesop/blocks/BlockBlueLeaves.java | 2 +- .../tdwp_ftw/biomesop/blocks/BlockBush.java | 2 +- .../biomesop/blocks/BlockCattail.java | 2 +- .../biomesop/blocks/BlockCherryLog.java | 2 +- .../biomesop/blocks/BlockCherrySlab.java | 2 +- .../biomesop/blocks/BlockCragRock.java | 2 +- .../biomesop/blocks/BlockDarkLeaves.java | 2 +- .../biomesop/blocks/BlockDarkLog.java | 2 +- .../biomesop/blocks/BlockDarkSlab.java | 2 +- .../biomesop/blocks/BlockDeadGrass.java | 2 +- .../biomesop/blocks/BlockDeadLeaves.java | 2 +- .../biomesop/blocks/BlockDeadLog.java | 2 +- .../biomesop/blocks/BlockDesertGrass.java | 2 +- .../biomesop/blocks/BlockFirLeaves.java | 2 +- .../tdwp_ftw/biomesop/blocks/BlockFirLog.java | 2 +- .../biomesop/blocks/BlockFirSlab.java | 2 +- .../biomesop/blocks/BlockGiantFlowerRed.java | 2 +- .../biomesop/blocks/BlockGiantFlowerStem.java | 2 +- .../blocks/BlockGiantFlowerYellow.java | 2 +- .../biomesop/blocks/BlockGlowFlower.java | 2 +- .../biomesop/blocks/BlockHighGrassTop.java | 2 +- .../biomesop/blocks/BlockHolyGrass.java | 2 +- .../biomesop/blocks/BlockHolyLeaves.java | 2 +- .../biomesop/blocks/BlockHolyLog.java | 2 +- .../biomesop/blocks/BlockHolySapling.java | 2 +- .../biomesop/blocks/BlockHolySlab.java | 2 +- .../biomesop/blocks/BlockHolyStone.java | 2 +- .../biomesop/blocks/BlockHolyTallGrass.java | 2 +- .../biomesop/blocks/BlockMagicLog.java | 2 +- .../biomesop/blocks/BlockMagicSapling.java | 2 +- .../biomesop/blocks/BlockMagicSlab.java | 2 +- .../biomesop/blocks/BlockMangroveLeaves.java | 2 +- .../biomesop/blocks/BlockMangroveLog.java | 2 +- .../biomesop/blocks/BlockMangroveSlab.java | 2 +- .../biomesop/blocks/BlockMediumGrass.java | 2 +- .../tdwp_ftw/biomesop/blocks/BlockMoss.java | 4 +- .../tdwp_ftw/biomesop/blocks/BlockMud.java | 2 +- .../biomesop/blocks/BlockMudBrickSlab.java | 2 +- .../biomesop/blocks/BlockOrangeLeaves.java | 2 +- .../biomesop/blocks/BlockOriginGrass.java | 2 +- .../biomesop/blocks/BlockOriginLeaves.java | 2 +- .../biomesop/blocks/BlockOriginSapling.java | 2 +- .../biomesop/blocks/BlockPalmLeaves.java | 2 +- .../biomesop/blocks/BlockPalmLog.java | 2 +- .../biomesop/blocks/BlockPalmSlab.java | 2 +- .../biomesop/blocks/BlockPinkFlower.java | 2 +- .../biomesop/blocks/BlockPinkLeaves.java | 2 +- .../biomesop/blocks/BlockPromisedPortal.java | 2 +- .../biomesop/blocks/BlockRedLeaves.java | 2 +- .../biomesop/blocks/BlockRedRock.java | 2 +- .../blocks/BlockRedRockBrickSlab.java | 2 +- .../blocks/BlockRedRockCobbleSlab.java | 2 +- .../biomesop/blocks/BlockRedwoodLeaves.java | 2 +- .../biomesop/blocks/BlockRedwoodLog.java | 2 +- .../biomesop/blocks/BlockRedwoodSlab.java | 2 +- .../biomesop/blocks/BlockShortGrass.java | 2 +- .../tdwp_ftw/biomesop/blocks/BlockSprout.java | 2 +- .../tdwp_ftw/biomesop/blocks/BlockThorn.java | 2 +- .../biomesop/blocks/BlockWhiteLeaves.java | 2 +- .../biomesop/blocks/BlockWillowLeaves.java | 2 +- .../biomesop/blocks/BlockWillowLog.java | 2 +- .../biomesop/blocks/BlockWillowSlab.java | 2 +- .../BOPBiomes.java | 121 ++-------- .../BOPBlocks.java | 2 +- .../BOPConfiguration.java | 4 +- .../BOPItems.java | 2 +- .../declarations/BOPCrossIntegration.java | 186 --------------- .../biomesop/helpers/BonemealUse.java | 2 +- .../helpers/ChunkProviderPromised.java | 2 +- .../biomesop/helpers/CreativeTabsBOP.java | 2 +- .../biomesop/helpers/TeleporterPromised.java | 2 +- .../helpers/WorldProviderPromised.java | 4 +- .../biomesop/helpers/WorldTypeSize.java | 2 +- .../integration/BOPCrossIntegration.java | 216 ++++++++++++++++++ .../biomesop/items/ItemAncientStaff.java | 2 +- .../tdwp_ftw/biomesop/items/ItemBOP.java | 2 +- .../tdwp_ftw/biomesop/mod_BiomesOPlenty.java | 16 +- .../biomesop/worldgen/WorldGenAcacia.java | 2 +- .../biomesop/worldgen/WorldGenAlgae.java | 2 +- .../biomesop/worldgen/WorldGenApple.java | 2 +- .../biomesop/worldgen/WorldGenAppleTree1.java | 2 +- .../biomesop/worldgen/WorldGenAppleTree2.java | 2 +- .../biomesop/worldgen/WorldGenAsh.java | 2 +- .../biomesop/worldgen/WorldGenAutumn.java | 2 +- .../biomesop/worldgen/WorldGenAutumn2.java | 2 +- .../biomesop/worldgen/WorldGenBambooTree.java | 2 +- .../biomesop/worldgen/WorldGenBayou1.java | 2 +- .../biomesop/worldgen/WorldGenBayou2.java | 2 +- .../biomesop/worldgen/WorldGenBayou3.java | 2 +- .../biomesop/worldgen/WorldGenCanyon.java | 2 +- .../worldgen/WorldGenCanyonShrub.java | 2 +- .../biomesop/worldgen/WorldGenCanyonTree.java | 2 +- .../biomesop/worldgen/WorldGenCattail.java | 2 +- .../biomesop/worldgen/WorldGenCherry1.java | 2 +- .../biomesop/worldgen/WorldGenCherry2.java | 2 +- .../biomesop/worldgen/WorldGenColumn.java | 2 +- .../biomesop/worldgen/WorldGenCypress.java | 2 +- .../biomesop/worldgen/WorldGenCypress1.java | 2 +- .../biomesop/worldgen/WorldGenCypress2.java | 2 +- .../biomesop/worldgen/WorldGenDarkTree1.java | 2 +- .../biomesop/worldgen/WorldGenDarkTree2.java | 2 +- .../biomesop/worldgen/WorldGenDeadTree.java | 2 +- .../biomesop/worldgen/WorldGenDeadTree2.java | 2 +- .../biomesop/worldgen/WorldGenDeadTree3.java | 2 +- .../biomesop/worldgen/WorldGenDeadlands.java | 2 +- .../worldgen/WorldGenDesertCactus.java | 2 +- .../biomesop/worldgen/WorldGenFen2.java | 2 +- .../biomesop/worldgen/WorldGenFir1.java | 2 +- .../biomesop/worldgen/WorldGenFir2.java | 2 +- .../biomesop/worldgen/WorldGenFir3.java | 2 +- .../biomesop/worldgen/WorldGenFungi1.java | 2 +- .../biomesop/worldgen/WorldGenFungi3.java | 2 +- .../worldgen/WorldGenGiantFlowerRed.java | 2 +- .../worldgen/WorldGenGiantFlowerYellow.java | 2 +- .../biomesop/worldgen/WorldGenHighGrass.java | 2 +- .../biomesop/worldgen/WorldGenMangrove.java | 2 +- .../biomesop/worldgen/WorldGenMaple.java | 2 +- .../biomesop/worldgen/WorldGenMarsh.java | 2 +- .../biomesop/worldgen/WorldGenMesa.java | 2 +- .../biomesop/worldgen/WorldGenMoss.java | 2 +- .../biomesop/worldgen/WorldGenMud.java | 2 +- .../biomesop/worldgen/WorldGenMystic1.java | 2 +- .../biomesop/worldgen/WorldGenMystic2.java | 2 +- .../biomesop/worldgen/WorldGenOasis.java | 2 +- .../biomesop/worldgen/WorldGenOminous1.java | 2 +- .../biomesop/worldgen/WorldGenOminous2.java | 2 +- .../biomesop/worldgen/WorldGenOriginTree.java | 2 +- .../biomesop/worldgen/WorldGenOutback.java | 2 +- .../worldgen/WorldGenOutbackShrub.java | 2 +- .../worldgen/WorldGenOutbackTree.java | 2 +- .../biomesop/worldgen/WorldGenPalm1.java | 2 +- .../biomesop/worldgen/WorldGenPalm2.java | 2 +- .../biomesop/worldgen/WorldGenPalmTree.java | 2 +- .../biomesop/worldgen/WorldGenPalmTree1.java | 2 +- .../biomesop/worldgen/WorldGenPalmTree2.java | 2 +- .../biomesop/worldgen/WorldGenPalmTree3.java | 2 +- .../worldgen/WorldGenPromisedLandPortal.java | 2 +- .../worldgen/WorldGenPromisedShrub.java | 2 +- .../worldgen/WorldGenPromisedTree.java | 2 +- .../worldgen/WorldGenPromisedTree2.java | 2 +- .../worldgen/WorldGenPromisedTree3.java | 2 +- .../worldgen/WorldGenPromisedWillow.java | 2 +- .../biomesop/worldgen/WorldGenQuagmire.java | 2 +- .../biomesop/worldgen/WorldGenQuicksand.java | 2 +- .../biomesop/worldgen/WorldGenQuicksand2.java | 2 +- .../biomesop/worldgen/WorldGenRedwood1.java | 2 +- .../biomesop/worldgen/WorldGenRedwood2.java | 2 +- .../worldgen/WorldGenRedwoodTree.java | 2 +- .../worldgen/WorldGenRedwoodTree2.java | 2 +- .../worldgen/WorldGenSmolderingGrass.java | 2 +- .../biomesop/worldgen/WorldGenSpire.java | 2 +- .../biomesop/worldgen/WorldGenSprout.java | 2 +- .../biomesop/worldgen/WorldGenTaiga3.java | 2 +- .../biomesop/worldgen/WorldGenTaiga4.java | 2 +- .../biomesop/worldgen/WorldGenTaiga9.java | 2 +- .../biomesop/worldgen/WorldGenVolcano.java | 2 +- .../biomesop/worldgen/WorldGenWillow.java | 2 +- .../biomesop/worldgen/WorldGenWillow1.java | 2 +- .../biomesop/worldgen/WorldGenWillow2.java | 2 +- .../biomesop/worldtype/ChunkProviderBOP.java | 2 +- .../biomesop/worldtype/WTBiomesOP.java | 2 +- 229 files changed, 482 insertions(+), 545 deletions(-) rename src/minecraft/tdwp_ftw/biomesop/{declarations => configuration}/BOPBiomes.java (89%) rename src/minecraft/tdwp_ftw/biomesop/{declarations => configuration}/BOPBlocks.java (99%) rename src/minecraft/tdwp_ftw/biomesop/{declarations => configuration}/BOPConfiguration.java (99%) rename src/minecraft/tdwp_ftw/biomesop/{declarations => configuration}/BOPItems.java (99%) delete mode 100644 src/minecraft/tdwp_ftw/biomesop/declarations/BOPCrossIntegration.java create mode 100644 src/minecraft/tdwp_ftw/biomesop/integration/BOPCrossIntegration.java diff --git a/src/minecraft/tdwp_ftw/biomesop/ClientProxy.java b/src/minecraft/tdwp_ftw/biomesop/ClientProxy.java index 9df577604..c8551be2b 100644 --- a/src/minecraft/tdwp_ftw/biomesop/ClientProxy.java +++ b/src/minecraft/tdwp_ftw/biomesop/ClientProxy.java @@ -6,11 +6,9 @@ import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.entity.RenderSnowball; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; -import tdwp_ftw.biomesop.declarations.BOPItems; +import tdwp_ftw.biomesop.configuration.BOPItems; import tdwp_ftw.biomesop.items.projectiles.EntityMudball; import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ClientProxy extends CommonProxy { diff --git a/src/minecraft/tdwp_ftw/biomesop/CommonProxy.java b/src/minecraft/tdwp_ftw/biomesop/CommonProxy.java index 509e88616..8d3067f13 100644 --- a/src/minecraft/tdwp_ftw/biomesop/CommonProxy.java +++ b/src/minecraft/tdwp_ftw/biomesop/CommonProxy.java @@ -1,8 +1,6 @@ package tdwp_ftw.biomesop; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class CommonProxy { public static String ARMOR_MUD1_PNG = "/mods/BiomesOPlenty/textures/armor/mud_1.png"; diff --git a/src/minecraft/tdwp_ftw/biomesop/armor/ArmorAmethyst.java b/src/minecraft/tdwp_ftw/biomesop/armor/ArmorAmethyst.java index e9e7aec3a..f58b3b3e3 100644 --- a/src/minecraft/tdwp_ftw/biomesop/armor/ArmorAmethyst.java +++ b/src/minecraft/tdwp_ftw/biomesop/armor/ArmorAmethyst.java @@ -6,9 +6,8 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraftforge.common.IArmorTextureProvider; import tdwp_ftw.biomesop.CommonProxy; -import tdwp_ftw.biomesop.declarations.BOPItems; +import tdwp_ftw.biomesop.configuration.BOPItems; -@SuppressWarnings("deprecation") public class ArmorAmethyst extends ItemArmor implements IArmorTextureProvider { public int textureID = 0; diff --git a/src/minecraft/tdwp_ftw/biomesop/armor/ArmorMuddy.java b/src/minecraft/tdwp_ftw/biomesop/armor/ArmorMuddy.java index 28239ce17..8f2cbc49e 100644 --- a/src/minecraft/tdwp_ftw/biomesop/armor/ArmorMuddy.java +++ b/src/minecraft/tdwp_ftw/biomesop/armor/ArmorMuddy.java @@ -6,9 +6,8 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraftforge.common.IArmorTextureProvider; import tdwp_ftw.biomesop.CommonProxy; -import tdwp_ftw.biomesop.declarations.BOPItems; +import tdwp_ftw.biomesop.configuration.BOPItems; -@SuppressWarnings("deprecation") public class ArmorMuddy extends ItemArmor implements IArmorTextureProvider { public int textureID = 0; diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeDecoratorBOP.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeDecoratorBOP.java index e30fbb217..5e72f7a9f 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeDecoratorBOP.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeDecoratorBOP.java @@ -43,7 +43,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.terraingen.DecorateBiomeEvent; import net.minecraftforge.event.terraingen.OreGenEvent; import net.minecraftforge.event.terraingen.TerrainGen; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import tdwp_ftw.biomesop.worldgen.WorldGenAlgae; import tdwp_ftw.biomesop.worldgen.WorldGenAsh; import tdwp_ftw.biomesop.worldgen.WorldGenBoulder; diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenArctic.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenArctic.java index a0af9fc86..7f2600562 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenArctic.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenArctic.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import tdwp_ftw.biomesop.worldgen.WorldGenTaiga3; import tdwp_ftw.biomesop.worldgen.WorldGenTaiga4; import tdwp_ftw.biomesop.worldgen.WorldGenTaiga9; diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBadlands.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBadlands.java index 5e49327cd..cb06abe33 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBadlands.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBadlands.java @@ -4,8 +4,8 @@ import java.awt.Color; import net.minecraft.block.Block; import net.minecraft.world.biome.BiomeGenBase; -import tdwp_ftw.biomesop.declarations.BOPBlocks; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; public class BiomeGenBadlands extends BiomeGenBase { diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBambooForest.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBambooForest.java index 5b6891246..413bf3f8f 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBambooForest.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBambooForest.java @@ -8,7 +8,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import tdwp_ftw.biomesop.worldgen.WorldGenBambooTree; public class BiomeGenBambooForest extends BiomeGenBase diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBayou.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBayou.java index 45f6d889d..9b50c76e4 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBayou.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBayou.java @@ -6,7 +6,7 @@ import java.util.Random; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; import tdwp_ftw.biomesop.worldgen.WorldGenBayou1; import tdwp_ftw.biomesop.worldgen.WorldGenBayou2; import tdwp_ftw.biomesop.worldgen.WorldGenBayou3; diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBirchForest.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBirchForest.java index 6212e1640..92d1a66a4 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBirchForest.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBirchForest.java @@ -7,7 +7,7 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BiomeGenBirchForest extends BiomeGenBase { diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBog.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBog.java index 1045f988f..6bd275ba7 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBog.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBog.java @@ -9,8 +9,8 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; import tdwp_ftw.biomesop.worldgen.WorldGenBog1; import tdwp_ftw.biomesop.worldgen.WorldGenBog2; diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenCanyon.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenCanyon.java index 397501ad7..ef79974da 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenCanyon.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenCanyon.java @@ -4,7 +4,7 @@ import java.util.Random; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import tdwp_ftw.biomesop.worldgen.WorldGenCanyonShrub; import tdwp_ftw.biomesop.worldgen.WorldGenCanyonTree; diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenChaparral.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenChaparral.java index e1210cd76..2e457985a 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenChaparral.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenChaparral.java @@ -7,7 +7,7 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import tdwp_ftw.biomesop.worldgen.WorldGenChaparral1; import tdwp_ftw.biomesop.worldgen.WorldGenChaparral2; import tdwp_ftw.biomesop.worldgen.WorldGenChaparral3; diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenConiferousForest.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenConiferousForest.java index 4a21856bc..0d9a4fa4e 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenConiferousForest.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenConiferousForest.java @@ -9,7 +9,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import tdwp_ftw.biomesop.worldgen.WorldGenTaiga3; import tdwp_ftw.biomesop.worldgen.WorldGenTaiga4; import tdwp_ftw.biomesop.worldgen.WorldGenTaiga9; diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenCrag.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenCrag.java index 712da1aef..931ceb892 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenCrag.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenCrag.java @@ -3,8 +3,8 @@ package tdwp_ftw.biomesop.biomes; import java.awt.Color; import net.minecraft.world.biome.BiomeGenBase; -import tdwp_ftw.biomesop.declarations.BOPBlocks; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; public class BiomeGenCrag extends BiomeGenBase { diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenDeadForest.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenDeadForest.java index 6f50f7fbb..c165658e0 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenDeadForest.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenDeadForest.java @@ -7,8 +7,8 @@ import net.minecraft.block.Block; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; import tdwp_ftw.biomesop.worldgen.WorldGenDeadTree; import tdwp_ftw.biomesop.worldgen.WorldGenDeadTree2; import tdwp_ftw.biomesop.worldgen.WorldGenTaiga5; diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenDeadSwamp.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenDeadSwamp.java index baae87c08..bd9e1d884 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenDeadSwamp.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenDeadSwamp.java @@ -7,8 +7,8 @@ import net.minecraft.block.Block; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; import tdwp_ftw.biomesop.worldgen.WorldGenDeadTree; public class BiomeGenDeadSwamp extends BiomeGenBase diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenDeadlands.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenDeadlands.java index 8b86f8348..2d1d5293a 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenDeadlands.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenDeadlands.java @@ -11,8 +11,8 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenMinable; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; import tdwp_ftw.biomesop.worldgen.WorldGenDeadTree3; import tdwp_ftw.biomesop.worldgen.WorldGenDeadlands; diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenDeciduousForest.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenDeciduousForest.java index 3c5ddae32..9ccf89594 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenDeciduousForest.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenDeciduousForest.java @@ -6,7 +6,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import tdwp_ftw.biomesop.worldgen.WorldGenDeciduous; public class BiomeGenDeciduousForest extends BiomeGenBase diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenDunes.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenDunes.java index b2b5e9eac..50828e5fe 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenDunes.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenDunes.java @@ -4,7 +4,7 @@ import java.awt.Color; import net.minecraft.block.Block; import net.minecraft.world.biome.BiomeGenBase; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; public class BiomeGenDunes extends BiomeGenBase { diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenFen.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenFen.java index f9abe0f02..280b70cf2 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenFen.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenFen.java @@ -7,7 +7,7 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import tdwp_ftw.biomesop.worldgen.WorldGenDeadTree; import tdwp_ftw.biomesop.worldgen.WorldGenFen1; import tdwp_ftw.biomesop.worldgen.WorldGenFen2; diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenFrostForest.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenFrostForest.java index 598d31d83..c035c10b8 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenFrostForest.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenFrostForest.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; public class BiomeGenFrostForest extends BiomeGenBase { diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenFungiForest.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenFungiForest.java index 9f5f01f59..380964f4e 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenFungiForest.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenFungiForest.java @@ -8,7 +8,7 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; import tdwp_ftw.biomesop.worldgen.WorldGenMoss; import tdwp_ftw.biomesop.worldgen.WorldGenSwampTall; import tdwp_ftw.biomesop.worldgen.WorldGenThickTree; diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenGarden.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenGarden.java index d8b47d56f..6a9cd511e 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenGarden.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenGarden.java @@ -8,7 +8,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import tdwp_ftw.biomesop.mobs.EntityRosester; import tdwp_ftw.biomesop.worldgen.WorldGenGiantFlowerRed; import tdwp_ftw.biomesop.worldgen.WorldGenGiantFlowerYellow; diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenGlacier.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenGlacier.java index 586ea892a..2383ad2bf 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenGlacier.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenGlacier.java @@ -1,7 +1,7 @@ package tdwp_ftw.biomesop.biomes; import net.minecraft.world.biome.BiomeGenBase; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BiomeGenGlacier extends BiomeGenBase { diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenGrassland.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenGrassland.java index 0d61e4ce4..eba7871ee 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenGrassland.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenGrassland.java @@ -12,7 +12,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BiomeGenGrassland extends BiomeGenBase { diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenIcyHills.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenIcyHills.java index 2959ed24a..afaa815f4 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenIcyHills.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenIcyHills.java @@ -8,7 +8,7 @@ import net.minecraft.entity.monster.EntitySnowman; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; import tdwp_ftw.biomesop.worldgen.WorldGenIceTree; public class BiomeGenIcyHills extends BiomeGenBase diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenJadeCliffs.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenJadeCliffs.java index ffd324735..3581a1765 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenJadeCliffs.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenJadeCliffs.java @@ -8,7 +8,7 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; import tdwp_ftw.biomesop.worldgen.WorldGenJadeTree; public class BiomeGenJadeCliffs extends BiomeGenBase diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenJungleNew.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenJungleNew.java index 18e7056aa..e3bfed386 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenJungleNew.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenJungleNew.java @@ -15,7 +15,7 @@ import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTrees; import net.minecraft.world.gen.feature.WorldGenVines; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; import tdwp_ftw.biomesop.mobs.EntityJungleSpider; public class BiomeGenJungleNew extends BiomeGenBase diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenLushDesert.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenLushDesert.java index 5db38652c..9668a9e87 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenLushDesert.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenLushDesert.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import tdwp_ftw.biomesop.worldgen.WorldGenAcacia; public class BiomeGenLushDesert extends BiomeGenBase diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenMarsh.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenMarsh.java index a19b5c203..8cdf6216f 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenMarsh.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenMarsh.java @@ -7,7 +7,7 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import tdwp_ftw.biomesop.worldgen.WorldGenMarsh; public class BiomeGenMarsh extends BiomeGenBase diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenMesa.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenMesa.java index eb2b0ff30..ac53edcbf 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenMesa.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenMesa.java @@ -5,8 +5,8 @@ import java.awt.Color; import net.minecraft.entity.monster.EntitySpider; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; -import tdwp_ftw.biomesop.declarations.BOPBlocks; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; public class BiomeGenMesa extends BiomeGenBase { diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenMoor.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenMoor.java index 31f80879a..9c78a703d 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenMoor.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenMoor.java @@ -8,8 +8,8 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; import tdwp_ftw.biomesop.worldgen.WorldGenMoor; public class BiomeGenMoor extends BiomeGenBase diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenMysticGrove.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenMysticGrove.java index 83b037111..055883458 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenMysticGrove.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenMysticGrove.java @@ -9,7 +9,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; import tdwp_ftw.biomesop.worldgen.WorldGenMystic1; import tdwp_ftw.biomesop.worldgen.WorldGenMystic2; diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenOminousWoods.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenOminousWoods.java index 2834fe8ed..0a02b10ad 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenOminousWoods.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenOminousWoods.java @@ -11,7 +11,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; import tdwp_ftw.biomesop.worldgen.WorldGenOminous1; import tdwp_ftw.biomesop.worldgen.WorldGenOminous2; diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenOriginValley.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenOriginValley.java index 9b24d2c92..7550d4a4f 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenOriginValley.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenOriginValley.java @@ -5,8 +5,8 @@ import java.util.Random; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; import tdwp_ftw.biomesop.worldgen.WorldGenOriginTree; public class BiomeGenOriginValley extends BiomeGenBase diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenOutback.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenOutback.java index 62473a704..95e3ba881 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenOutback.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenOutback.java @@ -4,7 +4,7 @@ import java.util.Random; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import tdwp_ftw.biomesop.worldgen.WorldGenOutbackShrub; import tdwp_ftw.biomesop.worldgen.WorldGenOutbackTree; diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenPasture.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenPasture.java index c7ac02d27..d778a848a 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenPasture.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenPasture.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BiomeGenPasture extends BiomeGenBase { diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenPlainsNew.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenPlainsNew.java index f338de5ff..378eaf769 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenPlainsNew.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenPlainsNew.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BiomeGenPlainsNew extends BiomeGenBase { diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenPrairie.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenPrairie.java index c3dea2e0a..52f89d3ac 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenPrairie.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenPrairie.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import tdwp_ftw.biomesop.worldgen.WorldGenPrairie; public class BiomeGenPrairie extends BiomeGenBase diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenPromisedLand.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenPromisedLand.java index 3a75cac21..80adcfec8 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenPromisedLand.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenPromisedLand.java @@ -8,8 +8,8 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenMinable; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; import tdwp_ftw.biomesop.worldgen.WorldGenPromisedShrub; import tdwp_ftw.biomesop.worldgen.WorldGenPromisedTree; import tdwp_ftw.biomesop.worldgen.WorldGenPromisedTree2; diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenQuagmire.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenQuagmire.java index b49d95d92..ac687d383 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenQuagmire.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenQuagmire.java @@ -5,8 +5,8 @@ import java.util.Random; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; import tdwp_ftw.biomesop.worldgen.WorldGenDeadTree; public class BiomeGenQuagmire extends BiomeGenBase diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSacredSprings.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSacredSprings.java index d4fbbfd73..1e81dd9b0 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSacredSprings.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSacredSprings.java @@ -9,7 +9,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; import tdwp_ftw.biomesop.mobs.EntityJungleSpider; public class BiomeGenSacredSprings extends BiomeGenBase diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSavanna.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSavanna.java index 328fe1a51..08a99fa1b 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSavanna.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSavanna.java @@ -7,7 +7,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import tdwp_ftw.biomesop.worldgen.WorldGenAcacia; public class BiomeGenSavanna extends BiomeGenBase diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSeasonalForest.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSeasonalForest.java index 932f11d25..f57b3d8fd 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSeasonalForest.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSeasonalForest.java @@ -7,7 +7,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import tdwp_ftw.biomesop.worldgen.WorldGenAutumn; import tdwp_ftw.biomesop.worldgen.WorldGenAutumn2; import tdwp_ftw.biomesop.worldgen.WorldGenDeadTree2; diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenShrubland.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenShrubland.java index 37a2400eb..94e338cbd 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenShrubland.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenShrubland.java @@ -6,7 +6,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BiomeGenShrubland extends BiomeGenBase { diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSnowyWoods.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSnowyWoods.java index d8b03e7f9..b9d27d8d8 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSnowyWoods.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSnowyWoods.java @@ -6,8 +6,8 @@ import java.util.Random; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; import tdwp_ftw.biomesop.worldgen.WorldGenDeadTree; import tdwp_ftw.biomesop.worldgen.WorldGenDeadTree2; import tdwp_ftw.biomesop.worldgen.WorldGenTaiga5; diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSteppe.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSteppe.java index e2314b92e..a6e1f43dd 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSteppe.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSteppe.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BiomeGenSteppe extends BiomeGenBase { diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSwampwoods.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSwampwoods.java index fc1b7b014..afbe198e1 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSwampwoods.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSwampwoods.java @@ -8,7 +8,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import tdwp_ftw.biomesop.worldgen.WorldGenCypress; import tdwp_ftw.biomesop.worldgen.WorldGenMarsh; diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenTaigaNew.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenTaigaNew.java index 34a9b75b7..8ec76cf5f 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenTaigaNew.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenTaigaNew.java @@ -9,7 +9,7 @@ import net.minecraft.world.gen.feature.WorldGenTaiga1; import net.minecraft.world.gen.feature.WorldGenTaiga2; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BiomeGenTaigaNew extends BiomeGenBase { diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenTemperateRainforest.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenTemperateRainforest.java index 58659150b..52fa1a873 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenTemperateRainforest.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenTemperateRainforest.java @@ -8,7 +8,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import tdwp_ftw.biomesop.worldgen.WorldGenMoss; import tdwp_ftw.biomesop.worldgen.WorldGenTemperate; import tdwp_ftw.biomesop.worldgen.WorldGenThickTree; diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenTropicalRainforest.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenTropicalRainforest.java index 9ea202ccd..1be6a8ad7 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenTropicalRainforest.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenTropicalRainforest.java @@ -9,7 +9,7 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; import tdwp_ftw.biomesop.mobs.EntityJungleSpider; import tdwp_ftw.biomesop.worldgen.WorldGenRainforest1; import tdwp_ftw.biomesop.worldgen.WorldGenRainforest2; diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenTropics.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenTropics.java index 7d1f0b868..51f641e29 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenTropics.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenTropics.java @@ -6,7 +6,7 @@ import java.util.Random; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; import tdwp_ftw.biomesop.mobs.EntityJungleSpider; import tdwp_ftw.biomesop.worldgen.WorldGenPalmTree1; import tdwp_ftw.biomesop.worldgen.WorldGenPalmTree3; diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenVolcano.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenVolcano.java index 3bc971806..ebbd9dec8 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenVolcano.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenVolcano.java @@ -5,8 +5,8 @@ import java.util.Random; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; import tdwp_ftw.biomesop.worldgen.WorldGenVolcano; public class BiomeGenVolcano extends BiomeGenBase diff --git a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenWasteland.java b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenWasteland.java index d925141f6..1f7396834 100644 --- a/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenWasteland.java +++ b/src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenWasteland.java @@ -3,8 +3,8 @@ package tdwp_ftw.biomesop.biomes; import java.awt.Color; import net.minecraft.world.biome.BiomeGenBase; -import tdwp_ftw.biomesop.declarations.BOPBlocks; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; public class BiomeGenWasteland extends BiomeGenBase { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaLeaves.java index e5e6f498c..603d6de49 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaLeaves.java @@ -15,7 +15,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaLog.java index 2f2f7a9e5..e3ebd1f23 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaLog.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaLog.java @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockAcaciaLog extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaSlab.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaSlab.java index 82e8de8c2..9cf0dd2f7 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaSlab.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaSlab.java @@ -10,7 +10,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockAcaciaSlab extends BlockHalfSlab diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAmethystBlock.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAmethystBlock.java index 6a16e7527..fc5d6e210 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAmethystBlock.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAmethystBlock.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockAmethystBlock extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAmethystOre.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAmethystOre.java index 2e63a5b7d..d8c251bb7 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAmethystOre.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAmethystOre.java @@ -8,7 +8,7 @@ import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPItems; +import tdwp_ftw.biomesop.configuration.BOPItems; public class BlockAmethystOre extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAppleLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAppleLeaves.java index f0a9792ec..680484af1 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAppleLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAppleLeaves.java @@ -15,7 +15,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAppleLeavesFruitless.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAppleLeavesFruitless.java index 1ad859c0a..facda4589 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAppleLeavesFruitless.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAppleLeavesFruitless.java @@ -15,7 +15,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAsh.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAsh.java index 976bf9d45..89a1a14cc 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAsh.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAsh.java @@ -9,7 +9,7 @@ import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPItems; +import tdwp_ftw.biomesop.configuration.BOPItems; public class BlockAsh extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAutumnLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAutumnLeaves.java index a898c5b38..48d994035 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAutumnLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAutumnLeaves.java @@ -14,7 +14,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBamboo.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBamboo.java index 41cdffe35..9a1b19051 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBamboo.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBamboo.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.world.World; -import tdwp_ftw.biomesop.declarations.BOPItems; +import tdwp_ftw.biomesop.configuration.BOPItems; public class BlockBamboo extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBambooLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBambooLeaves.java index 8eff5a630..bcb6d01ae 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBambooLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBambooLeaves.java @@ -14,7 +14,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBambooThatching.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBambooThatching.java index 7e5850b3a..1afd38368 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBambooThatching.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBambooThatching.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockBambooThatching extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBarley.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBarley.java index 71894fdab..a9da97854 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBarley.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBarley.java @@ -7,7 +7,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import tdwp_ftw.biomesop.declarations.BOPItems; +import tdwp_ftw.biomesop.configuration.BOPItems; public class BlockBarley extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBlueLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBlueLeaves.java index 96fe12ba1..fca56b940 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBlueLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBlueLeaves.java @@ -14,7 +14,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBush.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBush.java index 56179172d..4ae3f9cea 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBush.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBush.java @@ -14,7 +14,7 @@ import net.minecraft.world.ColorizerFoliage; import net.minecraft.world.ColorizerGrass; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import tdwp_ftw.biomesop.declarations.BOPItems; +import tdwp_ftw.biomesop.configuration.BOPItems; public class BlockBush extends BlockFlower { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockCattail.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockCattail.java index c6a2747f9..5975c9988 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockCattail.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockCattail.java @@ -7,7 +7,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import tdwp_ftw.biomesop.declarations.BOPItems; +import tdwp_ftw.biomesop.configuration.BOPItems; public class BlockCattail extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockCherryLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockCherryLog.java index 9f85407cd..40b64847f 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockCherryLog.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockCherryLog.java @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockCherryLog extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockCherrySlab.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockCherrySlab.java index c3bbbc4cb..e942f0569 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockCherrySlab.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockCherrySlab.java @@ -10,7 +10,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockCherrySlab extends BlockHalfSlab { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockCragRock.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockCragRock.java index b0f56f75e..b3975d486 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockCragRock.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockCragRock.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockCragRock extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDarkLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDarkLeaves.java index d9e1c4855..57966a925 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDarkLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDarkLeaves.java @@ -14,7 +14,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDarkLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDarkLog.java index 2f9671fdf..a1aa00a89 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDarkLog.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDarkLog.java @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockDarkLog extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDarkSlab.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDarkSlab.java index a91195143..1c53214a5 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDarkSlab.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDarkSlab.java @@ -10,7 +10,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockDarkSlab extends BlockHalfSlab { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadGrass.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadGrass.java index a327656c1..1cb5bd32e 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadGrass.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadGrass.java @@ -12,7 +12,7 @@ import net.minecraft.stats.StatList; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockDeadGrass extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadLeaves.java index 3c1ff5b29..fd6be0381 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadLeaves.java @@ -14,7 +14,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadLog.java index 4b4e09825..9aa988420 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadLog.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadLog.java @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockDeadLog extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDesertGrass.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDesertGrass.java index 83fff08b2..2c3556a3c 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDesertGrass.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDesertGrass.java @@ -12,7 +12,7 @@ import net.minecraft.stats.StatList; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockDesertGrass extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirLeaves.java index 2c1c09fac..b864edd6a 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirLeaves.java @@ -14,7 +14,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirLog.java index 8d5e1170e..afc6eed54 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirLog.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirLog.java @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockFirLog extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirSlab.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirSlab.java index 5222718ac..c7580b934 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirSlab.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirSlab.java @@ -10,7 +10,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockFirSlab extends BlockHalfSlab diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerRed.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerRed.java index 60ba06170..96b75958f 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerRed.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerRed.java @@ -8,7 +8,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockGiantFlowerRed extends BlockLeavesBase { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerStem.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerStem.java index 9661b2105..efa7d1cd4 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerStem.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerStem.java @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockGiantFlowerStem extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerYellow.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerYellow.java index b691d9c97..9ead0af42 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerYellow.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerYellow.java @@ -8,7 +8,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockGiantFlowerYellow extends BlockLeavesBase { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGlowFlower.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGlowFlower.java index 0ec08af06..bd29a6b9c 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGlowFlower.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGlowFlower.java @@ -8,7 +8,7 @@ import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockGlowFlower extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHighGrassTop.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHighGrassTop.java index d9fecfe10..18f646ea4 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHighGrassTop.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHighGrassTop.java @@ -8,7 +8,7 @@ import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.world.ColorizerFoliage; import net.minecraft.world.ColorizerGrass; import net.minecraft.world.IBlockAccess; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockHighGrassTop extends BlockFlower { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyGrass.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyGrass.java index a3923acc3..84f654521 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyGrass.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyGrass.java @@ -12,7 +12,7 @@ import net.minecraft.world.World; import net.minecraft.world.WorldProviderEnd; import net.minecraftforge.common.ForgeDirection; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; //========================================= diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyLeaves.java index 23c315256..d6d95f087 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyLeaves.java @@ -14,7 +14,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyLog.java index dad8acf17..6b52db0cb 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyLog.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyLog.java @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockHolyLog extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolySapling.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolySapling.java index 62441dd62..600d53412 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolySapling.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolySapling.java @@ -12,7 +12,7 @@ import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import tdwp_ftw.biomesop.worldgen.WorldGenPromisedTree; public class BlockHolySapling extends BlockSapling diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolySlab.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolySlab.java index 94c7020ac..74f6465a7 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolySlab.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolySlab.java @@ -10,7 +10,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockHolySlab extends BlockHalfSlab { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyStone.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyStone.java index d7700645d..101eead2e 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyStone.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyStone.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockHolyStone extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyTallGrass.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyTallGrass.java index 2ccd6a1a7..1a494fd79 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyTallGrass.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyTallGrass.java @@ -11,7 +11,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockHolyTallGrass extends Block implements IShearable { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicLog.java index 5490357ed..9cc9c6d88 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicLog.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicLog.java @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockMagicLog extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicSapling.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicSapling.java index f4860cadc..8617ac380 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicSapling.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicSapling.java @@ -12,7 +12,7 @@ import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import tdwp_ftw.biomesop.worldgen.WorldGenMystic2; public class BlockMagicSapling extends BlockSapling diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicSlab.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicSlab.java index ec89c8d24..9013f5200 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicSlab.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicSlab.java @@ -10,7 +10,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockMagicSlab extends BlockHalfSlab { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveLeaves.java index 51eea5f75..56b375799 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveLeaves.java @@ -15,7 +15,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveLog.java index f93d6f4e3..1043cb6c9 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveLog.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveLog.java @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockMangroveLog extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveSlab.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveSlab.java index 4e74fccd1..8dd529c72 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveSlab.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveSlab.java @@ -10,7 +10,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockMangroveSlab extends BlockHalfSlab { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMediumGrass.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMediumGrass.java index 04d4794f8..67d608b1d 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMediumGrass.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMediumGrass.java @@ -14,7 +14,7 @@ import net.minecraft.world.ColorizerFoliage; import net.minecraft.world.ColorizerGrass; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import tdwp_ftw.biomesop.declarations.BOPItems; +import tdwp_ftw.biomesop.configuration.BOPItems; public class BlockMediumGrass extends BlockFlower { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMoss.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMoss.java index 05ad8dde6..a85ac000b 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMoss.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMoss.java @@ -10,8 +10,8 @@ import net.minecraft.util.Direction; import net.minecraft.world.ColorizerFoliage; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import tdwp_ftw.biomesop.declarations.BOPBlocks; -import tdwp_ftw.biomesop.declarations.BOPItems; +import tdwp_ftw.biomesop.configuration.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPItems; public class BlockMoss extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMud.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMud.java index 601ff7a0a..863784218 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMud.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMud.java @@ -9,7 +9,7 @@ import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPItems; +import tdwp_ftw.biomesop.configuration.BOPItems; public class BlockMud extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMudBrickSlab.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMudBrickSlab.java index d91c110a4..2867da7bc 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMudBrickSlab.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMudBrickSlab.java @@ -10,7 +10,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockMudBrickSlab extends BlockHalfSlab { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOrangeLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOrangeLeaves.java index 460491c5b..c4de3e0fa 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOrangeLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOrangeLeaves.java @@ -15,7 +15,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginGrass.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginGrass.java index 560baf885..332f6bce6 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginGrass.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginGrass.java @@ -11,7 +11,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.IPlantable; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockOriginGrass extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginLeaves.java index a9560ea7b..1fc3c2ef2 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginLeaves.java @@ -14,7 +14,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginSapling.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginSapling.java index 7d6b16231..9fa3f5a44 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginSapling.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginSapling.java @@ -12,7 +12,7 @@ import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import tdwp_ftw.biomesop.worldgen.WorldGenOriginTree; public class BlockOriginSapling extends BlockSapling diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmLeaves.java index 07a46ea07..12cdfda02 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmLeaves.java @@ -15,7 +15,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmLog.java index fd3e681ae..3cd85dd52 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmLog.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmLog.java @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockPalmLog extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmSlab.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmSlab.java index c21f9682d..4e8324dc8 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmSlab.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmSlab.java @@ -10,7 +10,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockPalmSlab extends BlockHalfSlab { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPinkFlower.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPinkFlower.java index 1ac3b10c0..9881f28ca 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPinkFlower.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPinkFlower.java @@ -8,7 +8,7 @@ import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockPinkFlower extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPinkLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPinkLeaves.java index f3d201046..007f71360 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPinkLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPinkLeaves.java @@ -14,7 +14,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPromisedPortal.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPromisedPortal.java index dd3637419..c409c5ef7 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPromisedPortal.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPromisedPortal.java @@ -8,7 +8,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; import tdwp_ftw.biomesop.helpers.TeleporterPromised; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedLeaves.java index af5fe4cfe..5b636fccd 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedLeaves.java @@ -14,7 +14,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRock.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRock.java index 11fc44c3d..254a3bccc 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRock.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRock.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockRedRock extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockBrickSlab.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockBrickSlab.java index dba96bd0b..b6208aae3 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockBrickSlab.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockBrickSlab.java @@ -10,7 +10,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockRedRockBrickSlab extends BlockHalfSlab { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockCobbleSlab.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockCobbleSlab.java index 9ec181e5b..aed85c697 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockCobbleSlab.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockCobbleSlab.java @@ -10,7 +10,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockRedRockCobbleSlab extends BlockHalfSlab { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodLeaves.java index 4b70931a8..7428e3948 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodLeaves.java @@ -15,7 +15,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodLog.java index 821a09b2e..f0a4159c5 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodLog.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodLog.java @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockRedwoodLog extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodSlab.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodSlab.java index 5ad2a1238..5b5a7e8c6 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodSlab.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodSlab.java @@ -10,7 +10,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockRedwoodSlab extends BlockHalfSlab { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockShortGrass.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockShortGrass.java index d458a0258..b4956e889 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockShortGrass.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockShortGrass.java @@ -14,7 +14,7 @@ import net.minecraft.world.ColorizerFoliage; import net.minecraft.world.ColorizerGrass; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import tdwp_ftw.biomesop.declarations.BOPItems; +import tdwp_ftw.biomesop.configuration.BOPItems; public class BlockShortGrass extends BlockFlower { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockSprout.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockSprout.java index c61bd74ad..95fd1daec 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockSprout.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockSprout.java @@ -14,7 +14,7 @@ import net.minecraft.world.ColorizerFoliage; import net.minecraft.world.ColorizerGrass; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import tdwp_ftw.biomesop.declarations.BOPItems; +import tdwp_ftw.biomesop.configuration.BOPItems; public class BlockSprout extends BlockFlower { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockThorn.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockThorn.java index c2ec3161c..2a37ffa39 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockThorn.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockThorn.java @@ -14,7 +14,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockThorn extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWhiteLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWhiteLeaves.java index a1417332d..dfc118c9c 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWhiteLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWhiteLeaves.java @@ -14,7 +14,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowLeaves.java index 3bd016ae1..2e2e50653 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowLeaves.java @@ -15,7 +15,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowLog.java index 23709ed6d..95522230a 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowLog.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowLog.java @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockWillowLog extends Block { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowSlab.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowSlab.java index ec70bb12f..1f8d669c9 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowSlab.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowSlab.java @@ -10,7 +10,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BlockWillowSlab extends BlockHalfSlab { diff --git a/src/minecraft/tdwp_ftw/biomesop/declarations/BOPBiomes.java b/src/minecraft/tdwp_ftw/biomesop/configuration/BOPBiomes.java similarity index 89% rename from src/minecraft/tdwp_ftw/biomesop/declarations/BOPBiomes.java rename to src/minecraft/tdwp_ftw/biomesop/configuration/BOPBiomes.java index 22f21a312..58fc8b071 100644 --- a/src/minecraft/tdwp_ftw/biomesop/declarations/BOPBiomes.java +++ b/src/minecraft/tdwp_ftw/biomesop/configuration/BOPBiomes.java @@ -1,4 +1,4 @@ -package tdwp_ftw.biomesop.declarations; +package tdwp_ftw.biomesop.configuration; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.BiomeManager; @@ -87,95 +87,10 @@ import tdwp_ftw.biomesop.worldtype.WTBiomesOP; import com.google.common.base.Optional; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; -import forestry.api.core.EnumHumidity; -import forestry.api.core.EnumTemperature; public class BOPBiomes { - // Biome declaration -// public static BiomeGenBase alps; -// public static BiomeGenBase arctic; -// public static BiomeGenBase badlands; -// public static BiomeGenBase bambooForest; -// public static BiomeGenBase bayou; -// public static BiomeGenBase birchForest; -// public static BiomeGenBase bog; -// public static BiomeGenBase borealForest; -// public static BiomeGenBase canyon; -// public static BiomeGenBase chaparral; -// public static BiomeGenBase cherryBlossomGrove; -// public static BiomeGenBase coniferousForest; -// public static BiomeGenBase crag; -// public static BiomeGenBase deadForest; -// public static BiomeGenBase deadSwamp; -// public static BiomeGenBase deadlands; -// public static BiomeGenBase deciduousForest; -// public static BiomeGenBase drylands; -// public static BiomeGenBase dunes; -// public static BiomeGenBase fen; -// public static BiomeGenBase field; -// public static BiomeGenBase frostForest; -// public static BiomeGenBase fungiForest; -// public static BiomeGenBase garden; -// public static BiomeGenBase glacier; -// public static BiomeGenBase grassland; -// public static BiomeGenBase grove; -// public static BiomeGenBase heathland; -// public static BiomeGenBase highland; -// public static BiomeGenBase iceSheet; -// public static BiomeGenBase icyHills; -// public static BiomeGenBase jadeCliffs; -// public static BiomeGenBase lushDesert; -// public static BiomeGenBase lushSwamp; -// public static BiomeGenBase mangrove; -// public static BiomeGenBase mapleWoods; -// public static BiomeGenBase marsh; -// public static BiomeGenBase meadow; -// public static BiomeGenBase mesa; -// public static BiomeGenBase moor; -// public static BiomeGenBase mountain; -// public static BiomeGenBase mysticGrove; -// public static BiomeGenBase oasis; -// public static BiomeGenBase ominousWoods; -// public static BiomeGenBase orchard; -// public static BiomeGenBase originValley; -// public static BiomeGenBase outback; -// public static BiomeGenBase pasture; -// public static BiomeGenBase prairie; -// public static BiomeGenBase promisedLand; -// public static BiomeGenBase quagmire; -// public static BiomeGenBase rainforest; -// public static BiomeGenBase redwoodForest; -// public static BiomeGenBase sacredSprings; -// public static BiomeGenBase savanna; -// public static BiomeGenBase scrubland; -// public static BiomeGenBase seasonalForest; -// public static BiomeGenBase shield; -// public static BiomeGenBase shore; -// public static BiomeGenBase shrubland; -// public static BiomeGenBase snowyWoods; -// public static BiomeGenBase spruceWoods; -// public static BiomeGenBase steppe; -// public static BiomeGenBase swampwoods; -// public static BiomeGenBase temperateRainforest; -// public static BiomeGenBase thicket; -// public static BiomeGenBase tropicalRainforest; -// public static BiomeGenBase tropics; -// public static BiomeGenBase tundra; -// public static BiomeGenBase volcano; -// public static BiomeGenBase wasteland; -// public static BiomeGenBase wetland; -// public static BiomeGenBase woodland; -// public static BiomeGenBase plainsNew; -// public static BiomeGenBase desertNew; -// public static BiomeGenBase extremeHillsNew; -// public static BiomeGenBase forestNew; -// public static BiomeGenBase taigaNew; -// public static BiomeGenBase swamplandNew; -// public static BiomeGenBase jungleNew; - public static WTBiomesOP WTBiomesOP; public static void init() @@ -184,20 +99,20 @@ public class BOPBiomes { Biomes.alps = Optional.of((new BiomeGenAlps(BOPConfiguration.alpsID)).setColor(353825).setBiomeName("Alps").func_76733_a(5159473).setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(5.0F, 5.0F)); Biomes.arctic = Optional.of((new BiomeGenArctic(BOPConfiguration.arcticID)).setColor(14090235).setBiomeName("Arctic").setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(0.1F, 0.7F)); Biomes.badlands = Optional.of((new BiomeGenBadlands(BOPConfiguration.badlandsID)).setColor(16421912).setBiomeName("Badlands").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.3F, 0.9F)); - Biomes.bambooForest = Optional.of((new BiomeGenBambooForest(BOPConfiguration.bambooForestID)).setColor(112).setBiomeName("Bamboo Forest").setMinMaxHeight(0.0F, 0.3F)); - Biomes.bayou = Optional.of((new BiomeGenBayou(BOPConfiguration.bayouID)).setColor(522674).setBiomeName("Bayou").func_76733_a(9154376).setMinMaxHeight(-0.3F, 0.2F)); + Biomes.bambooForest = Optional.of((new BiomeGenBambooForest(BOPConfiguration.bambooForestID)).setColor(112).setBiomeName("Bamboo Forest").setMinMaxHeight(0.0F, 0.3F).setTemperatureRainfall(1.2F, 0.9F)); + Biomes.bayou = Optional.of((new BiomeGenBayou(BOPConfiguration.bayouID)).setColor(522674).setBiomeName("Bayou").func_76733_a(9154376).setMinMaxHeight(-0.3F, 0.2F).setTemperatureRainfall(0.5F, 0.9F)); Biomes.birchForest = Optional.of((new BiomeGenBirchForest(BOPConfiguration.birchForestID)).setColor(353825).setBiomeName("Birch Forest").func_76733_a(5159473).setTemperatureRainfall(0.4F, 0.3F)); Biomes.bog = Optional.of((new BiomeGenBog(BOPConfiguration.bogID)).setColor(522674).setBiomeName("Bog").func_76733_a(9154376).setMinMaxHeight(-0.3F, -0.1F).setTemperatureRainfall(0.8F, 0.9F)); Biomes.borealForest = Optional.of((new BiomeGenBorealForest(BOPConfiguration.borealForestID)).setColor(353825).setBiomeName("Boreal Forest").func_76733_a(5159473).setMinMaxHeight(0.0F, 1.0F).setTemperatureRainfall(0.6F, 0.7F)); Biomes.canyon = Optional.of((new BiomeGenCanyon(BOPConfiguration.canyonID)).setColor(9286496).setBiomeName("Canyon").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(3.0F, 5.0F)); Biomes.chaparral = Optional.of((new BiomeGenChaparral(BOPConfiguration.chaparralID)).setColor(9286496).setBiomeName("Chaparral").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.3F, 0.6F)); - Biomes.cherryBlossomGrove = Optional.of((new BiomeGenCherryBlossomGrove(BOPConfiguration.cherryBlossomGroveID)).setColor(9286496).setBiomeName("Cherry Blossom Grove").setMinMaxHeight(0.1F, 0.2F)); + Biomes.cherryBlossomGrove = Optional.of((new BiomeGenCherryBlossomGrove(BOPConfiguration.cherryBlossomGroveID)).setColor(9286496).setBiomeName("Cherry Blossom Grove").setMinMaxHeight(0.1F, 0.2F).setTemperatureRainfall(0.7F, 0.8F)); Biomes.coniferousForest = Optional.of((new BiomeGenConiferousForest(BOPConfiguration.coniferousForestID)).setColor(747097).setBiomeName("Coniferous Forest").func_76733_a(5159473).setTemperatureRainfall(0.3F, 0.4F).setMinMaxHeight(0.1F, 0.8F)); - Biomes.crag = Optional.of((new BiomeGenCrag(BOPConfiguration.cragID)).setColor(9286496).setBiomeName("Crag").setMinMaxHeight(0.0F, 9.9F)); - Biomes.deadForest = Optional.of((new BiomeGenDeadForest(BOPConfiguration.deadForestID)).setColor(522674).setBiomeName("Dead Forest").func_76733_a(9154376).setMinMaxHeight(0.2F, 0.7F)); + Biomes.crag = Optional.of((new BiomeGenCrag(BOPConfiguration.cragID)).setColor(9286496).setBiomeName("Crag").setMinMaxHeight(0.0F, 9.9F).setTemperatureRainfall(0.4F, 0.2F)); + Biomes.deadForest = Optional.of((new BiomeGenDeadForest(BOPConfiguration.deadForestID)).setColor(522674).setBiomeName("Dead Forest").func_76733_a(9154376).setMinMaxHeight(0.2F, 0.7F).setTemperatureRainfall(1.2F, 0.1F)); Biomes.deadSwamp = Optional.of((new BiomeGenDeadSwamp(BOPConfiguration.deadSwampID)).setColor(522674).setBiomeName("Dead Swamp").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.1F).setTemperatureRainfall(0.8F, 0.9F)); - Biomes.deadlands = Optional.of((new BiomeGenDeadlands(BOPConfiguration.deadlandsID)).setColor(522674).setBiomeName("Deadlands").setDisableRain().func_76733_a(9154376).setMinMaxHeight(0.1F, 0.5F)); - Biomes.deciduousForest = Optional.of((new BiomeGenDeciduousForest(BOPConfiguration.deciduousForestID)).setColor(353825).setBiomeName("Deciduous Forest").func_76733_a(5159473)); + Biomes.deadlands = Optional.of((new BiomeGenDeadlands(BOPConfiguration.deadlandsID)).setColor(522674).setBiomeName("Deadlands").setDisableRain().func_76733_a(9154376).setMinMaxHeight(0.1F, 0.5F).setTemperatureRainfall(2.0F, 0.0F)); + Biomes.deciduousForest = Optional.of((new BiomeGenDeciduousForest(BOPConfiguration.deciduousForestID)).setColor(353825).setBiomeName("Deciduous Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F)); Biomes.drylands = Optional.of((new BiomeGenDrylands(BOPConfiguration.drylandsID)).setColor(16421912).setBiomeName("Drylands").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.0F, 0.5F)); Biomes.dunes = Optional.of((new BiomeGenDunes(BOPConfiguration.dunesID)).setColor(13786898).setBiomeName("Dunes").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.5F, 1.3F)); Biomes.fen = Optional.of((new BiomeGenFen(BOPConfiguration.fenID)).setColor(9286496).setBiomeName("Fen").setTemperatureRainfall(0.4F, 0.0F).setMinMaxHeight(-0.2F, 0.1F)); @@ -215,9 +130,9 @@ public class BOPBiomes { Biomes.jadeCliffs = Optional.of((new BiomeGenJadeCliffs(BOPConfiguration.jadeCliffsID)).setColor(14090235).setBiomeName("Jade Cliffs").setTemperatureRainfall(0.5F, 0.1F).setMinMaxHeight(0.1F, 2.0F)); Biomes.lushDesert = Optional.of((new BiomeGenLushDesert(BOPConfiguration.lushDesertID)).setColor(16421912).setBiomeName("Lush Desert").setTemperatureRainfall(0.8F, 0.3F).setMinMaxHeight(0.2F, 0.8F)); Biomes.lushSwamp = Optional.of((new BiomeGenLushSwamp(BOPConfiguration.lushSwampID)).setColor(522674).setBiomeName("Lush Swamp").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.1F).setTemperatureRainfall(0.7F, 1.0F)); - Biomes.mangrove = Optional.of((new BiomeGenMangrove(BOPConfiguration.mangroveID)).setColor(16440917).setBiomeName("Mangrove").setMinMaxHeight(-0.4F, -0.1F)); + Biomes.mangrove = Optional.of((new BiomeGenMangrove(BOPConfiguration.mangroveID)).setColor(16440917).setBiomeName("Mangrove").setMinMaxHeight(-0.4F, -0.1F).setTemperatureRainfall(0.8F, 0.9F)); Biomes.mapleWoods = Optional.of((new BiomeGenMapleWoods(BOPConfiguration.mapleWoodsID)).setColor(747097).setBiomeName("Maple Woods").func_76733_a(5159473).setTemperatureRainfall(0.2F, 0.8F).setMinMaxHeight(0.1F, 0.6F)); - Biomes.marsh = Optional.of((new BiomeGenMarsh(BOPConfiguration.marshID)).setColor(10486015).setBiomeName("Marsh").setMinMaxHeight(-0.5F, 0.0F)); + Biomes.marsh = Optional.of((new BiomeGenMarsh(BOPConfiguration.marshID)).setColor(10486015).setBiomeName("Marsh").setMinMaxHeight(-0.5F, 0.0F).setTemperatureRainfall(0.5F, 0.9F)); Biomes.meadow = Optional.of((new BiomeGenMeadow(BOPConfiguration.meadowID)).setColor(9286496).setBiomeName("Meadow").setTemperatureRainfall(0.7F, 0.7F)); Biomes.mesa = Optional.of((new BiomeGenMesa(BOPConfiguration.mesaID)).setColor(16421912).setBiomeName("Mesa").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.8F, 1.0F)); Biomes.moor = Optional.of((new BiomeGenMoor(BOPConfiguration.moorID)).setColor(16421912).setBiomeName("Moor").setTemperatureRainfall(0.5F, 1.0F).setMinMaxHeight(0.7F, 0.8F)); @@ -234,12 +149,12 @@ public class BOPBiomes { Biomes.quagmire = Optional.of((new BiomeGenQuagmire(BOPConfiguration.quagmireID)).setColor(522674).setBiomeName("Quagmire").func_76733_a(9154376).setMinMaxHeight(-0.1F, 0.3F).setTemperatureRainfall(0.8F, 0.9F)); Biomes.rainforest = Optional.of((new BiomeGenRainforest(BOPConfiguration.rainforestID)).setColor(5470985).setBiomeName("Rainforest").func_76733_a(5470985).setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.7F, 1.8F)); Biomes.redwoodForest = Optional.of((new BiomeGenRedwoodForest(BOPConfiguration.redwoodForestID)).setColor(747097).setBiomeName("Redwood Forest").func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.0F, 0.4F)); - Biomes.sacredSprings = Optional.of((new BiomeGenSacredSprings(BOPConfiguration.sacredSpringsID)).setColor(522674).setBiomeName("Sacred Springs").func_76733_a(9154376).setMinMaxHeight(0.0F, 1.2F).setTemperatureRainfall(0.8F, 0.9F)); - Biomes.savanna = Optional.of((new BiomeGenSavanna(BOPConfiguration.savannaID)).setColor(9286496).setBiomeName("Savanna").setTemperatureRainfall(2.0F, 0.1F).setMinMaxHeight(0.1F, 0.1F)); - Biomes.scrubland = Optional.of((new BiomeGenScrubland(BOPConfiguration.scrublandID)).setColor(9286496).setBiomeName("Scrubland").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.1F, 0.3F)); + Biomes.sacredSprings = Optional.of((new BiomeGenSacredSprings(BOPConfiguration.sacredSpringsID)).setColor(522674).setBiomeName("Sacred Springs").func_76733_a(9154376).setMinMaxHeight(0.0F, 1.2F).setTemperatureRainfall(1.2F, 0.9F)); + Biomes.savanna = Optional.of((new BiomeGenSavanna(BOPConfiguration.savannaID)).setColor(9286496).setBiomeName("Savanna").setTemperatureRainfall(1.5F, 0.1F).setMinMaxHeight(0.1F, 0.1F)); + Biomes.scrubland = Optional.of((new BiomeGenScrubland(BOPConfiguration.scrublandID)).setColor(9286496).setBiomeName("Scrubland").setTemperatureRainfall(1.2F, 0.0F).setMinMaxHeight(0.1F, 0.3F)); Biomes.seasonalForest = Optional.of((new BiomeGenSeasonalForest(BOPConfiguration.seasonalForestID)).setColor(353825).setBiomeName("Seasonal Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.2F, 0.7F)); Biomes.shield = Optional.of((new BiomeGenShield(BOPConfiguration.shieldID)).setColor(522674).setBiomeName("Shield").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.4F).setTemperatureRainfall(0.5F, 0.8F)); - Biomes.shore = Optional.of((new BiomeGenShore(BOPConfiguration.shoreID)).setColor(9286496).setBiomeName("Shore").setMinMaxHeight(-1.0F, 0.4F)); + Biomes.shore = Optional.of((new BiomeGenShore(BOPConfiguration.shoreID)).setColor(9286496).setBiomeName("Shore").setMinMaxHeight(-1.0F, 0.4F).setTemperatureRainfall(0.8F, 0.4F)); Biomes.shrubland = Optional.of((new BiomeGenShrubland(BOPConfiguration.shrublandID)).setColor(9286496).setBiomeName("Shrubland").setMinMaxHeight(0.1F, 0.2F).setTemperatureRainfall(0.6F, 0.0F)); Biomes.snowyWoods = Optional.of((new BiomeGenSnowyWoods(BOPConfiguration.snowyWoodsID)).setColor(522674).setBiomeName("Snowy Woods").func_76733_a(9154376).setEnableSnow().setTemperatureRainfall(0.05F, 0.8F).setMinMaxHeight(0.2F, 0.7F)); Biomes.spruceWoods = Optional.of((new BiomeGenSpruceWoods(BOPConfiguration.spruceWoodsID)).setColor(353825).setBiomeName("Spruce Woods").func_76733_a(5159473).setTemperatureRainfall(0.6F, 0.7F)); @@ -249,11 +164,11 @@ public class BOPBiomes { Biomes.thicket = Optional.of((new BiomeGenThicket(BOPConfiguration.thicketID)).setColor(353825).setBiomeName("Thicket").func_76733_a(5159473).setTemperatureRainfall(0.6F, 0.2F).setMinMaxHeight(0.0F, 0.2F)); Biomes.tropicalRainforest = Optional.of((new BiomeGenTropicalRainforest(BOPConfiguration.tropicalRainforestID)).setColor(9286496).setBiomeName("Tropical Rainforest").setTemperatureRainfall(1.2F, 0.9F).setMinMaxHeight(0.3F, 0.7F)); Biomes.tropics = Optional.of((new BiomeGenTropics(BOPConfiguration.tropicsID)).setColor(9286496).setBiomeName("Tropics").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 0.8F)); - Biomes.tundra = Optional.of((new BiomeGenTundra(BOPConfiguration.tundraID)).setColor(14090235).setBiomeName("Tundra").setEnableSnow().setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(-0.2F, 0.0F)); - Biomes.volcano = Optional.of((new BiomeGenVolcano(BOPConfiguration.volcanoID)).setColor(9286496).setBiomeName("Volcano").setDisableRain().setMinMaxHeight(0.6F, 0.9F)); + Biomes.tundra = Optional.of((new BiomeGenTundra(BOPConfiguration.tundraID)).setColor(14090235).setBiomeName("Tundra").setEnableSnow().setTemperatureRainfall(0.05F, 0.0F).setMinMaxHeight(-0.2F, 0.0F)); + Biomes.volcano = Optional.of((new BiomeGenVolcano(BOPConfiguration.volcanoID)).setColor(9286496).setBiomeName("Volcano").setDisableRain().setMinMaxHeight(0.6F, 0.9F).setTemperatureRainfall(2.0F, 0.0F)); Biomes.wasteland = Optional.of((new BiomeGenWasteland(BOPConfiguration.wastelandID)).setColor(16421912).setBiomeName("Wasteland").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.0F, 0.0F)); Biomes.wetland = Optional.of((new BiomeGenWetland(BOPConfiguration.wetlandID)).setColor(522674).setBiomeName("Wetland").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.4F).setTemperatureRainfall(0.8F, 0.9F)); - Biomes.woodland = Optional.of((new BiomeGenWoodland(BOPConfiguration.woodlandID)).setColor(353825).setBiomeName("Woodland").func_76733_a(5159473).setTemperatureRainfall(2.0F, 0.2F).setMinMaxHeight(0.1F, 0.2F)); + Biomes.woodland = Optional.of((new BiomeGenWoodland(BOPConfiguration.woodlandID)).setColor(353825).setBiomeName("Woodland").func_76733_a(5159473).setTemperatureRainfall(1.7F, 0.2F).setMinMaxHeight(0.1F, 0.2F)); Biomes.plainsNew = Optional.of((new BiomeGenPlainsNew(BOPConfiguration.plainsNewID)).setColor(9286496).setBiomeName("Plains").setTemperatureRainfall(0.8F, 0.4F)); Biomes.desertNew = Optional.of((new BiomeGenDesertNew(BOPConfiguration.desertNewID)).setColor(16421912).setBiomeName("Desert").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.1F, 0.2F)); Biomes.extremeHillsNew = Optional.of((new BiomeGenHillsNew(BOPConfiguration.extremeHillsNewID)).setColor(6316128).setBiomeName("Extreme Hills").setMinMaxHeight(0.3F, 1.5F).setTemperatureRainfall(0.2F, 0.3F)); @@ -262,11 +177,9 @@ public class BOPBiomes { Biomes.swamplandNew = Optional.of((new BiomeGenSwampNew(BOPConfiguration.swamplandNewID)).setColor(522674).setBiomeName("Swampland").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.1F).setTemperatureRainfall(0.8F, 0.9F)); Biomes.jungleNew = Optional.of((new BiomeGenJungleNew(BOPConfiguration.jungleNewID)).setColor(5470985).setBiomeName("Jungle").func_76733_a(5470985).setTemperatureRainfall(1.2F, 0.9F).setMinMaxHeight(0.2F, 0.4F)); - //Initialize new world type WTBiomesOP = new WTBiomesOP(); - //Spawning addSpawnBiome(Biomes.alps); addSpawnBiome(Biomes.arctic); diff --git a/src/minecraft/tdwp_ftw/biomesop/declarations/BOPBlocks.java b/src/minecraft/tdwp_ftw/biomesop/configuration/BOPBlocks.java similarity index 99% rename from src/minecraft/tdwp_ftw/biomesop/declarations/BOPBlocks.java rename to src/minecraft/tdwp_ftw/biomesop/configuration/BOPBlocks.java index aceba9302..a99178519 100644 --- a/src/minecraft/tdwp_ftw/biomesop/declarations/BOPBlocks.java +++ b/src/minecraft/tdwp_ftw/biomesop/configuration/BOPBlocks.java @@ -1,4 +1,4 @@ -package tdwp_ftw.biomesop.declarations; +package tdwp_ftw.biomesop.configuration; import net.minecraft.block.Block; import net.minecraft.block.BlockHalfSlab; diff --git a/src/minecraft/tdwp_ftw/biomesop/declarations/BOPConfiguration.java b/src/minecraft/tdwp_ftw/biomesop/configuration/BOPConfiguration.java similarity index 99% rename from src/minecraft/tdwp_ftw/biomesop/declarations/BOPConfiguration.java rename to src/minecraft/tdwp_ftw/biomesop/configuration/BOPConfiguration.java index 567fda6ae..5b6075525 100644 --- a/src/minecraft/tdwp_ftw/biomesop/declarations/BOPConfiguration.java +++ b/src/minecraft/tdwp_ftw/biomesop/configuration/BOPConfiguration.java @@ -1,4 +1,4 @@ -package tdwp_ftw.biomesop.declarations; +package tdwp_ftw.biomesop.configuration; import java.io.File; import java.util.logging.Level; @@ -799,7 +799,7 @@ public class BOPConfiguration { extremeHillsNewID = config.get("Biome IDs", "Extreme Hills (New) ID", 101).getInt(); jungleNewID = config.get("Biome IDs", "Jungle (New) ID", 102).getInt(); - System.out.println("[BoP] Generated Config!"); + System.out.println("[BiomesOPlenty] Generated Config!"); } catch (Exception e) { diff --git a/src/minecraft/tdwp_ftw/biomesop/declarations/BOPItems.java b/src/minecraft/tdwp_ftw/biomesop/configuration/BOPItems.java similarity index 99% rename from src/minecraft/tdwp_ftw/biomesop/declarations/BOPItems.java rename to src/minecraft/tdwp_ftw/biomesop/configuration/BOPItems.java index 652208e64..02d469a21 100644 --- a/src/minecraft/tdwp_ftw/biomesop/declarations/BOPItems.java +++ b/src/minecraft/tdwp_ftw/biomesop/configuration/BOPItems.java @@ -1,4 +1,4 @@ -package tdwp_ftw.biomesop.declarations; +package tdwp_ftw.biomesop.configuration; import net.minecraft.block.Block; import net.minecraft.item.EnumArmorMaterial; diff --git a/src/minecraft/tdwp_ftw/biomesop/declarations/BOPCrossIntegration.java b/src/minecraft/tdwp_ftw/biomesop/declarations/BOPCrossIntegration.java deleted file mode 100644 index a44f8998f..000000000 --- a/src/minecraft/tdwp_ftw/biomesop/declarations/BOPCrossIntegration.java +++ /dev/null @@ -1,186 +0,0 @@ -package tdwp_ftw.biomesop.declarations; - -import cpw.mods.fml.common.Loader; -import forestry.api.core.EnumHumidity; -import forestry.api.core.EnumTemperature; - -public class BOPCrossIntegration { - - public static void forestryInit() - { - if (Loader.isModLoaded("Forestry")) - { - try { - //Hottest to Coldest - EnumTemperature.hellishBiomeIds.add(BOPConfiguration.deadlandsID); - EnumTemperature.hellishBiomeIds.add(BOPConfiguration.volcanoID); - - EnumHumidity.aridBiomeIds.add(BOPConfiguration.deadlandsID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.volcanoID); - - //Hot - Arid - EnumTemperature.hotBiomeIds.add(BOPConfiguration.badlandsID); - EnumTemperature.hotBiomeIds.add(BOPConfiguration.dunesID); - EnumTemperature.hotBiomeIds.add(BOPConfiguration.mesaID); - EnumTemperature.hotBiomeIds.add(BOPConfiguration.wastelandID); - - EnumHumidity.aridBiomeIds.add(BOPConfiguration.badlandsID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.dunesID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.mesaID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.wastelandID); - - //Hot - Damp - EnumTemperature.hotBiomeIds.add(BOPConfiguration.lushDesertID); - EnumTemperature.hotBiomeIds.add(BOPConfiguration.oasisID); - - EnumHumidity.dampBiomeIds.add(BOPConfiguration.lushDesertID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.oasisID); - - //Warm - Damp - EnumTemperature.warmBiomeIds.add(BOPConfiguration.bambooForestID); - EnumTemperature.warmBiomeIds.add(BOPConfiguration.rainforestID); - EnumTemperature.warmBiomeIds.add(BOPConfiguration.sacredSpringsID); - EnumTemperature.warmBiomeIds.add(BOPConfiguration.temperateRainforestID); - EnumTemperature.warmBiomeIds.add(BOPConfiguration.tropicalRainforestID); - EnumTemperature.warmBiomeIds.add(BOPConfiguration.tropicsID); - - EnumHumidity.dampBiomeIds.add(BOPConfiguration.bambooForestID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.rainforestID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.sacredSpringsID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.temperateRainforestID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.tropicalRainforestID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.tropicsID); - - //Normal - Damp - EnumTemperature.normalBiomeIds.add(BOPConfiguration.bayouID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.bogID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.deadSwampID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.fenID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.fungiForestID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.lushSwampID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.moorID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.ominousWoodsID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.quagmireID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.shieldID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.swampwoodsID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.wetlandID); - - EnumHumidity.dampBiomeIds.add(BOPConfiguration.bayouID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.bogID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.deadSwampID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.fenID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.fungiForestID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.lushSwampID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.moorID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.ominousWoodsID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.quagmireID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.shieldID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.swampwoodsID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.wetlandID); - - //Normal - EnumTemperature.normalBiomeIds.add(BOPConfiguration.birchForestID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.borealForestID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.chaparralID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.cherryBlossomGroveID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.coniferousForestID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.deciduousForestID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.fieldID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.gardenID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.grasslandID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.groveID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.highlandID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.jadeCliffsID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.mapleWoodsID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.meadowID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.mountainID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.mysticGroveID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.orchardID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.prairieID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.redwoodForestID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.seasonalForestID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.spruceWoodsID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.thicketID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.woodlandID); - - EnumHumidity.normalBiomeIds.add(BOPConfiguration.birchForestID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.borealForestID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.chaparralID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.cherryBlossomGroveID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.coniferousForestID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.deciduousForestID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.fieldID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.gardenID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.grasslandID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.groveID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.highlandID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.jadeCliffsID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.mapleWoodsID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.meadowID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.mountainID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.mysticGroveID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.orchardID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.prairieID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.redwoodForestID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.seasonalForestID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.spruceWoodsID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.thicketID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.woodlandID); - - //Normal - Arid - EnumTemperature.normalBiomeIds.add(BOPConfiguration.canyonID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.cragID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.deadForestID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.drylandsID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.heathlandID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.outbackID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.pastureID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.savannaID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.scrublandID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.shrublandID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.steppeID); - - EnumHumidity.aridBiomeIds.add(BOPConfiguration.canyonID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.cragID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.deadForestID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.drylandsID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.heathlandID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.outbackID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.pastureID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.savannaID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.scrublandID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.shrublandID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.steppeID); - - //Cold - EnumTemperature.coldBiomeIds.add(BOPConfiguration.tundraID); - EnumTemperature.coldBiomeIds.add(BOPConfiguration.snowyWoodsID); - - EnumHumidity.normalBiomeIds.add(BOPConfiguration.tundraID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.snowyWoodsID); - - //Icy - EnumTemperature.icyBiomeIds.add(BOPConfiguration.alpsID); - EnumTemperature.icyBiomeIds.add(BOPConfiguration.arcticID); - EnumTemperature.icyBiomeIds.add(BOPConfiguration.frostForestID); - - EnumHumidity.normalBiomeIds.add(BOPConfiguration.alpsID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.arcticID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.frostForestID); - - //Icy - Arid - EnumTemperature.icyBiomeIds.add(BOPConfiguration.glacierID); - EnumTemperature.icyBiomeIds.add(BOPConfiguration.iceSheetID); - EnumTemperature.icyBiomeIds.add(BOPConfiguration.icyHillsID); - - EnumHumidity.aridBiomeIds.add(BOPConfiguration.glacierID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.iceSheetID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.icyHillsID); - } - catch (Exception e) { - System.out.println("[Biomes O' Plenty]: There was an error while integrating Forestry with Biomes O' Plenty!"); - e.printStackTrace(System.err); - } - } - } -} diff --git a/src/minecraft/tdwp_ftw/biomesop/helpers/BonemealUse.java b/src/minecraft/tdwp_ftw/biomesop/helpers/BonemealUse.java index bc7f64a27..5eeb25b47 100644 --- a/src/minecraft/tdwp_ftw/biomesop/helpers/BonemealUse.java +++ b/src/minecraft/tdwp_ftw/biomesop/helpers/BonemealUse.java @@ -21,7 +21,7 @@ import tdwp_ftw.biomesop.blocks.BlockRedwoodSapling; import tdwp_ftw.biomesop.blocks.BlockWhiteSapling; import tdwp_ftw.biomesop.blocks.BlockWillowSapling; import tdwp_ftw.biomesop.blocks.BlockYellowSapling; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class BonemealUse { diff --git a/src/minecraft/tdwp_ftw/biomesop/helpers/ChunkProviderPromised.java b/src/minecraft/tdwp_ftw/biomesop/helpers/ChunkProviderPromised.java index 0eed96d6b..b9c7e1124 100644 --- a/src/minecraft/tdwp_ftw/biomesop/helpers/ChunkProviderPromised.java +++ b/src/minecraft/tdwp_ftw/biomesop/helpers/ChunkProviderPromised.java @@ -19,7 +19,7 @@ import net.minecraftforge.event.Event.Result; import net.minecraftforge.event.terraingen.ChunkProviderEvent; import net.minecraftforge.event.terraingen.PopulateChunkEvent; import net.minecraftforge.event.terraingen.TerrainGen; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class ChunkProviderPromised implements IChunkProvider { diff --git a/src/minecraft/tdwp_ftw/biomesop/helpers/CreativeTabsBOP.java b/src/minecraft/tdwp_ftw/biomesop/helpers/CreativeTabsBOP.java index d46c46452..b89959c5b 100644 --- a/src/minecraft/tdwp_ftw/biomesop/helpers/CreativeTabsBOP.java +++ b/src/minecraft/tdwp_ftw/biomesop/helpers/CreativeTabsBOP.java @@ -2,7 +2,7 @@ package tdwp_ftw.biomesop.helpers; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class CreativeTabsBOP extends CreativeTabs { diff --git a/src/minecraft/tdwp_ftw/biomesop/helpers/TeleporterPromised.java b/src/minecraft/tdwp_ftw/biomesop/helpers/TeleporterPromised.java index 8358908b5..a86449e68 100644 --- a/src/minecraft/tdwp_ftw/biomesop/helpers/TeleporterPromised.java +++ b/src/minecraft/tdwp_ftw/biomesop/helpers/TeleporterPromised.java @@ -14,7 +14,7 @@ import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.PortalPosition; import net.minecraft.world.Teleporter; import net.minecraft.world.WorldServer; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class TeleporterPromised extends Teleporter { diff --git a/src/minecraft/tdwp_ftw/biomesop/helpers/WorldProviderPromised.java b/src/minecraft/tdwp_ftw/biomesop/helpers/WorldProviderPromised.java index 95233a09e..f3f5b87d4 100644 --- a/src/minecraft/tdwp_ftw/biomesop/helpers/WorldProviderPromised.java +++ b/src/minecraft/tdwp_ftw/biomesop/helpers/WorldProviderPromised.java @@ -8,8 +8,8 @@ import net.minecraft.world.WorldProvider; import net.minecraft.world.biome.WorldChunkManagerHell; import net.minecraft.world.chunk.IChunkProvider; import tdwp_ftw.biomesop.api.Biomes; -import tdwp_ftw.biomesop.declarations.BOPBlocks; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; //import tdwp_ftw.biomesop.helpers.WorldChunkManagerPromised; diff --git a/src/minecraft/tdwp_ftw/biomesop/helpers/WorldTypeSize.java b/src/minecraft/tdwp_ftw/biomesop/helpers/WorldTypeSize.java index 0ec0b81fe..de027e3bd 100644 --- a/src/minecraft/tdwp_ftw/biomesop/helpers/WorldTypeSize.java +++ b/src/minecraft/tdwp_ftw/biomesop/helpers/WorldTypeSize.java @@ -2,7 +2,7 @@ package tdwp_ftw.biomesop.helpers; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.terraingen.WorldTypeEvent; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; public class WorldTypeSize { diff --git a/src/minecraft/tdwp_ftw/biomesop/integration/BOPCrossIntegration.java b/src/minecraft/tdwp_ftw/biomesop/integration/BOPCrossIntegration.java new file mode 100644 index 000000000..488d9d565 --- /dev/null +++ b/src/minecraft/tdwp_ftw/biomesop/integration/BOPCrossIntegration.java @@ -0,0 +1,216 @@ +package tdwp_ftw.biomesop.integration; + +import tdwp_ftw.biomesop.configuration.BOPConfiguration; +import cpw.mods.fml.common.Loader; +import forestry.api.core.EnumHumidity; +import forestry.api.core.EnumTemperature; + +public class BOPCrossIntegration { + + public static void init() + { + if (Loader.isModLoaded("Forestry")) + { + try { + forestryInit(); + } + catch (Exception e) { + System.out.println("[BiomesOPlenty] There was an error while integrating Forestry with Biomes O' Plenty!"); + e.printStackTrace(System.err); + } + } + } + + private static void forestryInit() + { + //Hot - Arid + EnumTemperature.hotBiomeIds.add(BOPConfiguration.badlandsID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.deadlandsID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.drylandsID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.dunesID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.mesaID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.steppeID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.volcanoID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.wastelandID); + + EnumHumidity.aridBiomeIds.add(BOPConfiguration.badlandsID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.deadlandsID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.drylandsID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.dunesID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.mesaID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.steppeID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.volcanoID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.wastelandID); + + //Hot - Damp + EnumTemperature.hotBiomeIds.add(BOPConfiguration.oasisID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.promisedLandID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.rainforestID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.tropicsID); + + EnumHumidity.dampBiomeIds.add(BOPConfiguration.oasisID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.promisedLandID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.rainforestID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.tropicsID); + + //Warm - Damp + EnumTemperature.warmBiomeIds.add(BOPConfiguration.bambooForestID); + EnumTemperature.warmBiomeIds.add(BOPConfiguration.sacredSpringsID); + EnumTemperature.warmBiomeIds.add(BOPConfiguration.tropicalRainforestID); + + EnumHumidity.dampBiomeIds.add(BOPConfiguration.bambooForestID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.sacredSpringsID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.tropicalRainforestID); + + //Warm - Arid + EnumTemperature.warmBiomeIds.add(BOPConfiguration.deadForestID); + EnumTemperature.warmBiomeIds.add(BOPConfiguration.savannaID); + EnumTemperature.warmBiomeIds.add(BOPConfiguration.scrublandID); + EnumTemperature.warmBiomeIds.add(BOPConfiguration.woodlandID); + + EnumHumidity.aridBiomeIds.add(BOPConfiguration.deadForestID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.savannaID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.scrublandID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.woodlandID); + + //Normal - Damp + EnumTemperature.normalBiomeIds.add(BOPConfiguration.bayouID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.bogID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.deadSwampID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.fungiForestID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.lushSwampID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.mangroveID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.marshID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.moorID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.mysticGroveID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.ominousWoodsID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.quagmireID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.swampwoodsID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.wetlandID); + + EnumHumidity.dampBiomeIds.add(BOPConfiguration.bayouID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.bogID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.deadSwampID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.fungiForestID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.lushSwampID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.mangroveID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.marshID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.moorID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.mysticGroveID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.ominousWoodsID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.quagmireID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.swampwoodsID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.wetlandID); + + //Normal + EnumTemperature.normalBiomeIds.add(BOPConfiguration.birchForestID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.borealForestID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.canyonID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.chaparralID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.cherryBlossomGroveID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.coniferousForestID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.deciduousForestID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.fieldID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.gardenID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.grasslandID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.groveID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.highlandID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.lushDesertID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.mapleWoodsID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.meadowID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.orchardID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.originValleyID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.pastureID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.prairieID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.redwoodForestID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.seasonalForestID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.shieldID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.shoreID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.spruceWoodsID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.temperateRainforestID); + + EnumHumidity.normalBiomeIds.add(BOPConfiguration.birchForestID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.borealForestID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.canyonID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.chaparralID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.cherryBlossomGroveID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.coniferousForestID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.deciduousForestID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.fieldID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.gardenID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.grasslandID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.groveID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.highlandID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.lushDesertID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.mapleWoodsID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.meadowID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.orchardID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.originValleyID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.pastureID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.prairieID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.redwoodForestID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.seasonalForestID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.shieldID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.shoreID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.spruceWoodsID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.temperateRainforestID); + + //Normal - Arid + EnumTemperature.normalBiomeIds.add(BOPConfiguration.cragID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.fenID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.heathlandID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.jadeCliffsID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.mountainID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.outbackID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.shrublandID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.thicketID); + + EnumHumidity.aridBiomeIds.add(BOPConfiguration.cragID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.fenID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.heathlandID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.jadeCliffsID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.mountainID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.outbackID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.shrublandID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.thicketID); + + //Cold + EnumTemperature.coldBiomeIds.add(BOPConfiguration.tundraID); + EnumTemperature.coldBiomeIds.add(BOPConfiguration.snowyWoodsID); + + EnumHumidity.normalBiomeIds.add(BOPConfiguration.tundraID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.snowyWoodsID); + + //Icy - Arid + EnumTemperature.icyBiomeIds.add(BOPConfiguration.alpsID); + EnumTemperature.icyBiomeIds.add(BOPConfiguration.arcticID); + EnumTemperature.icyBiomeIds.add(BOPConfiguration.frostForestID); + EnumTemperature.icyBiomeIds.add(BOPConfiguration.glacierID); + EnumTemperature.icyBiomeIds.add(BOPConfiguration.iceSheetID); + EnumTemperature.icyBiomeIds.add(BOPConfiguration.icyHillsID); + + EnumHumidity.aridBiomeIds.add(BOPConfiguration.alpsID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.arcticID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.frostForestID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.glacierID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.iceSheetID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.icyHillsID); + + //New vanilla biomes + EnumTemperature.normalBiomeIds.add(BOPConfiguration.plainsNewID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.desertNewID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.extremeHillsNewID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.forestNewID); + EnumTemperature.coldBiomeIds.add(BOPConfiguration.taigaNewID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.swamplandNewID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.jungleNewID); + + EnumHumidity.normalBiomeIds.add(BOPConfiguration.plainsNewID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.desertNewID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.extremeHillsNewID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.forestNewID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.taigaNewID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.swamplandNewID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.jungleNewID); + } +} diff --git a/src/minecraft/tdwp_ftw/biomesop/items/ItemAncientStaff.java b/src/minecraft/tdwp_ftw/biomesop/items/ItemAncientStaff.java index c4382e19c..d9ef27e3e 100644 --- a/src/minecraft/tdwp_ftw/biomesop/items/ItemAncientStaff.java +++ b/src/minecraft/tdwp_ftw/biomesop/items/ItemAncientStaff.java @@ -6,7 +6,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class ItemAncientStaff extends Item { diff --git a/src/minecraft/tdwp_ftw/biomesop/items/ItemBOP.java b/src/minecraft/tdwp_ftw/biomesop/items/ItemBOP.java index ecc86d23d..5992e86e1 100644 --- a/src/minecraft/tdwp_ftw/biomesop/items/ItemBOP.java +++ b/src/minecraft/tdwp_ftw/biomesop/items/ItemBOP.java @@ -5,7 +5,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import tdwp_ftw.biomesop.declarations.BOPItems; +import tdwp_ftw.biomesop.configuration.BOPItems; import tdwp_ftw.biomesop.items.projectiles.EntityMudball; public class ItemBOP extends Item diff --git a/src/minecraft/tdwp_ftw/biomesop/mod_BiomesOPlenty.java b/src/minecraft/tdwp_ftw/biomesop/mod_BiomesOPlenty.java index 77ff91939..ec61dd80b 100644 --- a/src/minecraft/tdwp_ftw/biomesop/mod_BiomesOPlenty.java +++ b/src/minecraft/tdwp_ftw/biomesop/mod_BiomesOPlenty.java @@ -24,16 +24,16 @@ import net.minecraftforge.common.ChestGenHooks; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.MinecraftForge; import tdwp_ftw.biomesop.api.Biomes; -import tdwp_ftw.biomesop.declarations.BOPBiomes; -import tdwp_ftw.biomesop.declarations.BOPBlocks; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; -import tdwp_ftw.biomesop.declarations.BOPCrossIntegration; -import tdwp_ftw.biomesop.declarations.BOPItems; +import tdwp_ftw.biomesop.configuration.BOPBiomes; +import tdwp_ftw.biomesop.configuration.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPItems; import tdwp_ftw.biomesop.helpers.AchievementPickup; import tdwp_ftw.biomesop.helpers.BonemealUse; import tdwp_ftw.biomesop.helpers.CreativeTabsBOP; import tdwp_ftw.biomesop.helpers.WorldProviderPromised; import tdwp_ftw.biomesop.helpers.WorldTypeSize; +import tdwp_ftw.biomesop.integration.BOPCrossIntegration; import tdwp_ftw.biomesop.items.projectiles.DispenserBehaviorMudball; import tdwp_ftw.biomesop.items.projectiles.EntityMudball; import tdwp_ftw.biomesop.mobs.EntityJungleSpider; @@ -77,7 +77,7 @@ public class mod_BiomesOPlenty { File file = new File("resources/mod/streaming/" + soundFile); if (!file.exists()) { - System.out.println("[BoP] " + soundFile + " doesn't exist, creating..."); + System.out.println("[BiomesOPlenty] " + soundFile + " doesn't exist, creating..."); file.getParentFile().mkdirs(); file.createNewFile(); InputStream istream = getClass().getResourceAsStream("/mods/BiomesOPlenty/audio/" + soundFile); @@ -96,7 +96,7 @@ public class mod_BiomesOPlenty } catch (Exception e) { - FMLCommonHandler.instance().getFMLLogger().log(Level.WARNING, "[BoP] Failed to load sound file: " + soundFile); + FMLCommonHandler.instance().getFMLLogger().log(Level.WARNING, "[BiomesOPlenty] Failed to load sound file: " + soundFile); e.printStackTrace(); } } @@ -118,7 +118,7 @@ public class mod_BiomesOPlenty public void load(FMLInitializationEvent event) { - BOPCrossIntegration.forestryInit(); + BOPCrossIntegration.init(); // Achievement declaration if (BOPConfiguration.achievements == true) diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAcacia.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAcacia.java index 1b1939294..458f53e8b 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAcacia.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAcacia.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenAcacia extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAlgae.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAlgae.java index 19d3fa571..068992a93 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAlgae.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAlgae.java @@ -4,7 +4,7 @@ import java.util.Random; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenAlgae extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenApple.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenApple.java index d151ef9ca..5c4669749 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenApple.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenApple.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenApple extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAppleTree1.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAppleTree1.java index 82de2e6ac..29b7084f0 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAppleTree1.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAppleTree1.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenAppleTree1 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAppleTree2.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAppleTree2.java index 64d8ded73..805715230 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAppleTree2.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAppleTree2.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenAppleTree2 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAsh.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAsh.java index e98599605..99541c638 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAsh.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAsh.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenAsh extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAutumn.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAutumn.java index fdc2f4b16..95280c4f4 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAutumn.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAutumn.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenAutumn extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAutumn2.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAutumn2.java index 577a1a6a0..9e3848773 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAutumn2.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenAutumn2.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenAutumn2 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenBambooTree.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenBambooTree.java index 4c9448f7c..ad7766023 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenBambooTree.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenBambooTree.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.util.Direction; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenBambooTree extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenBayou1.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenBayou1.java index fcd8c34d8..fce9c29d7 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenBayou1.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenBayou1.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenBayou1 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenBayou2.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenBayou2.java index 34bdeb385..57bbafef0 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenBayou2.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenBayou2.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenBayou2 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenBayou3.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenBayou3.java index d6cc4ae67..795b0178f 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenBayou3.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenBayou3.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenBayou3 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCanyon.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCanyon.java index 59d6bd417..fa7e18566 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCanyon.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCanyon.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenCanyon extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCanyonShrub.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCanyonShrub.java index d8c38d1ff..142655b2c 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCanyonShrub.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCanyonShrub.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenCanyonShrub extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCanyonTree.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCanyonTree.java index 77f22ecd4..6cd404182 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCanyonTree.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCanyonTree.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenCanyonTree extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCattail.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCattail.java index c2f01e983..cb64e0ac4 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCattail.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCattail.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenCattail extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCherry1.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCherry1.java index fc77e493f..2953493ef 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCherry1.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCherry1.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenCherry1 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCherry2.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCherry2.java index 6e37ab003..8b0d3986e 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCherry2.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCherry2.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenCherry2 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenColumn.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenColumn.java index 7717f4971..6ff8b5af2 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenColumn.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenColumn.java @@ -4,7 +4,7 @@ import java.util.Random; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenColumn extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCypress.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCypress.java index 4c631eb4f..315f81551 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCypress.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCypress.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenCypress extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCypress1.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCypress1.java index 381a5ac17..c92160551 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCypress1.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCypress1.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenCypress1 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCypress2.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCypress2.java index de01192e6..5fcd1e9c2 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCypress2.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenCypress2.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenCypress2 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDarkTree1.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDarkTree1.java index c3444d11e..10f40de33 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDarkTree1.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDarkTree1.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenDarkTree1 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDarkTree2.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDarkTree2.java index 5d9847d8f..fd073b9ea 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDarkTree2.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDarkTree2.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenDarkTree2 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDeadTree.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDeadTree.java index e6c0be83f..33c818857 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDeadTree.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDeadTree.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenDeadTree extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDeadTree2.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDeadTree2.java index c790b31e2..182f4fae6 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDeadTree2.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDeadTree2.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenDeadTree2 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDeadTree3.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDeadTree3.java index f463d0bc8..a7d57856c 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDeadTree3.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDeadTree3.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenDeadTree3 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDeadlands.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDeadlands.java index a87b173df..1ac262f41 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDeadlands.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDeadlands.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenDeadlands extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDesertCactus.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDesertCactus.java index 5995e3cfd..f965ce316 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDesertCactus.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenDesertCactus.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenDesertCactus extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenFen2.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenFen2.java index 69eee254c..e9fa761bc 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenFen2.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenFen2.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenFen2 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenFir1.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenFir1.java index 51d3bc5ef..40aa8430f 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenFir1.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenFir1.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenFir1 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenFir2.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenFir2.java index 32da4b927..a375178fd 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenFir2.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenFir2.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenFir2 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenFir3.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenFir3.java index 1ed9fb6bf..01b8c38f8 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenFir3.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenFir3.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenFir3 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenFungi1.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenFungi1.java index da7ae0726..7e71cbb32 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenFungi1.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenFungi1.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenFungi1 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenFungi3.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenFungi3.java index 8ceca24e3..492088166 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenFungi3.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenFungi3.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenFungi3 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenGiantFlowerRed.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenGiantFlowerRed.java index 0712d0c5f..d9ab2ff29 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenGiantFlowerRed.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenGiantFlowerRed.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenGiantFlowerRed extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenGiantFlowerYellow.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenGiantFlowerYellow.java index 68bd0ff81..8e5ea0577 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenGiantFlowerYellow.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenGiantFlowerYellow.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenGiantFlowerYellow extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenHighGrass.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenHighGrass.java index f7dd9cfb4..4bc9201b2 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenHighGrass.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenHighGrass.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenHighGrass extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMangrove.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMangrove.java index 317ac7a17..d00acae3f 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMangrove.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMangrove.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenMangrove extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMaple.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMaple.java index b4bf47539..2bc329c52 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMaple.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMaple.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenMaple extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMarsh.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMarsh.java index 371aa9873..0199c2061 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMarsh.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMarsh.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenMarsh extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMesa.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMesa.java index 1bdcf544d..c7679e14e 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMesa.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMesa.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenMesa extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMoss.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMoss.java index fa317dd7c..85d7a60a2 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMoss.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMoss.java @@ -6,7 +6,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.Facing; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenMoss extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMud.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMud.java index 95ffe7a5c..679cc50ed 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMud.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMud.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenMud extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMystic1.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMystic1.java index 578c0bc20..65f3013ff 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMystic1.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMystic1.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenMystic1 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMystic2.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMystic2.java index 307586507..9b88a8b7e 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMystic2.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenMystic2.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenMystic2 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOasis.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOasis.java index f0bfe3efb..6dd9cee08 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOasis.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOasis.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenOasis extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOminous1.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOminous1.java index 227af5921..610380c7f 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOminous1.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOminous1.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenOminous1 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOminous2.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOminous2.java index 4e3c756c5..2bce0bee9 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOminous2.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOminous2.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenOminous2 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOriginTree.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOriginTree.java index 4e7c405e3..eb748ef91 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOriginTree.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOriginTree.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenOriginTree extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOutback.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOutback.java index 392e8ddd0..afd1b79e3 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOutback.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOutback.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenOutback extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOutbackShrub.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOutbackShrub.java index f23dae2f0..59f1a94db 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOutbackShrub.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOutbackShrub.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenOutbackShrub extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOutbackTree.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOutbackTree.java index d96cee6fb..0e5415ae9 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOutbackTree.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenOutbackTree.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenOutbackTree extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPalm1.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPalm1.java index 66f40a05c..ca16b81ac 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPalm1.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPalm1.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenPalm1 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPalm2.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPalm2.java index 9f323f327..a016e183d 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPalm2.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPalm2.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenPalm2 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPalmTree.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPalmTree.java index da14db1c8..a094a0dc5 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPalmTree.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPalmTree.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenPalmTree extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPalmTree1.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPalmTree1.java index 9f4066d8d..52161eba0 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPalmTree1.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPalmTree1.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenPalmTree1 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPalmTree2.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPalmTree2.java index 6828819f4..45859be2d 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPalmTree2.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPalmTree2.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenPalmTree2 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPalmTree3.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPalmTree3.java index 20b745fab..f2ec548c2 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPalmTree3.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPalmTree3.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenPalmTree3 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPromisedLandPortal.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPromisedLandPortal.java index 36f172264..70a68caf8 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPromisedLandPortal.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPromisedLandPortal.java @@ -4,7 +4,7 @@ import java.util.Random; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenPromisedLandPortal extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPromisedShrub.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPromisedShrub.java index b8fa4c93d..b4d77e67b 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPromisedShrub.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPromisedShrub.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenPromisedShrub extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPromisedTree.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPromisedTree.java index 68544badf..4592d3e96 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPromisedTree.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPromisedTree.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenPromisedTree extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPromisedTree2.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPromisedTree2.java index 651f36c66..5ca028cc0 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPromisedTree2.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPromisedTree2.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenPromisedTree2 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPromisedTree3.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPromisedTree3.java index 626bdcf0f..aea66d965 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPromisedTree3.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPromisedTree3.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenPromisedTree3 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPromisedWillow.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPromisedWillow.java index 56ce7c3b3..6b133131b 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPromisedWillow.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenPromisedWillow.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenPromisedWillow extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenQuagmire.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenQuagmire.java index 63f18c440..297c88755 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenQuagmire.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenQuagmire.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenQuagmire extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenQuicksand.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenQuicksand.java index ed7e336a4..55d8c687b 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenQuicksand.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenQuicksand.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenQuicksand extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenQuicksand2.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenQuicksand2.java index ae7faeca5..c0254a499 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenQuicksand2.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenQuicksand2.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenQuicksand2 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenRedwood1.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenRedwood1.java index b16040162..aab868bd1 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenRedwood1.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenRedwood1.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenRedwood1 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenRedwood2.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenRedwood2.java index 157611f2f..fe8ea6f45 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenRedwood2.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenRedwood2.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenRedwood2 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenRedwoodTree.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenRedwoodTree.java index 5829f314b..a3e6fa0cd 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenRedwoodTree.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenRedwoodTree.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.util.Direction; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenRedwoodTree extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenRedwoodTree2.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenRedwoodTree2.java index 21bb4525b..be2552cbb 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenRedwoodTree2.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenRedwoodTree2.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.util.Direction; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenRedwoodTree2 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenSmolderingGrass.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenSmolderingGrass.java index 2b1b062cb..e27f4319a 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenSmolderingGrass.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenSmolderingGrass.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenSmolderingGrass extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenSpire.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenSpire.java index d2be50447..a9992ca11 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenSpire.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenSpire.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenSpire extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenSprout.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenSprout.java index e3d509537..e000ac303 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenSprout.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenSprout.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenSprout extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenTaiga3.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenTaiga3.java index 52bf38fd2..9c1f33af4 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenTaiga3.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenTaiga3.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenTaiga3 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenTaiga4.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenTaiga4.java index 9813923a8..db6ba385d 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenTaiga4.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenTaiga4.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenTaiga4 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenTaiga9.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenTaiga9.java index 71946fd91..5cefe787e 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenTaiga9.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenTaiga9.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenTaiga9 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenVolcano.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenVolcano.java index 421a196df..1345082bb 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenVolcano.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenVolcano.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenVolcano extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenWillow.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenWillow.java index 80a7cdc81..5bcb2d0f2 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenWillow.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenWillow.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenWillow extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenWillow1.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenWillow1.java index 9f053cd45..b0acca5de 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenWillow1.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenWillow1.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenWillow1 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenWillow2.java b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenWillow2.java index 793fb12ab..28c390973 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenWillow2.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldgen/WorldGenWillow2.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.configuration.BOPBlocks; public class WorldGenWillow2 extends WorldGenerator { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldtype/ChunkProviderBOP.java b/src/minecraft/tdwp_ftw/biomesop/worldtype/ChunkProviderBOP.java index 2d8eaf0ed..890bc469a 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldtype/ChunkProviderBOP.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldtype/ChunkProviderBOP.java @@ -40,7 +40,7 @@ import net.minecraftforge.event.Event.Result; import net.minecraftforge.event.terraingen.ChunkProviderEvent; import net.minecraftforge.event.terraingen.PopulateChunkEvent; import net.minecraftforge.event.terraingen.TerrainGen; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; public class ChunkProviderBOP implements IChunkProvider { diff --git a/src/minecraft/tdwp_ftw/biomesop/worldtype/WTBiomesOP.java b/src/minecraft/tdwp_ftw/biomesop/worldtype/WTBiomesOP.java index 7c833e198..79f69eb87 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldtype/WTBiomesOP.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldtype/WTBiomesOP.java @@ -2,7 +2,7 @@ package tdwp_ftw.biomesop.worldtype; import net.minecraft.world.biome.BiomeGenBase; import tdwp_ftw.biomesop.api.Biomes; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import tdwp_ftw.biomesop.configuration.BOPConfiguration; import com.google.common.base.Optional;