etc/BiomesOPlenty
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Some repackaging

Browse source
This commit is contained in:
Adubbz 2013-09-14 20:16:39 +10:00
parent b2cf7a6a63
commit bf2fda08d4
188 changed files with 2624 additions and 2536 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/biomesoplenty/BiomesOPlenty.java
View file

@ -5,13 +5,15 @@ import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import biomesoplenty.configuration.BOPBiomes; import biomesoplenty.configuration.BOPBiomes;
import biomesoplenty.configuration.BOPBlocks; import biomesoplenty.configuration.BOPBlocks;
import biomesoplenty.configuration.BOPConfiguration;
import biomesoplenty.configuration.BOPCrafting; import biomesoplenty.configuration.BOPCrafting;
import biomesoplenty.configuration.BOPEntities; import biomesoplenty.configuration.BOPEntities;
import biomesoplenty.configuration.BOPFluids; import biomesoplenty.configuration.BOPFluids;
import biomesoplenty.configuration.BOPItems; import biomesoplenty.configuration.BOPItems;
import biomesoplenty.configuration.BOPPotions; import biomesoplenty.configuration.BOPPotions;
import biomesoplenty.configuration.BOPVanillaCompat; import biomesoplenty.configuration.BOPVanillaCompat;
import biomesoplenty.configuration.configfile.BOPConfiguration;
import biomesoplenty.configuration.configfile.BOPConfigurationIDs;
import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.handlers.BOPCraftHandler; import biomesoplenty.handlers.BOPCraftHandler;
import biomesoplenty.handlers.BonemealHandler; import biomesoplenty.handlers.BonemealHandler;
import biomesoplenty.handlers.BreakSpeedHandler; import biomesoplenty.handlers.BreakSpeedHandler;
@ -79,7 +81,7 @@ public class BiomesOPlenty
} }
// Achievement declaration // Achievement declaration
if (BOPConfiguration.Misc.achievements) if (BOPConfigurationMisc.achievements)
{ {
AchievementHelper.init(); AchievementHelper.init();
} }
@ -115,8 +117,8 @@ public class BiomesOPlenty
// DimensionManager.unregisterProviderType(-1); // DimensionManager.unregisterProviderType(-1);
// DimensionManager.registerProviderType(-1, WorldProviderBOPhell.class, true); // DimensionManager.registerProviderType(-1, WorldProviderBOPhell.class, true);
// } // }
DimensionManager.registerProviderType(BOPConfiguration.IDs.promisedLandDimID, WorldProviderPromised.class, false); DimensionManager.registerProviderType(BOPConfigurationIDs.promisedLandDimID, WorldProviderPromised.class, false);
DimensionManager.registerDimension(BOPConfiguration.IDs.promisedLandDimID, BOPConfiguration.IDs.promisedLandDimID); DimensionManager.registerDimension(BOPConfigurationIDs.promisedLandDimID, BOPConfigurationIDs.promisedLandDimID);
BOPCrossIntegration.init(); BOPCrossIntegration.init();
} }

388
common/biomesoplenty/biomes/BiomeDecoratorBOP.java
View file

@ -44,7 +44,7 @@ import net.minecraftforge.event.terraingen.OreGenEvent;
import net.minecraftforge.event.terraingen.TerrainGen; import net.minecraftforge.event.terraingen.TerrainGen;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.api.Fluids; import biomesoplenty.api.Fluids;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationTerrainGen;
import biomesoplenty.worldgen.WorldGenAlgae; import biomesoplenty.worldgen.WorldGenAlgae;
import biomesoplenty.worldgen.WorldGenAsh; import biomesoplenty.worldgen.WorldGenAsh;
import biomesoplenty.worldgen.WorldGenBOPBush; import biomesoplenty.worldgen.WorldGenBOPBush;
@ -67,8 +67,8 @@ import biomesoplenty.worldgen.WorldGenCrystal1;
import biomesoplenty.worldgen.WorldGenCrystal2; import biomesoplenty.worldgen.WorldGenCrystal2;
import biomesoplenty.worldgen.WorldGenDesertCactus; import biomesoplenty.worldgen.WorldGenDesertCactus;
import biomesoplenty.worldgen.WorldGenDriedDirt; import biomesoplenty.worldgen.WorldGenDriedDirt;
import biomesoplenty.worldgen.WorldGenGravel;
import biomesoplenty.worldgen.WorldGenGrave; import biomesoplenty.worldgen.WorldGenGrave;
import biomesoplenty.worldgen.WorldGenGravel;
import biomesoplenty.worldgen.WorldGenHighCattail; import biomesoplenty.worldgen.WorldGenHighCattail;
import biomesoplenty.worldgen.WorldGenHighGrass; import biomesoplenty.worldgen.WorldGenHighGrass;
import biomesoplenty.worldgen.WorldGenKelp; import biomesoplenty.worldgen.WorldGenKelp;
@ -85,7 +85,6 @@ import biomesoplenty.worldgen.WorldGenOasis;
import biomesoplenty.worldgen.WorldGenOutback; import biomesoplenty.worldgen.WorldGenOutback;
import biomesoplenty.worldgen.WorldGenPit; import biomesoplenty.worldgen.WorldGenPit;
import biomesoplenty.worldgen.WorldGenPotatoes; import biomesoplenty.worldgen.WorldGenPotatoes;
import biomesoplenty.worldgen.WorldGenPromisedWillow;
import biomesoplenty.worldgen.WorldGenPumpkinAlt; import biomesoplenty.worldgen.WorldGenPumpkinAlt;
import biomesoplenty.worldgen.WorldGenQuagmire; import biomesoplenty.worldgen.WorldGenQuagmire;
import biomesoplenty.worldgen.WorldGenQuicksand; import biomesoplenty.worldgen.WorldGenQuicksand;
@ -97,281 +96,282 @@ import biomesoplenty.worldgen.WorldGenSponge;
import biomesoplenty.worldgen.WorldGenSprout; import biomesoplenty.worldgen.WorldGenSprout;
import biomesoplenty.worldgen.WorldGenSteppe; import biomesoplenty.worldgen.WorldGenSteppe;
import biomesoplenty.worldgen.WorldGenSunflower; import biomesoplenty.worldgen.WorldGenSunflower;
import biomesoplenty.worldgen.tree.WorldGenPromisedWillow;
public class BiomeDecoratorBOP extends BiomeDecorator public class BiomeDecoratorBOP extends BiomeDecorator
{ {
/** The world the BiomeDecorator is currently decorating */ /** The world the BiomeDecorator is currently decorating */
protected World currentWorld; public World currentWorld;
/** The Biome Decorator's random number generator. */ /** The Biome Decorator's random number generator. */
protected Random randomGenerator; public Random randomGenerator;
/** The X-coordinate of the chunk currently being decorated */ /** The X-coordinate of the chunk currently being decorated */
protected int chunk_X; public int chunk_X;
/** The Z-coordinate of the chunk currently being decorated */ /** The Z-coordinate of the chunk currently being decorated */
protected int chunk_Z; public int chunk_Z;
/** The biome generator object. */ /** The biome generator object. */
protected BiomeGenBase biome; public BiomeGenBase biome;
/** The clay generator. */ /** The clay generator. */
protected WorldGenerator clayGen = new WorldGenClay(4); public WorldGenerator clayGen = new WorldGenClay(4);
/** The sand generator. */ /** The sand generator. */
protected WorldGenerator sandGen; public WorldGenerator sandGen;
protected WorldGenerator mudGen; public WorldGenerator mudGen;
protected WorldGenerator oasesGen; public WorldGenerator oasesGen;
/** The gravel generator. */ /** The gravel generator. */
protected WorldGenerator gravelAsSandGen; public WorldGenerator gravelAsSandGen;
/** The dirt generator. */ /** The dirt generator. */
protected WorldGenerator dirtGen; public WorldGenerator dirtGen;
protected WorldGenerator gravelGen; public WorldGenerator gravelGen;
protected WorldGenerator gravelShoreGen; public WorldGenerator gravelShoreGen;
protected WorldGenerator ashGen; public WorldGenerator ashGen;
protected WorldGenerator grassMesaGen; public WorldGenerator grassMesaGen;
protected WorldGenerator sandMesaGen; public WorldGenerator sandMesaGen;
protected WorldGenerator myceliumGen; public WorldGenerator myceliumGen;
protected WorldGenerator sandInGrassGen; public WorldGenerator sandInGrassGen;
protected WorldGenerator stoneInGrassGen; public WorldGenerator stoneInGrassGen;
protected WorldGenerator stoneInGrassGen2; public WorldGenerator stoneInGrassGen2;
protected WorldGenerator sandInStoneGen; public WorldGenerator sandInStoneGen;
protected WorldGenerator driedDirtInSandGen; public WorldGenerator driedDirtInSandGen;
protected WorldGenerator clayInClayGen; public WorldGenerator clayInClayGen;
protected WorldGenerator clayInClay2Gen; public WorldGenerator clayInClay2Gen;
protected WorldGenerator clayInStoneGen; public WorldGenerator clayInStoneGen;
protected WorldGenerator clayInStone2Gen; public WorldGenerator clayInStone2Gen;
protected WorldGenerator quagmireGen; public WorldGenerator quagmireGen;
protected WorldGenerator quicksandGen; public WorldGenerator quicksandGen;
protected WorldGenerator spongeGen; public WorldGenerator spongeGen;
protected WorldGenerator canyonGen; public WorldGenerator canyonGen;
protected WorldGenerator cloudGen; public WorldGenerator cloudGen;
protected WorldGenerator coalGen; public WorldGenerator coalGen;
protected WorldGenerator ironGen; public WorldGenerator ironGen;
/** Field that holds gold WorldGenMinable */ /** Field that holds gold WorldGenMinable */
protected WorldGenerator goldGen; public WorldGenerator goldGen;
/** Field that holds redstone WorldGenMinable */ /** Field that holds redstone WorldGenMinable */
protected WorldGenerator redstoneGen; public WorldGenerator redstoneGen;
/** Field that holds diamond WorldGenMinable */ /** Field that holds diamond WorldGenMinable */
protected WorldGenerator diamondGen; public WorldGenerator diamondGen;
/** Field that holds Lapis WorldGenMinable */ /** Field that holds Lapis WorldGenMinable */
protected WorldGenerator lapisGen; public WorldGenerator lapisGen;
/** Field that holds one of the plantYellow WorldGenFlowers */ /** Field that holds one of the plantYellow WorldGenFlowers */
protected WorldGenerator plantYellowGen; public WorldGenerator plantYellowGen;
protected WorldGenerator dandelionGen; public WorldGenerator dandelionGen;
/** Field that holds one of the plantRed WorldGenFlowers */ /** Field that holds one of the plantRed WorldGenFlowers */
protected WorldGenerator plantRedGen; public WorldGenerator plantRedGen;
protected WorldGenerator plantWhiteGen; public WorldGenerator plantWhiteGen;
protected WorldGenerator plantBlueGen; public WorldGenerator plantBlueGen;
protected WorldGenerator plantPurpleGen; public WorldGenerator plantPurpleGen;
protected WorldGenerator plantPinkGen; public WorldGenerator plantPinkGen;
protected WorldGenerator plantOrangeGen; public WorldGenerator plantOrangeGen;
protected WorldGenerator plantTinyGen; public WorldGenerator plantTinyGen;
protected WorldGenerator plantGlowGen; public WorldGenerator plantGlowGen;
protected WorldGenerator plantDeadGen; public WorldGenerator plantDeadGen;
protected WorldGenerator plantDesertGen; public WorldGenerator plantDesertGen;
protected WorldGenerator cattailGen; public WorldGenerator cattailGen;
protected WorldGenerator highCattailGen; public WorldGenerator highCattailGen;
protected WorldGenerator outbackGen; public WorldGenerator outbackGen;
protected WorldGenerator smolderingGrassGen; public WorldGenerator smolderingGrassGen;
protected WorldGenerator canyonGrassGen; public WorldGenerator canyonGrassGen;
protected WorldGenerator netherGrassGen; public WorldGenerator netherGrassGen;
protected WorldGenerator netherWartGen; public WorldGenerator netherWartGen;
protected WorldGenerator steppeGen; public WorldGenerator steppeGen;
protected WorldGenerator cobwebGen; public WorldGenerator cobwebGen;
protected WorldGenerator thornGen; public WorldGenerator thornGen;
protected WorldGenerator toadstoolGen; public WorldGenerator toadstoolGen;
protected WorldGenerator portobelloGen; public WorldGenerator portobelloGen;
protected WorldGenerator blueMilkGen; public WorldGenerator blueMilkGen;
protected WorldGenerator glowshroomGen; public WorldGenerator glowshroomGen;
protected WorldGenerator highGrassGen; public WorldGenerator highGrassGen;
protected WorldGenerator carrotGen; public WorldGenerator carrotGen;
protected WorldGenerator potatoGen; public WorldGenerator potatoGen;
protected WorldGenerator sproutGen; public WorldGenerator sproutGen;
protected WorldGenerator bushGen; public WorldGenerator bushGen;
protected WorldGenerator berryBushGen; public WorldGenerator berryBushGen;
protected WorldGenerator tinyCactusGen; public WorldGenerator tinyCactusGen;
protected WorldGenerator aloeGen; public WorldGenerator aloeGen;
protected WorldGenerator deathbloomGen; public WorldGenerator deathbloomGen;
protected WorldGenerator hydrangeaGen; public WorldGenerator hydrangeaGen;
protected WorldGenerator violetGen; public WorldGenerator violetGen;
protected WorldGenerator duneGrassGen; public WorldGenerator duneGrassGen;
protected WorldGenerator holyTallGrassGen; public WorldGenerator holyTallGrassGen;
protected WorldGenerator desertSproutsGen; public WorldGenerator desertSproutsGen;
protected WorldGenerator promisedWillowGen; public WorldGenerator promisedWillowGen;
protected WorldGenerator netherVineGen; public WorldGenerator netherVineGen;
protected WorldGenerator poisonIvyGen; public WorldGenerator poisonIvyGen;
protected WorldGenerator sunflowerGen; public WorldGenerator sunflowerGen;
protected WorldGenerator rainbowflowerGen; public WorldGenerator rainbowflowerGen;
protected WorldGenerator crystalGen; public WorldGenerator crystalGen;
protected WorldGenerator crystalGen2; public WorldGenerator crystalGen2;
protected WorldGenerator kelpGen; public WorldGenerator kelpGen;
protected WorldGenerator shortKelpGen; public WorldGenerator shortKelpGen;
protected WorldGenerator graveGen; public WorldGenerator graveGen;
protected WorldGenerator pumpkinAltGen; public WorldGenerator pumpkinAltGen;
protected WorldGenerator coralGen; public WorldGenerator coralGen;
protected WorldGenerator boneSpineGen; public WorldGenerator boneSpineGen;
protected WorldGenerator boneSpine2Gen; public WorldGenerator boneSpine2Gen;
/** Field that holds mushroomBrown WorldGenFlowers */ /** Field that holds mushroomBrown WorldGenFlowers */
protected WorldGenerator mushroomBrownGen; public WorldGenerator mushroomBrownGen;
/** Field that holds mushroomRed WorldGenFlowers */ /** Field that holds mushroomRed WorldGenFlowers */
protected WorldGenerator mushroomRedGen; public WorldGenerator mushroomRedGen;
/** Field that holds big mushroom generator */ /** Field that holds big mushroom generator */
protected WorldGenerator bigMushroomGen; public WorldGenerator bigMushroomGen;
/** Field that holds WorldGenReed */ /** Field that holds WorldGenReed */
protected WorldGenerator reedGen; public WorldGenerator reedGen;
protected WorldGenerator reedBOPGen; public WorldGenerator reedBOPGen;
/** Field that holds WorldGenCactus */ /** Field that holds WorldGenCactus */
protected WorldGenerator cactusGen; public WorldGenerator cactusGen;
protected WorldGenerator desertCactusGen; public WorldGenerator desertCactusGen;
/** The water lily generation! */ /** The water lily generation! */
protected WorldGenerator waterlilyGen; public WorldGenerator waterlilyGen;
protected WorldGenerator lilyflowerGen; public WorldGenerator lilyflowerGen;
protected WorldGenerator algaeGen; public WorldGenerator algaeGen;
protected WorldGenerator pitGen; public WorldGenerator pitGen;
/** Amount of waterlilys per chunk. */ /** Amount of waterlilys per chunk. */
protected int waterlilyPerChunk; public int waterlilyPerChunk;
protected int lilyflowersPerChunk; public int lilyflowersPerChunk;
protected int algaePerChunk; public int algaePerChunk;
protected int crystalsPerChunk; public int crystalsPerChunk;
protected int crystals2PerChunk; public int crystals2PerChunk;
/** /**
* The number of trees to attempt to generate per chunk. Up to 10 in forests, none in deserts. * The number of trees to attempt to generate per chunk. Up to 10 in forests, none in deserts.
*/ */
//protected int treesPerChunk; fix for bigtrees mod compatibility -ted80 //public int treesPerChunk; fix for bigtrees mod compatibility -ted80
/** /**
* The number of yellow flower patches to generate per chunk. The game generates much less than this number, since * The number of yellow flower patches to generate per chunk. The game generates much less than this number, since
* it attempts to generate them at a random altitude. * it attempts to generate them at a random altitude.
*/ */
protected int flowersPerChunk; public int flowersPerChunk;
protected int whiteFlowersPerChunk; public int whiteFlowersPerChunk;
protected int blueFlowersPerChunk; public int blueFlowersPerChunk;
protected int purpleFlowersPerChunk; public int purpleFlowersPerChunk;
protected int pinkFlowersPerChunk; public int pinkFlowersPerChunk;
protected int orangeFlowersPerChunk; public int orangeFlowersPerChunk;
protected int tinyFlowersPerChunk; public int tinyFlowersPerChunk;
protected int glowFlowersPerChunk; public int glowFlowersPerChunk;
protected int deadGrassPerChunk; public int deadGrassPerChunk;
protected int desertGrassPerChunk; public int desertGrassPerChunk;
protected int cattailsPerChunk; public int cattailsPerChunk;
protected int highCattailsPerChunk; public int highCattailsPerChunk;
protected int carrotsPerChunk; public int carrotsPerChunk;
protected int potatoesPerChunk; public int potatoesPerChunk;
protected int thornsPerChunk; public int thornsPerChunk;
protected int toadstoolsPerChunk; public int toadstoolsPerChunk;
protected int portobellosPerChunk; public int portobellosPerChunk;
protected int blueMilksPerChunk; public int blueMilksPerChunk;
protected int glowshroomsPerChunk; public int glowshroomsPerChunk;
protected int sproutsPerChunk; public int sproutsPerChunk;
protected int bushesPerChunk; public int bushesPerChunk;
protected int berryBushesPerChunk; public int berryBushesPerChunk;
protected int tinyCactiPerChunk; public int tinyCactiPerChunk;
protected int aloePerChunk; public int aloePerChunk;
protected int deathbloomsPerChunk; public int deathbloomsPerChunk;
protected int hydrangeasPerChunk; public int hydrangeasPerChunk;
protected int violetsPerChunk; public int violetsPerChunk;
protected int duneGrassPerChunk; public int duneGrassPerChunk;
protected int holyTallGrassPerChunk; public int holyTallGrassPerChunk;
protected int desertSproutsPerChunk; public int desertSproutsPerChunk;
protected int promisedWillowPerChunk; public int promisedWillowPerChunk;
protected int netherVinesPerChunk; public int netherVinesPerChunk;
protected int poisonIvyPerChunk; public int poisonIvyPerChunk;
protected int sunflowersPerChunk; public int sunflowersPerChunk;
protected int rainbowflowersPerChunk; public int rainbowflowersPerChunk;
protected int cobwebsPerChunk; public int cobwebsPerChunk;
protected int kelpPerChunk; public int kelpPerChunk;
protected int kelpThickPerChunk; public int kelpThickPerChunk;
protected int shortKelpPerChunk; public int shortKelpPerChunk;
protected int gravesPerChunk; public int gravesPerChunk;
protected int pumpkinsPerChunk; public int pumpkinsPerChunk;
protected int coralPerChunk; public int coralPerChunk;
protected int boneSpinesPerChunk; public int boneSpinesPerChunk;
protected int boneSpines2PerChunk; public int boneSpines2PerChunk;
/** The amount of tall grass to generate per chunk. */ /** The amount of tall grass to generate per chunk. */
protected int grassPerChunk; public int grassPerChunk;
protected int outbackPerChunk; public int outbackPerChunk;
protected int smolderingGrassPerChunk; public int smolderingGrassPerChunk;
protected int netherGrassPerChunk; public int netherGrassPerChunk;
protected int netherWartPerChunk; public int netherWartPerChunk;
protected int canyonGrassPerChunk; public int canyonGrassPerChunk;
protected int steppePerChunk; public int steppePerChunk;
protected int highGrassPerChunk; public int highGrassPerChunk;
/** /**
* The number of dead bushes to generate per chunk. Used in deserts and swamps. * The number of dead bushes to generate per chunk. Used in deserts and swamps.
*/ */
protected int deadBushPerChunk; public int deadBushPerChunk;
/** /**
* The number of extra mushroom patches per chunk. It generates 1/4 this number in brown mushroom patches, and 1/8 * The number of extra mushroom patches per chunk. It generates 1/4 this number in brown mushroom patches, and 1/8
* this number in red mushroom patches. These mushrooms go beyond the default base number of mushrooms. * this number in red mushroom patches. These mushrooms go beyond the default base number of mushrooms.
*/ */
protected int mushroomsPerChunk; public int mushroomsPerChunk;
/** /**
* The number of reeds to generate per chunk. Reeds won't generate if the randomly selected placement is unsuitable. * The number of reeds to generate per chunk. Reeds won't generate if the randomly selected placement is unsuitable.
*/ */
protected int reedsPerChunk; public int reedsPerChunk;
protected int reedsBOPPerChunk; public int reedsBOPPerChunk;
/** /**
* The number of cactus plants to generate per chunk. Cacti only work on sand. * The number of cactus plants to generate per chunk. Cacti only work on sand.
*/ */
protected int cactiPerChunk; public int cactiPerChunk;
protected int desertCactiPerChunk; public int desertCactiPerChunk;
/** /**
* The number of sand patches to generate per chunk. Sand patches only generate when part of it is underwater. * The number of sand patches to generate per chunk. Sand patches only generate when part of it is underwater.
*/ */
protected int sandPerChunk; public int sandPerChunk;
protected int oasesPerChunk; public int oasesPerChunk;
protected int mudPerChunk; public int mudPerChunk;
protected int gravelPerChunk; public int gravelPerChunk;
/** /**
* The number of sand patches to generate per chunk. Sand patches only generate when part of it is underwater. There * The number of sand patches to generate per chunk. Sand patches only generate when part of it is underwater. There
* appear to be two separate fields for this. * appear to be two separate fields for this.
*/ */
protected int sandPerChunk2; public int sandPerChunk2;
protected int oasesPerChunk2; public int oasesPerChunk2;
protected int mudPerChunk2; public int mudPerChunk2;
protected int gravelPerChunk2; public int gravelPerChunk2;
/** /**
* The number of clay patches to generate per chunk. Only generates when part of it is underwater. * The number of clay patches to generate per chunk. Only generates when part of it is underwater.
*/ */
protected int clayPerChunk; public int clayPerChunk;
/** Amount of big mushrooms per chunk */ /** Amount of big mushrooms per chunk */
protected int bigMushroomsPerChunk; public int bigMushroomsPerChunk;
protected int rosesPerChunk; public int rosesPerChunk;
protected int pondsPerChunk; public int pondsPerChunk;
protected int waterLakesPerChunk; public int waterLakesPerChunk;
protected int lavaLakesPerChunk; public int lavaLakesPerChunk;
protected int netherLavaPerChunk; public int netherLavaPerChunk;
protected int hotSpringsPerChunk; public int hotSpringsPerChunk;
protected int poisonWaterPerChunk; public int poisonWaterPerChunk;
/** True if decorator should generate surface lava & water */ /** True if decorator should generate surface lava & water */
public boolean generateLakes; public boolean generateLakes;
@ -669,7 +669,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
for (var2 = 0; var2 < hotSpringsPerChunk; ++var2) for (var2 = 0; var2 < hotSpringsPerChunk; ++var2)
{ {
if (BOPConfiguration.TerrainGen.springWaterGen) if (BOPConfigurationTerrainGen.springWaterGen)
{ {
var3 = chunk_X + randomGenerator.nextInt(16) + 8; var3 = chunk_X + randomGenerator.nextInt(16) + 8;
var4 = randomGenerator.nextInt(randomGenerator.nextInt(randomGenerator.nextInt(112) + 8) + 8); var4 = randomGenerator.nextInt(randomGenerator.nextInt(randomGenerator.nextInt(112) + 8) + 8);
@ -682,7 +682,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
{ {
int var9999 = randomGenerator.nextInt(96); int var9999 = randomGenerator.nextInt(96);
if (BOPConfiguration.TerrainGen.springWaterGen) if (BOPConfigurationTerrainGen.springWaterGen)
{ {
if (var9999 == 1) if (var9999 == 1)
{ {
@ -696,7 +696,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
for (var2 = 0; var2 < poisonWaterPerChunk; ++var2) for (var2 = 0; var2 < poisonWaterPerChunk; ++var2)
{ {
if (BOPConfiguration.TerrainGen.poisonWaterGen) if (BOPConfigurationTerrainGen.poisonWaterGen)
{ {
var3 = chunk_X + randomGenerator.nextInt(16) + 8; var3 = chunk_X + randomGenerator.nextInt(16) + 8;
var4 = randomGenerator.nextInt(randomGenerator.nextInt(randomGenerator.nextInt(112) + 8) + 8); var4 = randomGenerator.nextInt(randomGenerator.nextInt(randomGenerator.nextInt(112) + 8) + 8);
@ -709,7 +709,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
{ {
int var9998 = randomGenerator.nextInt(32); int var9998 = randomGenerator.nextInt(32);
if (BOPConfiguration.TerrainGen.poisonWaterGen) if (BOPConfigurationTerrainGen.poisonWaterGen)
{ {
if (var9998 == 1) if (var9998 == 1)
{ {
@ -798,7 +798,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
if (generateQuicksand) if (generateQuicksand)
{ {
if (BOPConfiguration.TerrainGen.quicksandGen) if (BOPConfigurationTerrainGen.quicksandGen)
{ {
this.genStandardOre1(5, quicksandGen, 64, 128); this.genStandardOre1(5, quicksandGen, 64, 128);
} }
@ -1173,7 +1173,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
for (var2 = 0; var2 < poisonIvyPerChunk; ++var2) for (var2 = 0; var2 < poisonIvyPerChunk; ++var2)
{ {
if (BOPConfiguration.TerrainGen.poisonIvyGen) if (BOPConfigurationTerrainGen.poisonIvyGen)
{ {
var3 = chunk_X + randomGenerator.nextInt(16) + 8; var3 = chunk_X + randomGenerator.nextInt(16) + 8;
var4 = randomGenerator.nextInt(256); var4 = randomGenerator.nextInt(256);
@ -1379,7 +1379,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
for (var2 = 0; var2 < thornsPerChunk; ++var2) for (var2 = 0; var2 < thornsPerChunk; ++var2)
{ {
if (BOPConfiguration.TerrainGen.thornGen) if (BOPConfigurationTerrainGen.thornGen)
{ {
var3 = chunk_X + randomGenerator.nextInt(16) + 8; var3 = chunk_X + randomGenerator.nextInt(16) + 8;
var4 = randomGenerator.nextInt(256); var4 = randomGenerator.nextInt(256);
@ -1475,7 +1475,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
var3 = randomGenerator.nextInt(256); var3 = randomGenerator.nextInt(256);
var4 = chunk_Z + randomGenerator.nextInt(16) + 8; var4 = chunk_Z + randomGenerator.nextInt(16) + 8;
if (BOPConfiguration.TerrainGen.pumpkinGen) if (BOPConfigurationTerrainGen.pumpkinGen)
{ {
(new WorldGenBOPPumpkin()).generate(currentWorld, randomGenerator, var2, var3, var4); (new WorldGenBOPPumpkin()).generate(currentWorld, randomGenerator, var2, var3, var4);
} }

2
common/biomesoplenty/biomes/BiomeGenAlpsBase.java
View file

@ -8,7 +8,7 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenTaiga2; import net.minecraft.world.gen.feature.WorldGenTaiga2;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenTaiga5; import biomesoplenty.worldgen.tree.WorldGenTaiga5;
public class BiomeGenAlpsBase extends BiomeGenBase public class BiomeGenAlpsBase extends BiomeGenBase
{ {

2
common/biomesoplenty/biomes/BiomeGenAlpsForest.java
View file

@ -7,7 +7,7 @@ import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenTaiga6; import biomesoplenty.worldgen.tree.WorldGenTaiga6;
public class BiomeGenAlpsForest extends BiomeGenBase public class BiomeGenAlpsForest extends BiomeGenBase
{ {

6
common/biomesoplenty/biomes/BiomeGenAutumnHills.java
View file

@ -7,9 +7,9 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenDeadTree; import biomesoplenty.worldgen.tree.WorldGenDeadTree;
import biomesoplenty.worldgen.WorldGenPersimmon; import biomesoplenty.worldgen.tree.WorldGenPersimmon;
import biomesoplenty.worldgen.WorldGenTaiga4; import biomesoplenty.worldgen.tree.WorldGenTaiga4;
public class BiomeGenAutumnHills extends BiomeGenBase public class BiomeGenAutumnHills extends BiomeGenBase
{ {

4
common/biomesoplenty/biomes/BiomeGenBadlands.java
View file

@ -7,7 +7,7 @@ import net.minecraft.block.Block;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
public class BiomeGenBadlands extends BiomeGenBase public class BiomeGenBadlands extends BiomeGenBase
{ {
@ -58,7 +58,7 @@ public class BiomeGenBadlands extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 9814727; return 9814727;
else else
{ {

2
common/biomesoplenty/biomes/BiomeGenBambooForest.java
View file

@ -9,7 +9,7 @@ import net.minecraft.world.gen.feature.WorldGenShrub;
import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenBambooTree; import biomesoplenty.worldgen.tree.WorldGenBambooTree;
public class BiomeGenBambooForest extends BiomeGenBase public class BiomeGenBambooForest extends BiomeGenBase
{ {

10
common/biomesoplenty/biomes/BiomeGenBayou.java
View file

@ -10,11 +10,11 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenBayou1;
import biomesoplenty.worldgen.WorldGenBayou2;
import biomesoplenty.worldgen.WorldGenBayou3;
import biomesoplenty.worldgen.WorldGenMoss; import biomesoplenty.worldgen.WorldGenMoss;
import biomesoplenty.worldgen.tree.WorldGenBayou1;
import biomesoplenty.worldgen.tree.WorldGenBayou2;
import biomesoplenty.worldgen.tree.WorldGenBayou3;
public class BiomeGenBayou extends BiomeGenBase public class BiomeGenBayou extends BiomeGenBase
{ {
@ -108,7 +108,7 @@ public class BiomeGenBayou extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 11322556; return 11322556;
else else
{ {

6
common/biomesoplenty/biomes/BiomeGenBorealForest.java
View file

@ -10,9 +10,9 @@ import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenShrub;
import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.worldgen.WorldGenAutumn; import biomesoplenty.worldgen.tree.WorldGenAutumn;
import biomesoplenty.worldgen.WorldGenRainforestTree1; import biomesoplenty.worldgen.tree.WorldGenRainforestTree1;
import biomesoplenty.worldgen.WorldGenTaiga10; import biomesoplenty.worldgen.tree.WorldGenTaiga10;
public class BiomeGenBorealForest extends BiomeGenBase public class BiomeGenBorealForest extends BiomeGenBase
{ {

2
common/biomesoplenty/biomes/BiomeGenCanyon.java
View file

@ -8,7 +8,7 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenCanyonShrub; import biomesoplenty.worldgen.WorldGenCanyonShrub;
import biomesoplenty.worldgen.WorldGenPineTree; import biomesoplenty.worldgen.tree.WorldGenPineTree;
public class BiomeGenCanyon extends BiomeGenBase public class BiomeGenCanyon extends BiomeGenBase
{ {

2
common/biomesoplenty/biomes/BiomeGenCanyonRavine.java
View file

@ -8,7 +8,7 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenCanyonShrub; import biomesoplenty.worldgen.WorldGenCanyonShrub;
import biomesoplenty.worldgen.WorldGenPineTree; import biomesoplenty.worldgen.tree.WorldGenPineTree;
public class BiomeGenCanyonRavine extends BiomeGenBase public class BiomeGenCanyonRavine extends BiomeGenBase
{ {

4
common/biomesoplenty/biomes/BiomeGenCherryBlossomGrove.java
View file

@ -6,8 +6,8 @@ import net.minecraft.block.Block;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.worldgen.WorldGenCherry1; import biomesoplenty.worldgen.tree.WorldGenCherry1;
import biomesoplenty.worldgen.WorldGenCherry2; import biomesoplenty.worldgen.tree.WorldGenCherry2;
public class BiomeGenCherryBlossomGrove extends BiomeGenBase public class BiomeGenCherryBlossomGrove extends BiomeGenBase
{ {

16
common/biomesoplenty/biomes/BiomeGenConiferousForest.java
View file

@ -10,13 +10,13 @@ import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMain;
import biomesoplenty.worldgen.WorldGenFir1; import biomesoplenty.worldgen.tree.WorldGenFir1;
import biomesoplenty.worldgen.WorldGenFir2; import biomesoplenty.worldgen.tree.WorldGenFir2;
import biomesoplenty.worldgen.WorldGenFir3; import biomesoplenty.worldgen.tree.WorldGenFir3;
import biomesoplenty.worldgen.WorldGenTaiga3; import biomesoplenty.worldgen.tree.WorldGenTaiga3;
import biomesoplenty.worldgen.WorldGenTaiga4; import biomesoplenty.worldgen.tree.WorldGenTaiga4;
import biomesoplenty.worldgen.WorldGenTaiga9; import biomesoplenty.worldgen.tree.WorldGenTaiga9;
public class BiomeGenConiferousForest extends BiomeGenBase public class BiomeGenConiferousForest extends BiomeGenBase
{ {
@ -43,7 +43,7 @@ public class BiomeGenConiferousForest extends BiomeGenBase
@Override @Override
public WorldGenerator getRandomWorldGenForTrees(Random par1Random) public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
{ {
if (BOPConfiguration.Main.realisticTrees) if (BOPConfigurationMain.realisticTrees)
{ {
return par1Random.nextInt(5) == 0 ? new WorldGenFir1() : (par1Random.nextInt(3) == 0 ? new WorldGenFir2() : new WorldGenFir3()); return par1Random.nextInt(5) == 0 ? new WorldGenFir1() : (par1Random.nextInt(3) == 0 ? new WorldGenFir2() : new WorldGenFir3());
} }

6
common/biomesoplenty/biomes/BiomeGenConiferousForestSnow.java
View file

@ -8,9 +8,9 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenTaiga3; import biomesoplenty.worldgen.tree.WorldGenTaiga3;
import biomesoplenty.worldgen.WorldGenTaiga4; import biomesoplenty.worldgen.tree.WorldGenTaiga4;
import biomesoplenty.worldgen.WorldGenTaiga9; import biomesoplenty.worldgen.tree.WorldGenTaiga9;
public class BiomeGenConiferousForestSnow extends BiomeGenBase public class BiomeGenConiferousForestSnow extends BiomeGenBase
{ {

4
common/biomesoplenty/biomes/BiomeGenCrag.java
View file

@ -7,7 +7,7 @@ import net.minecraft.block.Block;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
public class BiomeGenCrag extends BiomeGenBase public class BiomeGenCrag extends BiomeGenBase
{ {
@ -52,7 +52,7 @@ public class BiomeGenCrag extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 4944498; return 4944498;
else else
{ {

10
common/biomesoplenty/biomes/BiomeGenDeadForest.java
View file

@ -8,10 +8,10 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenDeadTree; import biomesoplenty.worldgen.tree.WorldGenDeadTree;
import biomesoplenty.worldgen.WorldGenDeadTree2; import biomesoplenty.worldgen.tree.WorldGenDeadTree2;
import biomesoplenty.worldgen.WorldGenTaiga5; import biomesoplenty.worldgen.tree.WorldGenTaiga5;
public class BiomeGenDeadForest extends BiomeGenBase public class BiomeGenDeadForest extends BiomeGenBase
{ {
@ -68,7 +68,7 @@ public class BiomeGenDeadForest extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 9873591; return 9873591;
else else
{ {

10
common/biomesoplenty/biomes/BiomeGenDeadForestSnow.java
View file

@ -9,10 +9,10 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenDeadTree; import biomesoplenty.worldgen.tree.WorldGenDeadTree;
import biomesoplenty.worldgen.WorldGenDeadTree2; import biomesoplenty.worldgen.tree.WorldGenDeadTree2;
import biomesoplenty.worldgen.WorldGenTaiga5; import biomesoplenty.worldgen.tree.WorldGenTaiga5;
public class BiomeGenDeadForestSnow extends BiomeGenBase public class BiomeGenDeadForestSnow extends BiomeGenBase
{ {
@ -90,7 +90,7 @@ public class BiomeGenDeadForestSnow extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 9873591; return 9873591;
else else
{ {

6
common/biomesoplenty/biomes/BiomeGenDeadSwamp.java
View file

@ -9,8 +9,8 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenDeadTree; import biomesoplenty.worldgen.tree.WorldGenDeadTree;
public class BiomeGenDeadSwamp extends BiomeGenBase public class BiomeGenDeadSwamp extends BiomeGenBase
{ {
@ -95,7 +95,7 @@ public class BiomeGenDeadSwamp extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 6451816; return 6451816;
else else
{ {

4
common/biomesoplenty/biomes/BiomeGenDeadlands.java
View file

@ -12,7 +12,7 @@ import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenMinable; import net.minecraft.world.gen.feature.WorldGenMinable;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenDeadlands; import biomesoplenty.worldgen.WorldGenDeadlands;
public class BiomeGenDeadlands extends BiomeGenBase public class BiomeGenDeadlands extends BiomeGenBase
@ -78,7 +78,7 @@ public class BiomeGenDeadlands extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 4464929; return 4464929;
else else
{ {

2
common/biomesoplenty/biomes/BiomeGenDeciduousForest.java
View file

@ -9,7 +9,7 @@ import net.minecraft.world.gen.feature.WorldGenShrub;
import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenDeciduous; import biomesoplenty.worldgen.tree.WorldGenDeciduous;
public class BiomeGenDeciduousForest extends BiomeGenBase public class BiomeGenDeciduousForest extends BiomeGenBase
{ {

6
common/biomesoplenty/biomes/BiomeGenFen.java
View file

@ -10,10 +10,10 @@ import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenDeadTree;
import biomesoplenty.worldgen.WorldGenFen1;
import biomesoplenty.worldgen.WorldGenFen2;
import biomesoplenty.worldgen.WorldGenMoss; import biomesoplenty.worldgen.WorldGenMoss;
import biomesoplenty.worldgen.tree.WorldGenDeadTree;
import biomesoplenty.worldgen.tree.WorldGenFen1;
import biomesoplenty.worldgen.tree.WorldGenFen2;
public class BiomeGenFen extends BiomeGenBase public class BiomeGenFen extends BiomeGenBase
{ {

2
common/biomesoplenty/biomes/BiomeGenFieldForest.java
View file

@ -9,7 +9,7 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenPineTree; import biomesoplenty.worldgen.tree.WorldGenPineTree;
public class BiomeGenFieldForest extends BiomeGenBase public class BiomeGenFieldForest extends BiomeGenBase
{ {

4
common/biomesoplenty/biomes/BiomeGenFrostForest.java
View file

@ -8,7 +8,7 @@ import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
public class BiomeGenFrostForest extends BiomeGenBase public class BiomeGenFrostForest extends BiomeGenBase
{ {
@ -79,7 +79,7 @@ public class BiomeGenFrostForest extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 13557994; return 13557994;
else else
{ {

8
common/biomesoplenty/biomes/BiomeGenFungiForest.java
View file

@ -11,11 +11,11 @@ import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenFungi; import biomesoplenty.worldgen.WorldGenFungi;
import biomesoplenty.worldgen.WorldGenMoss; import biomesoplenty.worldgen.WorldGenMoss;
import biomesoplenty.worldgen.WorldGenThickTree2; import biomesoplenty.worldgen.tree.WorldGenThickTree2;
import biomesoplenty.worldgen.WorldGenThickTree3; import biomesoplenty.worldgen.tree.WorldGenThickTree3;
public class BiomeGenFungiForest extends BiomeGenBase public class BiomeGenFungiForest extends BiomeGenBase
{ {
@ -109,7 +109,7 @@ public class BiomeGenFungiForest extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 5888980; return 5888980;
else else
{ {

4
common/biomesoplenty/biomes/BiomeGenHotSprings.java
View file

@ -7,8 +7,8 @@ import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenPineTree; import biomesoplenty.worldgen.tree.WorldGenPineTree;
import biomesoplenty.worldgen.WorldGenTaiga6; import biomesoplenty.worldgen.tree.WorldGenTaiga6;
public class BiomeGenHotSprings extends BiomeGenBase public class BiomeGenHotSprings extends BiomeGenBase
{ {

6
common/biomesoplenty/biomes/BiomeGenIcyHills.java
View file

@ -10,8 +10,8 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenIceTree; import biomesoplenty.worldgen.tree.WorldGenIceTree;
public class BiomeGenIcyHills extends BiomeGenBase public class BiomeGenIcyHills extends BiomeGenBase
{ {
@ -67,7 +67,7 @@ public class BiomeGenIcyHills extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 16777215; return 16777215;
else else
{ {

6
common/biomesoplenty/biomes/BiomeGenJadeCliffs.java
View file

@ -8,8 +8,8 @@ import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenShrub;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenPineTree; import biomesoplenty.worldgen.tree.WorldGenPineTree;
public class BiomeGenJadeCliffs extends BiomeGenBase public class BiomeGenJadeCliffs extends BiomeGenBase
{ {
@ -60,7 +60,7 @@ public class BiomeGenJadeCliffs extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 12045485; return 12045485;
else else
{ {

4
common/biomesoplenty/biomes/BiomeGenLushDesert.java
View file

@ -10,8 +10,8 @@ import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenShrub;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenAcacia; import biomesoplenty.worldgen.tree.WorldGenAcacia;
import biomesoplenty.worldgen.WorldGenDeadTree3; import biomesoplenty.worldgen.tree.WorldGenDeadTree3;
public class BiomeGenLushDesert extends BiomeGenBase public class BiomeGenLushDesert extends BiomeGenBase
{ {

2
common/biomesoplenty/biomes/BiomeGenLushSwamp.java
View file

@ -9,7 +9,7 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenSwampTall; import biomesoplenty.worldgen.tree.WorldGenSwampTall;
public class BiomeGenLushSwamp extends BiomeGenBase public class BiomeGenLushSwamp extends BiomeGenBase
{ {

4
common/biomesoplenty/biomes/BiomeGenMangrove.java
View file

@ -7,8 +7,8 @@ import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenMangrove; import biomesoplenty.worldgen.tree.WorldGenMangrove;
import biomesoplenty.worldgen.WorldGenMangrove2; import biomesoplenty.worldgen.tree.WorldGenMangrove2;
public class BiomeGenMangrove extends BiomeGenBase public class BiomeGenMangrove extends BiomeGenBase
{ {

4
common/biomesoplenty/biomes/BiomeGenMapleWoods.java
View file

@ -6,8 +6,8 @@ import net.minecraft.block.Block;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.worldgen.WorldGenMaple; import biomesoplenty.worldgen.tree.WorldGenMaple;
import biomesoplenty.worldgen.WorldGenTaiga5; import biomesoplenty.worldgen.tree.WorldGenTaiga5;
public class BiomeGenMapleWoods extends BiomeGenBase public class BiomeGenMapleWoods extends BiomeGenBase
{ {

4
common/biomesoplenty/biomes/BiomeGenMesa.java
View file

@ -9,7 +9,7 @@ import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.biome.SpawnListEntry;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
public class BiomeGenMesa extends BiomeGenBase public class BiomeGenMesa extends BiomeGenBase
{ {
@ -57,7 +57,7 @@ public class BiomeGenMesa extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 15898486; return 15898486;
else else
{ {

4
common/biomesoplenty/biomes/BiomeGenMoor.java
View file

@ -9,7 +9,7 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
public class BiomeGenMoor extends BiomeGenBase public class BiomeGenMoor extends BiomeGenBase
{ {
@ -99,7 +99,7 @@ public class BiomeGenMoor extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 10536403; return 10536403;
else else
{ {

10
common/biomesoplenty/biomes/BiomeGenMountain.java
View file

@ -6,10 +6,10 @@ import net.minecraft.block.Block;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMain;
import biomesoplenty.worldgen.WorldGenPineTree; import biomesoplenty.worldgen.realtree.WorldGenRealPineTree;
import biomesoplenty.worldgen.WorldGenRealPineTree; import biomesoplenty.worldgen.realtree.WorldGenRealPineTree2;
import biomesoplenty.worldgen.WorldGenRealPineTree2; import biomesoplenty.worldgen.tree.WorldGenPineTree;
public class BiomeGenMountain extends BiomeGenBase public class BiomeGenMountain extends BiomeGenBase
{ {
@ -31,7 +31,7 @@ public class BiomeGenMountain extends BiomeGenBase
@Override @Override
public WorldGenerator getRandomWorldGenForTrees(Random par1Random) public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
{ {
if (BOPConfiguration.Main.realisticTrees) if (BOPConfigurationMain.realisticTrees)
{ {
return par1Random.nextInt(4) == 0 ? new WorldGenRealPineTree2() : (par1Random.nextInt(6) == 0 ? new WorldGenRealPineTree() : worldGeneratorTrees); return par1Random.nextInt(4) == 0 ? new WorldGenRealPineTree2() : (par1Random.nextInt(6) == 0 ? new WorldGenRealPineTree() : worldGeneratorTrees);
} }

17
common/biomesoplenty/biomes/BiomeGenMysticGrove.java
View file

@ -9,11 +9,12 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMain;
import biomesoplenty.worldgen.WorldGenMystic1; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenMystic2; import biomesoplenty.worldgen.realtree.WorldGenRealMagic;
import biomesoplenty.worldgen.WorldGenRealMagic; import biomesoplenty.worldgen.tree.WorldGenMystic1;
import biomesoplenty.worldgen.WorldGenSwampTall; import biomesoplenty.worldgen.tree.WorldGenMystic2;
import biomesoplenty.worldgen.tree.WorldGenSwampTall;
public class BiomeGenMysticGrove extends BiomeGenBase public class BiomeGenMysticGrove extends BiomeGenBase
{ {
@ -25,7 +26,7 @@ public class BiomeGenMysticGrove extends BiomeGenBase
super(par1); super(par1);
theBiomeDecorator = new BiomeDecoratorBOP(this); theBiomeDecorator = new BiomeDecoratorBOP(this);
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
if (BOPConfiguration.Main.realisticTrees) if (BOPConfigurationMain.realisticTrees)
{ {
customBiomeDecorator.treesPerChunk = 1; customBiomeDecorator.treesPerChunk = 1;
} }
@ -61,7 +62,7 @@ public class BiomeGenMysticGrove extends BiomeGenBase
@Override @Override
public WorldGenerator getRandomWorldGenForTrees(Random par1Random) public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
{ {
if (BOPConfiguration.Main.realisticTrees) if (BOPConfigurationMain.realisticTrees)
{ {
return new WorldGenRealMagic(); return new WorldGenRealMagic();
} }
@ -102,7 +103,7 @@ public class BiomeGenMysticGrove extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 16751558; return 16751558;
else else
{ {

2
common/biomesoplenty/biomes/BiomeGenOasis.java
View file

@ -7,7 +7,7 @@ import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenPalmTree3; import biomesoplenty.worldgen.tree.WorldGenPalmTree3;
public class BiomeGenOasis extends BiomeGenBase public class BiomeGenOasis extends BiomeGenBase
{ {

8
common/biomesoplenty/biomes/BiomeGenOminousWoods.java
View file

@ -11,9 +11,9 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenOminous1; import biomesoplenty.worldgen.tree.WorldGenOminous1;
import biomesoplenty.worldgen.WorldGenOminous2; import biomesoplenty.worldgen.tree.WorldGenOminous2;
public class BiomeGenOminousWoods extends BiomeGenBase public class BiomeGenOminousWoods extends BiomeGenBase
{ {
@ -88,7 +88,7 @@ public class BiomeGenOminousWoods extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 5069168; return 5069168;
else else
{ {

10
common/biomesoplenty/biomes/BiomeGenOminousWoodsThick.java
View file

@ -12,10 +12,10 @@ import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenOminous1; import biomesoplenty.worldgen.tree.WorldGenOminous1;
import biomesoplenty.worldgen.WorldGenOminous3; import biomesoplenty.worldgen.tree.WorldGenOminous3;
import biomesoplenty.worldgen.WorldGenOminous4; import biomesoplenty.worldgen.tree.WorldGenOminous4;
public class BiomeGenOminousWoodsThick extends BiomeGenBase public class BiomeGenOminousWoodsThick extends BiomeGenBase
{ {
@ -92,7 +92,7 @@ public class BiomeGenOminousWoodsThick extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 5069168; return 5069168;
else else
{ {

2
common/biomesoplenty/biomes/BiomeGenOrchard.java
View file

@ -9,7 +9,7 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenApple; import biomesoplenty.worldgen.tree.WorldGenApple;
public class BiomeGenOrchard extends BiomeGenBase public class BiomeGenOrchard extends BiomeGenBase
{ {

6
common/biomesoplenty/biomes/BiomeGenOriginValley.java
View file

@ -6,8 +6,8 @@ import java.util.Random;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenOriginTree; import biomesoplenty.worldgen.tree.WorldGenOriginTree;
public class BiomeGenOriginValley extends BiomeGenBase public class BiomeGenOriginValley extends BiomeGenBase
{ {
@ -60,7 +60,7 @@ public class BiomeGenOriginValley extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 8441086; return 8441086;
else else
{ {

2
common/biomesoplenty/biomes/BiomeGenOutback.java
View file

@ -8,7 +8,7 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenOutbackShrub; import biomesoplenty.worldgen.WorldGenOutbackShrub;
import biomesoplenty.worldgen.WorldGenOutbackTree; import biomesoplenty.worldgen.tree.WorldGenOutbackTree;
public class BiomeGenOutback extends BiomeGenBase public class BiomeGenOutback extends BiomeGenBase
{ {

4
common/biomesoplenty/biomes/BiomeGenOvergrownGreens.java
View file

@ -9,8 +9,8 @@ import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenIvy; import biomesoplenty.worldgen.WorldGenIvy;
import biomesoplenty.worldgen.WorldGenLargeTree; import biomesoplenty.worldgen.tree.WorldGenLargeTree;
import biomesoplenty.worldgen.WorldGenOvergrownTree; import biomesoplenty.worldgen.tree.WorldGenOvergrownTree;
public class BiomeGenOvergrownGreens extends BiomeGenBase public class BiomeGenOvergrownGreens extends BiomeGenBase
{ {

6
common/biomesoplenty/biomes/BiomeGenQuagmire.java
View file

@ -8,8 +8,8 @@ import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenDeadTree; import biomesoplenty.worldgen.tree.WorldGenDeadTree;
public class BiomeGenQuagmire extends BiomeGenBase public class BiomeGenQuagmire extends BiomeGenBase
{ {
@ -86,7 +86,7 @@ public class BiomeGenQuagmire extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 12436670; return 12436670;
else else
{ {

2
common/biomesoplenty/biomes/BiomeGenRainforest.java
View file

@ -11,7 +11,7 @@ import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.entities.EntityJungleSpider; import biomesoplenty.entities.EntityJungleSpider;
import biomesoplenty.worldgen.WorldGenRainforestTree1; import biomesoplenty.worldgen.tree.WorldGenRainforestTree1;
public class BiomeGenRainforest extends BiomeGenBase public class BiomeGenRainforest extends BiomeGenBase
{ {

12
common/biomesoplenty/biomes/BiomeGenRedwoodForest.java
View file

@ -8,11 +8,11 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenShrub;
import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMain;
import biomesoplenty.worldgen.WorldGenRealRedwood; import biomesoplenty.worldgen.realtree.WorldGenRealRedwood;
import biomesoplenty.worldgen.WorldGenRealRedwood2; import biomesoplenty.worldgen.realtree.WorldGenRealRedwood2;
import biomesoplenty.worldgen.WorldGenRedwoodTree; import biomesoplenty.worldgen.tree.WorldGenRedwoodTree;
import biomesoplenty.worldgen.WorldGenRedwoodTree2; import biomesoplenty.worldgen.tree.WorldGenRedwoodTree2;
public class BiomeGenRedwoodForest extends BiomeGenBase public class BiomeGenRedwoodForest extends BiomeGenBase
{ {
@ -36,7 +36,7 @@ public class BiomeGenRedwoodForest extends BiomeGenBase
@Override @Override
public WorldGenerator getRandomWorldGenForTrees(Random par1Random) public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
{ {
if (BOPConfiguration.Main.realisticTrees) if (BOPConfigurationMain.realisticTrees)
{ {
return par1Random.nextInt(4) == 0 ? new WorldGenRealRedwood() : (par1Random.nextInt(2) == 0 ? new WorldGenShrub(0,0) : new WorldGenRealRedwood2()); return par1Random.nextInt(4) == 0 ? new WorldGenRealRedwood() : (par1Random.nextInt(2) == 0 ? new WorldGenShrub(0,0) : new WorldGenRealRedwood2());
} }

4
common/biomesoplenty/biomes/BiomeGenSacredSprings.java
View file

@ -10,7 +10,7 @@ import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenShrub;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.entities.EntityJungleSpider; import biomesoplenty.entities.EntityJungleSpider;
public class BiomeGenSacredSprings extends BiomeGenBase public class BiomeGenSacredSprings extends BiomeGenBase
@ -100,7 +100,7 @@ public class BiomeGenSacredSprings extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 1995007; return 1995007;
else else
{ {

2
common/biomesoplenty/biomes/BiomeGenSavanna.java
View file

@ -9,7 +9,7 @@ import net.minecraft.world.gen.feature.WorldGenShrub;
import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenAcacia; import biomesoplenty.worldgen.tree.WorldGenAcacia;
public class BiomeGenSavanna extends BiomeGenBase public class BiomeGenSavanna extends BiomeGenBase
{ {

2
common/biomesoplenty/biomes/BiomeGenSavannaPlateau.java
View file

@ -9,7 +9,7 @@ import net.minecraft.world.gen.feature.WorldGenShrub;
import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenAcacia; import biomesoplenty.worldgen.tree.WorldGenAcacia;
public class BiomeGenSavannaPlateau extends BiomeGenBase public class BiomeGenSavannaPlateau extends BiomeGenBase
{ {

12
common/biomesoplenty/biomes/BiomeGenSeasonalForest.java
View file

@ -10,12 +10,12 @@ import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenAutumn; import biomesoplenty.worldgen.tree.WorldGenAutumn;
import biomesoplenty.worldgen.WorldGenAutumn2; import biomesoplenty.worldgen.tree.WorldGenAutumn2;
import biomesoplenty.worldgen.WorldGenAutumn2Big; import biomesoplenty.worldgen.tree.WorldGenAutumn2Big;
import biomesoplenty.worldgen.WorldGenDeadTree2; import biomesoplenty.worldgen.tree.WorldGenDeadTree2;
import biomesoplenty.worldgen.WorldGenMaple; import biomesoplenty.worldgen.tree.WorldGenMaple;
import biomesoplenty.worldgen.WorldGenMapleBig; import biomesoplenty.worldgen.tree.WorldGenMapleBig;
public class BiomeGenSeasonalForest extends BiomeGenBase public class BiomeGenSeasonalForest extends BiomeGenBase
{ {

12
common/biomesoplenty/biomes/BiomeGenSeasonalSpruceForest.java
View file

@ -10,12 +10,12 @@ import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenAutumn; import biomesoplenty.worldgen.tree.WorldGenAutumn;
import biomesoplenty.worldgen.WorldGenAutumn2; import biomesoplenty.worldgen.tree.WorldGenAutumn2;
import biomesoplenty.worldgen.WorldGenDeadTree2; import biomesoplenty.worldgen.tree.WorldGenDeadTree2;
import biomesoplenty.worldgen.WorldGenMaple; import biomesoplenty.worldgen.tree.WorldGenMaple;
import biomesoplenty.worldgen.WorldGenTaiga10; import biomesoplenty.worldgen.tree.WorldGenTaiga10;
import biomesoplenty.worldgen.WorldGenTaiga5; import biomesoplenty.worldgen.tree.WorldGenTaiga5;
public class BiomeGenSeasonalSpruceForest extends BiomeGenBase public class BiomeGenSeasonalSpruceForest extends BiomeGenBase
{ {

6
common/biomesoplenty/biomes/BiomeGenShield.java
View file

@ -7,9 +7,9 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenShrub;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.worldgen.WorldGenMoss; import biomesoplenty.worldgen.WorldGenMoss;
import biomesoplenty.worldgen.WorldGenPineTree; import biomesoplenty.worldgen.tree.WorldGenPineTree;
import biomesoplenty.worldgen.WorldGenTaiga5; import biomesoplenty.worldgen.tree.WorldGenTaiga5;
import biomesoplenty.worldgen.WorldGenTaiga9; import biomesoplenty.worldgen.tree.WorldGenTaiga9;
public class BiomeGenShield extends BiomeGenBase public class BiomeGenShield extends BiomeGenBase
{ {

10
common/biomesoplenty/biomes/BiomeGenSilkglades.java
View file

@ -11,11 +11,11 @@ import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenBirchWillow;
import biomesoplenty.worldgen.WorldGenCobwebNest; import biomesoplenty.worldgen.WorldGenCobwebNest;
import biomesoplenty.worldgen.WorldGenDeadTree; import biomesoplenty.worldgen.tree.WorldGenBirchWillow;
import biomesoplenty.worldgen.WorldGenWillow; import biomesoplenty.worldgen.tree.WorldGenDeadTree;
import biomesoplenty.worldgen.tree.WorldGenWillow;
public class BiomeGenSilkglades extends BiomeGenBase public class BiomeGenSilkglades extends BiomeGenBase
{ {
@ -106,7 +106,7 @@ public class BiomeGenSilkglades extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 13553096; return 13553096;
else else
{ {

4
common/biomesoplenty/biomes/BiomeGenSludgepit.java
View file

@ -11,7 +11,7 @@ import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenBog1; import biomesoplenty.worldgen.WorldGenBog1;
import biomesoplenty.worldgen.WorldGenBog2; import biomesoplenty.worldgen.WorldGenBog2;
@ -103,7 +103,7 @@ public class BiomeGenSludgepit extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 7039816; return 7039816;
else else
{ {

2
common/biomesoplenty/biomes/BiomeGenSpruceWoods.java
View file

@ -9,7 +9,7 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenTaiga2; import net.minecraft.world.gen.feature.WorldGenTaiga2;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.worldgen.WorldGenTaiga5; import biomesoplenty.worldgen.tree.WorldGenTaiga5;
public class BiomeGenSpruceWoods extends BiomeGenBase public class BiomeGenSpruceWoods extends BiomeGenBase
{ {

6
common/biomesoplenty/biomes/BiomeGenTemperateRainforest.java
View file

@ -10,9 +10,9 @@ import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenMoss; import biomesoplenty.worldgen.WorldGenMoss;
import biomesoplenty.worldgen.WorldGenTemperate; import biomesoplenty.worldgen.tree.WorldGenTemperate;
import biomesoplenty.worldgen.WorldGenThickTree; import biomesoplenty.worldgen.tree.WorldGenThickTree;
import biomesoplenty.worldgen.WorldGenWillow; import biomesoplenty.worldgen.tree.WorldGenWillow;
public class BiomeGenTemperateRainforest extends BiomeGenBase public class BiomeGenTemperateRainforest extends BiomeGenBase
{ {

2
common/biomesoplenty/biomes/BiomeGenTimber.java
View file

@ -10,7 +10,7 @@ import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenChaparral2; import biomesoplenty.worldgen.WorldGenChaparral2;
import biomesoplenty.worldgen.WorldGenChaparral3; import biomesoplenty.worldgen.WorldGenChaparral3;
import biomesoplenty.worldgen.WorldGenDeciduous2; import biomesoplenty.worldgen.tree.WorldGenDeciduous2;
public class BiomeGenTimber extends BiomeGenBase public class BiomeGenTimber extends BiomeGenBase
{ {

2
common/biomesoplenty/biomes/BiomeGenTimberThin.java
View file

@ -10,7 +10,7 @@ import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenChaparral2; import biomesoplenty.worldgen.WorldGenChaparral2;
import biomesoplenty.worldgen.WorldGenChaparral3; import biomesoplenty.worldgen.WorldGenChaparral3;
import biomesoplenty.worldgen.WorldGenDeciduous2; import biomesoplenty.worldgen.tree.WorldGenDeciduous2;
public class BiomeGenTimberThin extends BiomeGenBase public class BiomeGenTimberThin extends BiomeGenBase
{ {

8
common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java
View file

@ -10,10 +10,10 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.entities.EntityJungleSpider; import biomesoplenty.entities.EntityJungleSpider;
import biomesoplenty.worldgen.WorldGenRainforest1; import biomesoplenty.worldgen.tree.WorldGenRainforest1;
import biomesoplenty.worldgen.WorldGenRainforest2; import biomesoplenty.worldgen.tree.WorldGenRainforest2;
public class BiomeGenTropicalRainforest extends BiomeGenBase public class BiomeGenTropicalRainforest extends BiomeGenBase
{ {
@ -95,7 +95,7 @@ public class BiomeGenTropicalRainforest extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 12971089; return 12971089;
else else
{ {

8
common/biomesoplenty/biomes/BiomeGenTropics.java
View file

@ -9,10 +9,10 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.entities.EntityJungleSpider; import biomesoplenty.entities.EntityJungleSpider;
import biomesoplenty.worldgen.WorldGenPalmTree1; import biomesoplenty.worldgen.tree.WorldGenPalmTree1;
import biomesoplenty.worldgen.WorldGenPalmTree3; import biomesoplenty.worldgen.tree.WorldGenPalmTree3;
public class BiomeGenTropics extends BiomeGenBase public class BiomeGenTropics extends BiomeGenBase
{ {
@ -72,7 +72,7 @@ public class BiomeGenTropics extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 3333631; return 3333631;
else else
{ {

4
common/biomesoplenty/biomes/BiomeGenVolcano.java
View file

@ -6,7 +6,7 @@ import java.util.Random;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenVolcano; import biomesoplenty.worldgen.WorldGenVolcano;
public class BiomeGenVolcano extends BiomeGenBase public class BiomeGenVolcano extends BiomeGenBase
@ -43,7 +43,7 @@ public class BiomeGenVolcano extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 8026746; return 8026746;
else else
{ {

6
common/biomesoplenty/biomes/BiomeGenWasteland.java
View file

@ -6,10 +6,10 @@ import java.util.Random;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenDeadTree3;
import biomesoplenty.worldgen.WorldGenWasteland; import biomesoplenty.worldgen.WorldGenWasteland;
import biomesoplenty.worldgen.WorldGenWasteland2; import biomesoplenty.worldgen.WorldGenWasteland2;
import biomesoplenty.worldgen.tree.WorldGenDeadTree3;
public class BiomeGenWasteland extends BiomeGenBase public class BiomeGenWasteland extends BiomeGenBase
{ {
@ -63,7 +63,7 @@ public class BiomeGenWasteland extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 10465942; return 10465942;
else else
{ {

4
common/biomesoplenty/biomes/BiomeGenWetland.java
View file

@ -11,8 +11,8 @@ import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenMoss; import biomesoplenty.worldgen.WorldGenMoss;
import biomesoplenty.worldgen.WorldGenTaiga5; import biomesoplenty.worldgen.tree.WorldGenTaiga5;
import biomesoplenty.worldgen.WorldGenWillow; import biomesoplenty.worldgen.tree.WorldGenWillow;
public class BiomeGenWetland extends BiomeGenBase public class BiomeGenWetland extends BiomeGenBase
{ {

2
common/biomesoplenty/biomes/BiomeGenBeachGravel.java → common/biomesoplenty/biomes/beach/BiomeGenBeachGravel.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.biomes; package biomesoplenty.biomes.beach;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;

3
common/biomesoplenty/biomes/BiomeGenBeachOvergrown.java → common/biomesoplenty/biomes/beach/BiomeGenBeachOvergrown.java
View file

@ -1,10 +1,11 @@
package biomesoplenty.biomes; package biomesoplenty.biomes.beach;
import java.util.Random; import java.util.Random;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.biomes.BiomeDecoratorBOP;
import biomesoplenty.worldgen.WorldGenChaparral2; import biomesoplenty.worldgen.WorldGenChaparral2;
import biomesoplenty.worldgen.WorldGenChaparral3; import biomesoplenty.worldgen.WorldGenChaparral3;

3
common/biomesoplenty/biomes/BiomeGenNetherBase.java → common/biomesoplenty/biomes/nether/BiomeGenNetherBase.java
View file

@ -1,5 +1,6 @@
package biomesoplenty.biomes; package biomesoplenty.biomes.nether;
import biomesoplenty.biomes.BiomeDecoratorBOP;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.entity.monster.EntityGhast; import net.minecraft.entity.monster.EntityGhast;
import net.minecraft.entity.monster.EntityMagmaCube; import net.minecraft.entity.monster.EntityMagmaCube;

3
common/biomesoplenty/biomes/BiomeGenNetherBone.java → common/biomesoplenty/biomes/nether/BiomeGenNetherBone.java
View file

@ -1,5 +1,6 @@
package biomesoplenty.biomes; package biomesoplenty.biomes.nether;
import biomesoplenty.biomes.BiomeDecoratorBOP;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.entity.monster.EntityGhast; import net.minecraft.entity.monster.EntityGhast;
import net.minecraft.entity.monster.EntityMagmaCube; import net.minecraft.entity.monster.EntityMagmaCube;

3
common/biomesoplenty/biomes/BiomeGenNetherDesert.java → common/biomesoplenty/biomes/nether/BiomeGenNetherDesert.java
View file

@ -1,5 +1,6 @@
package biomesoplenty.biomes; package biomesoplenty.biomes.nether;
import biomesoplenty.biomes.BiomeDecoratorBOP;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.entity.monster.EntityGhast; import net.minecraft.entity.monster.EntityGhast;
import net.minecraft.entity.monster.EntityMagmaCube; import net.minecraft.entity.monster.EntityMagmaCube;

3
common/biomesoplenty/biomes/BiomeGenNetherGarden.java → common/biomesoplenty/biomes/nether/BiomeGenNetherGarden.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.biomes; package biomesoplenty.biomes.nether;
import java.util.Random; import java.util.Random;
@ -9,6 +9,7 @@ import net.minecraft.entity.monster.EntityPigZombie;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.biomes.BiomeDecoratorBOP;
import biomesoplenty.worldgen.WorldGenNetherMushroom; import biomesoplenty.worldgen.WorldGenNetherMushroom;
public class BiomeGenNetherGarden extends BiomeGenBase public class BiomeGenNetherGarden extends BiomeGenBase

3
common/biomesoplenty/biomes/BiomeGenNetherLava.java → common/biomesoplenty/biomes/nether/BiomeGenNetherLava.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.biomes; package biomesoplenty.biomes.nether;
import java.util.Random; import java.util.Random;
@ -11,6 +11,7 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenFire; import net.minecraft.world.gen.feature.WorldGenFire;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.biomes.BiomeDecoratorBOP;
import biomesoplenty.worldgen.WorldGenLavaSpring; import biomesoplenty.worldgen.WorldGenLavaSpring;
public class BiomeGenNetherLava extends BiomeGenBase public class BiomeGenNetherLava extends BiomeGenBase

3
common/biomesoplenty/biomes/BiomeGenOceanAbyss.java → common/biomesoplenty/biomes/ocean/BiomeGenOceanAbyss.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.biomes; package biomesoplenty.biomes.ocean;
import java.util.Random; import java.util.Random;
@ -6,6 +6,7 @@ import net.minecraft.block.Block;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.biomes.BiomeDecoratorBOP;
public class BiomeGenOceanAbyss extends BiomeGenBase public class BiomeGenOceanAbyss extends BiomeGenBase
{ {

3
common/biomesoplenty/biomes/BiomeGenOceanCoral.java → common/biomesoplenty/biomes/ocean/BiomeGenOceanCoral.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.biomes; package biomesoplenty.biomes.ocean;
import java.util.Random; import java.util.Random;
@ -6,6 +6,7 @@ import net.minecraft.block.Block;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.biomes.BiomeDecoratorBOP;
public class BiomeGenOceanCoral extends BiomeGenBase public class BiomeGenOceanCoral extends BiomeGenBase
{ {

3
common/biomesoplenty/biomes/BiomeGenOceanKelp.java → common/biomesoplenty/biomes/ocean/BiomeGenOceanKelp.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.biomes; package biomesoplenty.biomes.ocean;
import java.util.Random; import java.util.Random;
@ -6,6 +6,7 @@ import net.minecraft.block.Block;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.biomes.BiomeDecoratorBOP;
public class BiomeGenOceanKelp extends BiomeGenBase public class BiomeGenOceanKelp extends BiomeGenBase
{ {

13
common/biomesoplenty/biomes/BiomeGenPromisedLandForest.java → common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandForest.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.biomes; package biomesoplenty.biomes.promisedland;
import java.awt.Color; import java.awt.Color;
import java.util.Random; import java.util.Random;
@ -8,11 +8,12 @@ import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.biomes.BiomeDecoratorBOP;
import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenPromisedShrub; import biomesoplenty.worldgen.WorldGenPromisedShrub;
import biomesoplenty.worldgen.WorldGenPromisedTree;
import biomesoplenty.worldgen.WorldGenPromisedTree2;
import biomesoplenty.worldgen.WorldGenWaterSpring; import biomesoplenty.worldgen.WorldGenWaterSpring;
import biomesoplenty.worldgen.tree.WorldGenPromisedTree;
import biomesoplenty.worldgen.tree.WorldGenPromisedTree2;
public class BiomeGenPromisedLandForest extends BiomeGenBase public class BiomeGenPromisedLandForest extends BiomeGenBase
{ {
@ -110,8 +111,8 @@ public class BiomeGenPromisedLandForest extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return BOPConfiguration.Misc.promisedLandSkyColor; return BOPConfigurationMisc.promisedLandSkyColor;
else else
{ {
par1 /= 3.0F; par1 /= 3.0F;

9
common/biomesoplenty/biomes/BiomeGenPromisedLandPlains.java → common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandPlains.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.biomes; package biomesoplenty.biomes.promisedland;
import java.awt.Color; import java.awt.Color;
import java.util.Random; import java.util.Random;
@ -8,7 +8,8 @@ import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.biomes.BiomeDecoratorBOP;
import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenPromisedBush; import biomesoplenty.worldgen.WorldGenPromisedBush;
import biomesoplenty.worldgen.WorldGenWaterSpring; import biomesoplenty.worldgen.WorldGenWaterSpring;
@ -105,8 +106,8 @@ public class BiomeGenPromisedLandPlains extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return BOPConfiguration.Misc.promisedLandSkyColor; return BOPConfigurationMisc.promisedLandSkyColor;
else else
{ {
par1 /= 3.0F; par1 /= 3.0F;

13
common/biomesoplenty/biomes/BiomeGenPromisedLandSwamp.java → common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandSwamp.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.biomes; package biomesoplenty.biomes.promisedland;
import java.awt.Color; import java.awt.Color;
import java.util.Random; import java.util.Random;
@ -8,10 +8,11 @@ import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.biomes.BiomeDecoratorBOP;
import biomesoplenty.worldgen.WorldGenPromisedTree; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenPromisedWillowTree;
import biomesoplenty.worldgen.WorldGenWaterSpring; import biomesoplenty.worldgen.WorldGenWaterSpring;
import biomesoplenty.worldgen.tree.WorldGenPromisedTree;
import biomesoplenty.worldgen.tree.WorldGenPromisedWillowTree;
public class BiomeGenPromisedLandSwamp extends BiomeGenBase public class BiomeGenPromisedLandSwamp extends BiomeGenBase
{ {
@ -110,8 +111,8 @@ public class BiomeGenPromisedLandSwamp extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return BOPConfiguration.Misc.promisedLandSkyColor; return BOPConfigurationMisc.promisedLandSkyColor;
else else
{ {
par1 /= 3.0F; par1 /= 3.0F;

7
common/biomesoplenty/biomes/BiomeGenDesertNew.java → common/biomesoplenty/biomes/vanilla/BiomeGenDesertNew.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.biomes; package biomesoplenty.biomes.vanilla;
import java.awt.Color; import java.awt.Color;
import java.util.Random; import java.util.Random;
@ -8,7 +8,8 @@ import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenDesertWells; import net.minecraft.world.gen.feature.WorldGenDesertWells;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.biomes.BiomeDecoratorBOP;
import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
public class BiomeGenDesertNew extends BiomeGenBase public class BiomeGenDesertNew extends BiomeGenBase
{ {
@ -67,7 +68,7 @@ public class BiomeGenDesertNew extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 13877903; return 13877903;
else else
{ {

3
common/biomesoplenty/biomes/BiomeGenForestNew.java → common/biomesoplenty/biomes/vanilla/BiomeGenForestNew.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.biomes; package biomesoplenty.biomes.vanilla;
import java.util.Random; import java.util.Random;
@ -8,6 +8,7 @@ import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.biomes.BiomeDecoratorBOP;
import biomesoplenty.worldgen.WorldGenMoss; import biomesoplenty.worldgen.WorldGenMoss;
public class BiomeGenForestNew extends BiomeGenBase public class BiomeGenForestNew extends BiomeGenBase

5
common/biomesoplenty/biomes/BiomeGenHillsNew.java → common/biomesoplenty/biomes/vanilla/BiomeGenHillsNew.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.biomes; package biomesoplenty.biomes.vanilla;
import java.util.Random; import java.util.Random;
@ -7,7 +7,8 @@ import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenMinable; import net.minecraft.world.gen.feature.WorldGenMinable;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.worldgen.WorldGenJacaranda; import biomesoplenty.biomes.BiomeDecoratorBOP;
import biomesoplenty.worldgen.tree.WorldGenJacaranda;
public class BiomeGenHillsNew extends BiomeGenBase public class BiomeGenHillsNew extends BiomeGenBase
{ {

7
common/biomesoplenty/biomes/BiomeGenJungleNew.java → common/biomesoplenty/biomes/vanilla/BiomeGenJungleNew.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.biomes; package biomesoplenty.biomes.vanilla;
import java.awt.Color; import java.awt.Color;
import java.util.Random; import java.util.Random;
@ -16,7 +16,8 @@ import net.minecraft.world.gen.feature.WorldGenTrees;
import net.minecraft.world.gen.feature.WorldGenVines; import net.minecraft.world.gen.feature.WorldGenVines;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.biomes.BiomeDecoratorBOP;
import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.entities.EntityJungleSpider; import biomesoplenty.entities.EntityJungleSpider;
public class BiomeGenJungleNew extends BiomeGenBase public class BiomeGenJungleNew extends BiomeGenBase
@ -115,7 +116,7 @@ public class BiomeGenJungleNew extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 9225359; return 9225359;
else else
{ {

3
common/biomesoplenty/biomes/BiomeGenPlainsNew.java → common/biomesoplenty/biomes/vanilla/BiomeGenPlainsNew.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.biomes; package biomesoplenty.biomes.vanilla;
import java.util.Random; import java.util.Random;
@ -10,6 +10,7 @@ import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.biomes.BiomeDecoratorBOP;
public class BiomeGenPlainsNew extends BiomeGenBase public class BiomeGenPlainsNew extends BiomeGenBase
{ {

9
common/biomesoplenty/biomes/BiomeGenSwampNew.java → common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.biomes; package biomesoplenty.biomes.vanilla;
import java.awt.Color; import java.awt.Color;
import java.util.Random; import java.util.Random;
@ -12,10 +12,11 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.biomes.BiomeDecoratorBOP;
import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenLog; import biomesoplenty.worldgen.WorldGenLog;
import biomesoplenty.worldgen.WorldGenMoss; import biomesoplenty.worldgen.WorldGenMoss;
import biomesoplenty.worldgen.WorldGenWillow; import biomesoplenty.worldgen.tree.WorldGenWillow;
public class BiomeGenSwampNew extends BiomeGenBase public class BiomeGenSwampNew extends BiomeGenBase
{ {
@ -108,7 +109,7 @@ public class BiomeGenSwampNew extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.Misc.skyColors) if (BOPConfigurationMisc.skyColors)
return 4149332; return 4149332;
else else
{ {

3
common/biomesoplenty/biomes/BiomeGenTaigaNew.java → common/biomesoplenty/biomes/vanilla/BiomeGenTaigaNew.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.biomes; package biomesoplenty.biomes.vanilla;
import java.util.Random; import java.util.Random;
@ -12,6 +12,7 @@ import net.minecraft.world.gen.feature.WorldGenTaiga2;
import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.biomes.BiomeDecoratorBOP;
public class BiomeGenTaigaNew extends BiomeGenBase public class BiomeGenTaigaNew extends BiomeGenBase
{ {

14
common/biomesoplenty/blocks/BlockBOPColorizedSapling.java
View file

@ -13,14 +13,14 @@ import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import biomesoplenty.BiomesOPlenty; import biomesoplenty.BiomesOPlenty;
import biomesoplenty.worldgen.WorldGenAcacia;
import biomesoplenty.worldgen.WorldGenMangrove;
import biomesoplenty.worldgen.WorldGenNetherBush; import biomesoplenty.worldgen.WorldGenNetherBush;
import biomesoplenty.worldgen.WorldGenPalmTree1; import biomesoplenty.worldgen.tree.WorldGenAcacia;
import biomesoplenty.worldgen.WorldGenPalmTree3; import biomesoplenty.worldgen.tree.WorldGenMangrove;
import biomesoplenty.worldgen.WorldGenPineTree; import biomesoplenty.worldgen.tree.WorldGenPalmTree1;
import biomesoplenty.worldgen.WorldGenRedwoodTree2; import biomesoplenty.worldgen.tree.WorldGenPalmTree3;
import biomesoplenty.worldgen.WorldGenWillow; import biomesoplenty.worldgen.tree.WorldGenPineTree;
import biomesoplenty.worldgen.tree.WorldGenRedwoodTree2;
import biomesoplenty.worldgen.tree.WorldGenWillow;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;

34
common/biomesoplenty/blocks/BlockBOPSapling.java
View file

@ -14,24 +14,24 @@ import net.minecraft.world.gen.feature.WorldGenerator;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import biomesoplenty.BiomesOPlenty; import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenApple;
import biomesoplenty.worldgen.WorldGenAutumn;
import biomesoplenty.worldgen.WorldGenAutumn2;
import biomesoplenty.worldgen.WorldGenBambooTree;
import biomesoplenty.worldgen.WorldGenBambooTree2;
import biomesoplenty.worldgen.WorldGenCherry1;
import biomesoplenty.worldgen.WorldGenCherry2;
import biomesoplenty.worldgen.WorldGenDeadTree2;
import biomesoplenty.worldgen.WorldGenJacaranda;
import biomesoplenty.worldgen.WorldGenMaple;
import biomesoplenty.worldgen.WorldGenMystic2;
import biomesoplenty.worldgen.WorldGenNetherBush; import biomesoplenty.worldgen.WorldGenNetherBush;
import biomesoplenty.worldgen.WorldGenOminous1; import biomesoplenty.worldgen.tree.WorldGenApple;
import biomesoplenty.worldgen.WorldGenOminous2; import biomesoplenty.worldgen.tree.WorldGenAutumn;
import biomesoplenty.worldgen.WorldGenOriginTree; import biomesoplenty.worldgen.tree.WorldGenAutumn2;
import biomesoplenty.worldgen.WorldGenPersimmon; import biomesoplenty.worldgen.tree.WorldGenBambooTree;
import biomesoplenty.worldgen.WorldGenPromisedTree; import biomesoplenty.worldgen.tree.WorldGenBambooTree2;
import biomesoplenty.worldgen.WorldGenTaiga9; import biomesoplenty.worldgen.tree.WorldGenCherry1;
import biomesoplenty.worldgen.tree.WorldGenCherry2;
import biomesoplenty.worldgen.tree.WorldGenDeadTree2;
import biomesoplenty.worldgen.tree.WorldGenJacaranda;
import biomesoplenty.worldgen.tree.WorldGenMaple;
import biomesoplenty.worldgen.tree.WorldGenMystic2;
import biomesoplenty.worldgen.tree.WorldGenOminous1;
import biomesoplenty.worldgen.tree.WorldGenOminous2;
import biomesoplenty.worldgen.tree.WorldGenOriginTree;
import biomesoplenty.worldgen.tree.WorldGenPersimmon;
import biomesoplenty.worldgen.tree.WorldGenPromisedTree;
import biomesoplenty.worldgen.tree.WorldGenTaiga9;
public class BlockBOPSapling extends BlockSapling public class BlockBOPSapling extends BlockSapling
{ {

6
common/biomesoplenty/blocks/BlockPromisedPortal.java
View file

@ -8,7 +8,7 @@ import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationIDs;
import biomesoplenty.helpers.TeleporterPromised; import biomesoplenty.helpers.TeleporterPromised;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
@ -77,9 +77,9 @@ public class BlockPromisedPortal extends Block
if (par5Entity instanceof EntityPlayerMP) if (par5Entity instanceof EntityPlayerMP)
{ {
EntityPlayerMP thePlayer = (EntityPlayerMP) par5Entity; EntityPlayerMP thePlayer = (EntityPlayerMP) par5Entity;
if (par5Entity.dimension != BOPConfiguration.IDs.promisedLandDimID) if (par5Entity.dimension != BOPConfigurationIDs.promisedLandDimID)
{ {
thePlayer.mcServer.getConfigurationManager().transferPlayerToDimension(thePlayer, BOPConfiguration.IDs.promisedLandDimID, new TeleporterPromised(thePlayer.mcServer.worldServerForDimension(BOPConfiguration.IDs.promisedLandDimID))); thePlayer.mcServer.getConfigurationManager().transferPlayerToDimension(thePlayer, BOPConfigurationIDs.promisedLandDimID, new TeleporterPromised(thePlayer.mcServer.worldServerForDimension(BOPConfigurationIDs.promisedLandDimID)));
} }
else else
{ {

761
common/biomesoplenty/configuration/BOPBiomes.java
View file

File diff suppressed because it is too large Load diff

143
common/biomesoplenty/configuration/BOPBlocks.java
View file

@ -47,6 +47,7 @@ import biomesoplenty.blocks.BlockPromisedPortal;
import biomesoplenty.blocks.BlockPuddle; import biomesoplenty.blocks.BlockPuddle;
import biomesoplenty.blocks.BlockTreeMoss; import biomesoplenty.blocks.BlockTreeMoss;
import biomesoplenty.blocks.BlockWillow; import biomesoplenty.blocks.BlockWillow;
import biomesoplenty.configuration.configfile.BOPConfigurationIDs;
import biomesoplenty.itemblocks.ItemBlockAltar; import biomesoplenty.itemblocks.ItemBlockAltar;
import biomesoplenty.itemblocks.ItemBlockAppleLeaves; import biomesoplenty.itemblocks.ItemBlockAppleLeaves;
import biomesoplenty.itemblocks.ItemBlockBamboo; import biomesoplenty.itemblocks.ItemBlockBamboo;
@ -121,88 +122,88 @@ public class BOPBlocks
private static void initializeBlocks() private static void initializeBlocks()
{ {
// Block declaration // Block declaration
Blocks.mud = Optional.of((new BlockMud(BOPConfiguration.IDs.mudID)).setHardness(0.6F).setStepSound(Block.soundSandFootstep).setUnlocalizedName("bop.mud")); Blocks.mud = Optional.of((new BlockMud(BOPConfigurationIDs.mudID)).setHardness(0.6F).setStepSound(Block.soundSandFootstep).setUnlocalizedName("bop.mud"));
Blocks.driedDirt = Optional.of(new BlockBOPGeneric(BOPConfiguration.IDs.driedDirtID, Material.rock, BlockType.DRIED_DIRT).setUnlocalizedName("bop.generic")); Blocks.driedDirt = Optional.of(new BlockBOPGeneric(BOPConfigurationIDs.driedDirtID, Material.rock, BlockType.DRIED_DIRT).setUnlocalizedName("bop.generic"));
Blocks.redRock = Optional.of((new BlockBOPRedRock(BOPConfiguration.IDs.redRockID)).setUnlocalizedName("bop.redRocks")); Blocks.redRock = Optional.of((new BlockBOPRedRock(BOPConfigurationIDs.redRockID)).setUnlocalizedName("bop.redRocks"));
Blocks.ash = Optional.of((new BlockAsh(BOPConfiguration.IDs.ashID)).setHardness(0.4F).setStepSound(Block.soundSandFootstep).setUnlocalizedName("bop.ash")); Blocks.ash = Optional.of((new BlockAsh(BOPConfigurationIDs.ashID)).setHardness(0.4F).setStepSound(Block.soundSandFootstep).setUnlocalizedName("bop.ash"));
Blocks.plants = Optional.of((new BlockBOPPlant(BOPConfiguration.IDs.plantsID)).setUnlocalizedName("bop.plants")); Blocks.plants = Optional.of((new BlockBOPPlant(BOPConfigurationIDs.plantsID)).setUnlocalizedName("bop.plants"));
Blocks.flowers = Optional.of((new BlockBOPFlower(BOPConfiguration.IDs.flowersID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.flowers")); Blocks.flowers = Optional.of((new BlockBOPFlower(BOPConfigurationIDs.flowersID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.flowers"));
Blocks.mushrooms = Optional.of((new BlockBOPMushroom(BOPConfiguration.IDs.mushroomsID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.mushrooms")); Blocks.mushrooms = Optional.of((new BlockBOPMushroom(BOPConfigurationIDs.mushroomsID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.mushrooms"));
Blocks.coral = Optional.of((new BlockBOPCoral(BOPConfiguration.IDs.coralID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.coral")); Blocks.coral = Optional.of((new BlockBOPCoral(BOPConfigurationIDs.coralID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.coral"));
Blocks.willow = Optional.of((new BlockWillow(BOPConfiguration.IDs.willowID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.willow")); Blocks.willow = Optional.of((new BlockWillow(BOPConfigurationIDs.willowID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.willow"));
Blocks.ivy = Optional.of((new BlockIvy(BOPConfiguration.IDs.ivyID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.ivy")); Blocks.ivy = Optional.of((new BlockIvy(BOPConfigurationIDs.ivyID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.ivy"));
Blocks.leaves1 = Optional.of((new BlockBOPLeaves(BOPConfiguration.IDs.leaves1ID, LeafCategory.CAT1)).setUnlocalizedName("bop.leaves1")); Blocks.leaves1 = Optional.of((new BlockBOPLeaves(BOPConfigurationIDs.leaves1ID, LeafCategory.CAT1)).setUnlocalizedName("bop.leaves1"));
Blocks.leaves2 = Optional.of((new BlockBOPLeaves(BOPConfiguration.IDs.leaves2ID, LeafCategory.CAT2)).setUnlocalizedName("bop.leaves2")); Blocks.leaves2 = Optional.of((new BlockBOPLeaves(BOPConfigurationIDs.leaves2ID, LeafCategory.CAT2)).setUnlocalizedName("bop.leaves2"));
Blocks.foliage = Optional.of((new BlockBOPFoliage(BOPConfiguration.IDs.foliageID)).setUnlocalizedName("bop.foliage")); Blocks.foliage = Optional.of((new BlockBOPFoliage(BOPConfigurationIDs.foliageID)).setUnlocalizedName("bop.foliage"));
Blocks.ashStone = Optional.of(new BlockBOPGeneric(BOPConfiguration.IDs.ashStoneID, Material.rock, BlockType.ASH_STONE)); Blocks.ashStone = Optional.of(new BlockBOPGeneric(BOPConfigurationIDs.ashStoneID, Material.rock, BlockType.ASH_STONE));
Blocks.hardIce = Optional.of(new BlockBOPGeneric(BOPConfiguration.IDs.hardIceID, Material.rock, BlockType.HARD_ICE)); Blocks.hardIce = Optional.of(new BlockBOPGeneric(BOPConfigurationIDs.hardIceID, Material.rock, BlockType.HARD_ICE));
Blocks.leavesFruit = Optional.of((new BlockBOPAppleLeaves(BOPConfiguration.IDs.leavesFruitID)).setUnlocalizedName("bop.leavesFruit")); Blocks.leavesFruit = Optional.of((new BlockBOPAppleLeaves(BOPConfigurationIDs.leavesFruitID)).setUnlocalizedName("bop.leavesFruit"));
Blocks.leavesFruit2 = Optional.of((new BlockBOPPersimmonLeaves(BOPConfiguration.IDs.leavesFruit2ID)).setUnlocalizedName("bop.leavesFruit2")); Blocks.leavesFruit2 = Optional.of((new BlockBOPPersimmonLeaves(BOPConfigurationIDs.leavesFruit2ID)).setUnlocalizedName("bop.leavesFruit2"));
Blocks.bamboo = Optional.of(new BlockBamboo(BOPConfiguration.IDs.bambooID).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.bamboo")); Blocks.bamboo = Optional.of(new BlockBamboo(BOPConfigurationIDs.bambooID).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.bamboo"));
Blocks.mudBrick = Optional.of(new BlockBOPGeneric(BOPConfiguration.IDs.mudBrickBlockID, Material.rock, BlockType.MUD_BRICK)); Blocks.mudBrick = Optional.of(new BlockBOPGeneric(BOPConfigurationIDs.mudBrickBlockID, Material.rock, BlockType.MUD_BRICK));
Blocks.mudBricksStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.mudBrickStairsID, Blocks.redRock.get(), Category.MUD_BRICKS)).setHardness(1.0F).setUnlocalizedName("bop.mudBricksStairs")); Blocks.mudBricksStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.mudBrickStairsID, Blocks.redRock.get(), Category.MUD_BRICKS)).setHardness(1.0F).setUnlocalizedName("bop.mudBricksStairs"));
Blocks.stoneDoubleSlab = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfiguration.IDs.stoneDoubleSlabID, true, Material.rock, SlabCategory.STONE)).setUnlocalizedName("bop.stoneDoubleSlab")); Blocks.stoneDoubleSlab = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfigurationIDs.stoneDoubleSlabID, true, Material.rock, SlabCategory.STONE)).setUnlocalizedName("bop.stoneDoubleSlab"));
Blocks.stoneSingleSlab = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfiguration.IDs.stoneSingleSlabID, false, Material.rock, SlabCategory.STONE)).setUnlocalizedName("bop.stoneSingleSlab")); Blocks.stoneSingleSlab = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfigurationIDs.stoneSingleSlabID, false, Material.rock, SlabCategory.STONE)).setUnlocalizedName("bop.stoneSingleSlab"));
Blocks.originGrass = Optional.of((new BlockOriginGrass(BOPConfiguration.IDs.originGrassID)).setHardness(0.6F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.originGrass")); Blocks.originGrass = Optional.of((new BlockOriginGrass(BOPConfigurationIDs.originGrassID)).setHardness(0.6F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.originGrass"));
Blocks.longGrass = Optional.of((new BlockLongGrass(BOPConfiguration.IDs.longGrassID)).setHardness(0.6F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.longGrass")); Blocks.longGrass = Optional.of((new BlockLongGrass(BOPConfigurationIDs.longGrassID)).setHardness(0.6F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.longGrass"));
Blocks.treeMoss = Optional.of((new BlockTreeMoss(BOPConfiguration.IDs.treeMossID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.treeMoss")); Blocks.treeMoss = Optional.of((new BlockTreeMoss(BOPConfigurationIDs.treeMossID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.treeMoss"));
Blocks.logs1 = Optional.of((new BlockBOPLog(BOPConfiguration.IDs.logs1ID,LogCategory.CAT1)).setUnlocalizedName("bop.wood1")); Blocks.logs1 = Optional.of((new BlockBOPLog(BOPConfigurationIDs.logs1ID,LogCategory.CAT1)).setUnlocalizedName("bop.wood1"));
Blocks.logs2 = Optional.of((new BlockBOPLog(BOPConfiguration.IDs.logs2ID,LogCategory.CAT2)).setUnlocalizedName("bop.wood2")); Blocks.logs2 = Optional.of((new BlockBOPLog(BOPConfigurationIDs.logs2ID,LogCategory.CAT2)).setUnlocalizedName("bop.wood2"));
Blocks.logs3 = Optional.of((new BlockBOPLog(BOPConfiguration.IDs.logs3ID,LogCategory.CAT3)).setUnlocalizedName("bop.wood3")); Blocks.logs3 = Optional.of((new BlockBOPLog(BOPConfigurationIDs.logs3ID,LogCategory.CAT3)).setUnlocalizedName("bop.wood3"));
Blocks.logs4 = Optional.of((new BlockBOPLog(BOPConfiguration.IDs.logs4ID,LogCategory.CAT4)).setUnlocalizedName("bop.wood4")); Blocks.logs4 = Optional.of((new BlockBOPLog(BOPConfigurationIDs.logs4ID,LogCategory.CAT4)).setUnlocalizedName("bop.wood4"));
Blocks.petals = Optional.of((new BlockBOPPetals(BOPConfiguration.IDs.petalsID)).setUnlocalizedName("bop.petals")); Blocks.petals = Optional.of((new BlockBOPPetals(BOPConfigurationIDs.petalsID)).setUnlocalizedName("bop.petals"));
Blocks.saplings = Optional.of((new BlockBOPSapling(BOPConfiguration.IDs.saplingsID)).setUnlocalizedName("bop.saplings")); Blocks.saplings = Optional.of((new BlockBOPSapling(BOPConfigurationIDs.saplingsID)).setUnlocalizedName("bop.saplings"));
Blocks.colorizedSaplings = Optional.of((new BlockBOPColorizedSapling(BOPConfiguration.IDs.colourizedSaplingsID)).setUnlocalizedName("bop.colorizedSaplings")); Blocks.colorizedSaplings = Optional.of((new BlockBOPColorizedSapling(BOPConfigurationIDs.colourizedSaplingsID)).setUnlocalizedName("bop.colorizedSaplings"));
Blocks.redCobbleStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.redCobbleStairsID, Blocks.redRock.get(), Category.RED_COBBLE)).setHardness(1.6F).setUnlocalizedName("bop.redCobbleStairs")); Blocks.redCobbleStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.redCobbleStairsID, Blocks.redRock.get(), Category.RED_COBBLE)).setHardness(1.6F).setUnlocalizedName("bop.redCobbleStairs"));
Blocks.redBricksStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.redBrickStairsID, Blocks.redRock.get(), Category.RED_BRICKS)).setHardness(1.1F).setUnlocalizedName("bop.redBricksStairs")); Blocks.redBricksStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.redBrickStairsID, Blocks.redRock.get(), Category.RED_BRICKS)).setHardness(1.1F).setUnlocalizedName("bop.redBricksStairs"));
Blocks.hardSand = Optional.of(new BlockBOPGeneric(BOPConfiguration.IDs.hardSandID, Material.sand, BlockType.HARD_SAND)); Blocks.hardSand = Optional.of(new BlockBOPGeneric(BOPConfigurationIDs.hardSandID, Material.sand, BlockType.HARD_SAND));
Blocks.hardDirt = Optional.of(new BlockBOPGeneric(BOPConfiguration.IDs.hardDirtID, Material.rock, BlockType.HARD_DIRT)); Blocks.hardDirt = Optional.of(new BlockBOPGeneric(BOPConfigurationIDs.hardDirtID, Material.rock, BlockType.HARD_DIRT));
Blocks.holyGrass = Optional.of(new BlockBOPGrass(BOPConfiguration.IDs.holyGrassID).setUnlocalizedName("bop.holyGrass")); Blocks.holyGrass = Optional.of(new BlockBOPGrass(BOPConfigurationIDs.holyGrassID).setUnlocalizedName("bop.holyGrass"));
Blocks.holyDirt = Optional.of(new BlockBOPGeneric(BOPConfiguration.IDs.holyDirtID, Material.sand, BlockType.HOLY_DIRT)); Blocks.holyDirt = Optional.of(new BlockBOPGeneric(BOPConfigurationIDs.holyDirtID, Material.sand, BlockType.HOLY_DIRT));
Blocks.holyStone = Optional.of((new BlockBOPSkystone(BOPConfiguration.IDs.holyStoneID)).setUnlocalizedName("bop.holyStone")); Blocks.holyStone = Optional.of((new BlockBOPSkystone(BOPConfigurationIDs.holyStoneID)).setUnlocalizedName("bop.holyStone"));
Blocks.holyCobbleStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.holyCobbleStairsID, Blocks.holyStone.get(), Category.HOLY_COBBLE)).setHardness(1.6F).setUnlocalizedName("bop.holyCobbleStairs")); Blocks.holyCobbleStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.holyCobbleStairsID, Blocks.holyStone.get(), Category.HOLY_COBBLE)).setHardness(1.6F).setUnlocalizedName("bop.holyCobbleStairs"));
Blocks.holyBricksStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.holyBrickStairsID, Blocks.holyStone.get(), Category.HOLY_BRICKS)).setHardness(1.1F).setUnlocalizedName("bop.holyBricksStairs")); Blocks.holyBricksStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.holyBrickStairsID, Blocks.holyStone.get(), Category.HOLY_BRICKS)).setHardness(1.1F).setUnlocalizedName("bop.holyBricksStairs"));
Blocks.crystal = Optional.of(new BlockBOPGeneric(BOPConfiguration.IDs.crystalID, Material.glass, BlockType.CRYSTAL)); Blocks.crystal = Optional.of(new BlockBOPGeneric(BOPConfigurationIDs.crystalID, Material.glass, BlockType.CRYSTAL));
Blocks.promisedPortal = Optional.of(new BlockPromisedPortal(BOPConfiguration.IDs.promisedLandPortalID).setUnlocalizedName("bop.promisedPortal").setBlockUnbreakable().setResistance(6000000.0F).setLightValue(1.0F)); Blocks.promisedPortal = Optional.of(new BlockPromisedPortal(BOPConfigurationIDs.promisedLandPortalID).setUnlocalizedName("bop.promisedPortal").setBlockUnbreakable().setResistance(6000000.0F).setLightValue(1.0F));
Blocks.amethystOre = Optional.of(new BlockBOPAmethyst(BOPConfiguration.IDs.amethystOreID, Material.rock).setUnlocalizedName("bop.amethystOre")); Blocks.amethystOre = Optional.of(new BlockBOPAmethyst(BOPConfigurationIDs.amethystOreID, Material.rock).setUnlocalizedName("bop.amethystOre"));
Blocks.moss = Optional.of((new BlockMoss(BOPConfiguration.IDs.mossID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.moss")); Blocks.moss = Optional.of((new BlockMoss(BOPConfigurationIDs.mossID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.moss"));
Blocks.cragRock = Optional.of(new BlockBOPGeneric(BOPConfiguration.IDs.cragRockID, Material.rock, BlockType.CRAG_ROCK)); Blocks.cragRock = Optional.of(new BlockBOPGeneric(BOPConfigurationIDs.cragRockID, Material.rock, BlockType.CRAG_ROCK));
Blocks.cloud = Optional.of((new BlockCloud(BOPConfiguration.IDs.cloudID)).setHardness(0.1F).setLightOpacity(3).setStepSound(Block.soundClothFootstep).setUnlocalizedName("bop.cloud")); Blocks.cloud = Optional.of((new BlockCloud(BOPConfigurationIDs.cloudID)).setHardness(0.1F).setLightOpacity(3).setStepSound(Block.soundClothFootstep).setUnlocalizedName("bop.cloud"));
Blocks.bones = Optional.of((new BlockBones(BOPConfiguration.IDs.bonesID)).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("bop.bones")); Blocks.bones = Optional.of((new BlockBones(BOPConfigurationIDs.bonesID)).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("bop.bones"));
Blocks.glass = Optional.of((new BlockBOPGlass(BOPConfiguration.IDs.glassID)).setStepSound(Block.soundGlassFootstep).setUnlocalizedName("bop.glass")); Blocks.glass = Optional.of((new BlockBOPGlass(BOPConfigurationIDs.glassID)).setStepSound(Block.soundGlassFootstep).setUnlocalizedName("bop.glass"));
Blocks.altar = Optional.of((new BlockAltar(BOPConfiguration.IDs.altarID)).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("bop.altar")); Blocks.altar = Optional.of((new BlockAltar(BOPConfigurationIDs.altarID)).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("bop.altar"));
Blocks.puddle = Optional.of((new BlockPuddle(BOPConfiguration.IDs.puddleID)).setHardness(0.6F).setStepSound(Block.soundGravelFootstep).setUnlocalizedName("bop.puddle")); Blocks.puddle = Optional.of((new BlockPuddle(BOPConfigurationIDs.puddleID)).setHardness(0.6F).setStepSound(Block.soundGravelFootstep).setUnlocalizedName("bop.puddle"));
Blocks.grave = Optional.of((new BlockGrave(BOPConfiguration.IDs.graveID)).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("bop.grave")); Blocks.grave = Optional.of((new BlockGrave(BOPConfigurationIDs.graveID)).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("bop.grave"));
Blocks.planks = Optional.of((new BlockBOPPlank(BOPConfiguration.IDs.planksID)).setResistance(5.0F).setStepSound(Block.soundWoodFootstep).setUnlocalizedName("bop.planks")); Blocks.planks = Optional.of((new BlockBOPPlank(BOPConfigurationIDs.planksID)).setResistance(5.0F).setStepSound(Block.soundWoodFootstep).setUnlocalizedName("bop.planks"));
Blocks.woodenDoubleSlab1 = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfiguration.IDs.woodenDoubleSlab1ID, true, Material.wood, SlabCategory.WOOD1)).setUnlocalizedName("bop.woodenDoubleSlab1")); Blocks.woodenDoubleSlab1 = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfigurationIDs.woodenDoubleSlab1ID, true, Material.wood, SlabCategory.WOOD1)).setUnlocalizedName("bop.woodenDoubleSlab1"));
Blocks.woodenSingleSlab1 = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfiguration.IDs.woodenSingleSlab1ID, false, Material.wood, SlabCategory.WOOD1)).setUnlocalizedName("bop.woodenSingleSlab1")); Blocks.woodenSingleSlab1 = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfigurationIDs.woodenSingleSlab1ID, false, Material.wood, SlabCategory.WOOD1)).setUnlocalizedName("bop.woodenSingleSlab1"));
Blocks.woodenDoubleSlab2 = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfiguration.IDs.woodenDoubleSlab2ID, true, Material.wood, SlabCategory.WOOD2)).setUnlocalizedName("bop.woodenDoubleSlab2")); Blocks.woodenDoubleSlab2 = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfigurationIDs.woodenDoubleSlab2ID, true, Material.wood, SlabCategory.WOOD2)).setUnlocalizedName("bop.woodenDoubleSlab2"));
Blocks.woodenSingleSlab2 = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfiguration.IDs.woodenSingleSlab2ID, false, Material.wood, SlabCategory.WOOD2)).setUnlocalizedName("bop.woodenSingleSlab2")); Blocks.woodenSingleSlab2 = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfigurationIDs.woodenSingleSlab2ID, false, Material.wood, SlabCategory.WOOD2)).setUnlocalizedName("bop.woodenSingleSlab2"));
Blocks.acaciaStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.acaciaStairsID, Blocks.planks.get(), Category.ACACIA)).setUnlocalizedName("bop.acaciaStairs")); Blocks.acaciaStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.acaciaStairsID, Blocks.planks.get(), Category.ACACIA)).setUnlocalizedName("bop.acaciaStairs"));
Blocks.cherryStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.cherryStairsID, Blocks.planks.get(), Category.CHERRY)).setUnlocalizedName("bop.cherryStairs")); Blocks.cherryStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.cherryStairsID, Blocks.planks.get(), Category.CHERRY)).setUnlocalizedName("bop.cherryStairs"));
Blocks.darkStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.darkStairsID, Blocks.planks.get(), Category.DARK)).setUnlocalizedName("bop.darkStairs")); Blocks.darkStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.darkStairsID, Blocks.planks.get(), Category.DARK)).setUnlocalizedName("bop.darkStairs"));
Blocks.firStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.firStairsID, Blocks.planks.get(), Category.FIR)).setUnlocalizedName("bop.firStairs")); Blocks.firStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.firStairsID, Blocks.planks.get(), Category.FIR)).setUnlocalizedName("bop.firStairs"));
Blocks.holyStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.holyStairsID, Blocks.planks.get(), Category.HOLY)).setUnlocalizedName("bop.holyStairs")); Blocks.holyStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.holyStairsID, Blocks.planks.get(), Category.HOLY)).setUnlocalizedName("bop.holyStairs"));
Blocks.magicStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.magicStairsID, Blocks.planks.get(), Category.MAGIC)).setUnlocalizedName("bop.magicStairs")); Blocks.magicStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.magicStairsID, Blocks.planks.get(), Category.MAGIC)).setUnlocalizedName("bop.magicStairs"));
Blocks.mangroveStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.mangroveStairsID, Blocks.planks.get(), Category.MANGROVE)).setUnlocalizedName("bop.mangroveStairs")); Blocks.mangroveStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.mangroveStairsID, Blocks.planks.get(), Category.MANGROVE)).setUnlocalizedName("bop.mangroveStairs"));
Blocks.palmStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.palmStairsID, Blocks.planks.get(), Category.PALM)).setUnlocalizedName("bop.palmStairs")); Blocks.palmStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.palmStairsID, Blocks.planks.get(), Category.PALM)).setUnlocalizedName("bop.palmStairs"));
Blocks.redwoodStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.redwoodStairsID, Blocks.planks.get(), Category.REDWOOD)).setUnlocalizedName("bop.redwoodStairs")); Blocks.redwoodStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.redwoodStairsID, Blocks.planks.get(), Category.REDWOOD)).setUnlocalizedName("bop.redwoodStairs"));
Blocks.willowStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.willowStairsID, Blocks.planks.get(), Category.WILLOW)).setUnlocalizedName("bop.willowStairs")); Blocks.willowStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.willowStairsID, Blocks.planks.get(), Category.WILLOW)).setUnlocalizedName("bop.willowStairs"));
Blocks.pineStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.pineStairsID, Blocks.planks.get(), Category.PINE)).setUnlocalizedName("bop.pineStairs")); Blocks.pineStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.pineStairsID, Blocks.planks.get(), Category.PINE)).setUnlocalizedName("bop.pineStairs"));
Blocks.hellBarkStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.hellBarkStairsID, Blocks.planks.get(), Category.HELL_BARK)).setUnlocalizedName("bop.hellBarkStairs")); Blocks.hellBarkStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.hellBarkStairsID, Blocks.planks.get(), Category.HELL_BARK)).setUnlocalizedName("bop.hellBarkStairs"));
Blocks.jacarandaStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.jacarandaStairsID, Blocks.planks.get(), Category.JACARANDA)).setUnlocalizedName("bop.jacarandaStairs")); Blocks.jacarandaStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.jacarandaStairsID, Blocks.planks.get(), Category.JACARANDA)).setUnlocalizedName("bop.jacarandaStairs"));
Blocks.leavesColorized = Optional.of((new BlockBOPColorizedLeaves(BOPConfiguration.IDs.colourizedLeavesID)).setUnlocalizedName("bop.leavesColorized")); Blocks.leavesColorized = Optional.of((new BlockBOPColorizedLeaves(BOPConfigurationIDs.colourizedLeavesID)).setUnlocalizedName("bop.leavesColorized"));
} }
private static void registerBlocks() private static void registerBlocks()

1207
common/biomesoplenty/configuration/BOPConfiguration.java
View file

File diff suppressed because it is too large Load diff

17
common/biomesoplenty/configuration/BOPCrafting.java
View file

@ -10,6 +10,7 @@ import net.minecraftforge.oredict.ShapedOreRecipe;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.api.Fluids; import biomesoplenty.api.Fluids;
import biomesoplenty.api.Items; import biomesoplenty.api.Items;
import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.helpers.FurnaceFuel; import biomesoplenty.helpers.FurnaceFuel;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
@ -158,7 +159,7 @@ public class BOPCrafting
GameRegistry.addRecipe(new ItemStack(Block.stoneBrick, 1, 1), new Object[] {"MMM", "MSM", "MMM", 'M', Blocks.moss.get(), 'S', Block.stoneBrick}); GameRegistry.addRecipe(new ItemStack(Block.stoneBrick, 1, 1), new Object[] {"MMM", "MSM", "MMM", 'M', Blocks.moss.get(), 'S', Block.stoneBrick});
//Scythes //Scythes
if (BOPConfiguration.Misc.scytheCrafting) if (BOPConfigurationMisc.scytheCrafting)
{ {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheWood.get(), 1), new Object [] {" MM", "M S", " S", Character.valueOf('M'), "plankWood", Character.valueOf('S'), "stickWood" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheWood.get(), 1), new Object [] {" MM", "M S", " S", Character.valueOf('M'), "plankWood", Character.valueOf('S'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheStone.get(), 1), new Object [] {" MM", "M S", " S", Character.valueOf('M'), Block.cobblestone, Character.valueOf('S'), "stickWood" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheStone.get(), 1), new Object [] {" MM", "M S", " S", Character.valueOf('M'), Block.cobblestone, Character.valueOf('S'), "stickWood" }));
@ -174,7 +175,7 @@ public class BOPCrafting
} }
//Mud Tools and Armor //Mud Tools and Armor
if (BOPConfiguration.Misc.mudTools) if (BOPConfigurationMisc.mudTools)
{ {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.pickaxeMud.get(), 1), new Object [] {"###", " X ", " X ", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.pickaxeMud.get(), 1), new Object [] {"###", " X ", " X ", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.shovelMud.get(), 1), new Object [] {"#", "X", "X", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood"})); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.shovelMud.get(), 1), new Object [] {"#", "X", "X", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood"}));
@ -190,7 +191,7 @@ public class BOPCrafting
} }
//Amethyst Tools and Armor //Amethyst Tools and Armor
if (BOPConfiguration.Misc.amethystTools) if (BOPConfigurationMisc.amethystTools)
{ {
GameRegistry.addRecipe(new ItemStack(Items.pickaxeAmethyst.get(), 1), new Object [] {"###", " X ", " X ", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('X'), Item.ingotIron}); GameRegistry.addRecipe(new ItemStack(Items.pickaxeAmethyst.get(), 1), new Object [] {"###", " X ", " X ", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('X'), Item.ingotIron});
GameRegistry.addRecipe(new ItemStack(Items.shovelAmethyst.get(), 1), new Object [] {"#", "X", "X", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('X'), Item.ingotIron}); GameRegistry.addRecipe(new ItemStack(Items.shovelAmethyst.get(), 1), new Object [] {"#", "X", "X", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('X'), Item.ingotIron});
@ -207,7 +208,7 @@ public class BOPCrafting
} }
//Flower Bands //Flower Bands
if (BOPConfiguration.Misc.flowerbandCrafting) if (BOPConfigurationMisc.flowerbandCrafting)
{ {
GameRegistry.addRecipe(new ItemStack(Items.flowerBand.get(), 1, 0), new Object [] {"CCC", "C C", "CCC", Character.valueOf('C'), new ItemStack(Blocks.flowers.get(), 1, 0)}); GameRegistry.addRecipe(new ItemStack(Items.flowerBand.get(), 1, 0), new Object [] {"CCC", "C C", "CCC", Character.valueOf('C'), new ItemStack(Blocks.flowers.get(), 1, 0)});
GameRegistry.addRecipe(new ItemStack(Items.flowerBand.get(), 1, 1), new Object [] {"CDC", "D D", "CDC", Character.valueOf('C'), new ItemStack(Blocks.flowers.get(), 1, 0), Character.valueOf('D'), new ItemStack(Blocks.flowers.get(), 1, 5)}); GameRegistry.addRecipe(new ItemStack(Items.flowerBand.get(), 1, 1), new Object [] {"CDC", "D D", "CDC", Character.valueOf('C'), new ItemStack(Blocks.flowers.get(), 1, 0), Character.valueOf('D'), new ItemStack(Blocks.flowers.get(), 1, 5)});
@ -218,7 +219,7 @@ public class BOPCrafting
//Other //Other
GameRegistry.addRecipe(new ItemStack(Item.wheat, 1), new Object[] {"###", '#', new ItemStack(Blocks.plants.get(),1,6)}); GameRegistry.addRecipe(new ItemStack(Item.wheat, 1), new Object[] {"###", '#', new ItemStack(Blocks.plants.get(),1,6)});
if (BOPConfiguration.Misc.staffCrafting) if (BOPConfigurationMisc.staffCrafting)
{ {
GameRegistry.addRecipe(new ItemStack(Items.ancientStaff.get(), 1, 0), new Object[] {"T", "P", "H", 'T', new ItemStack(Items.ancientStaff.get(), 1, 3), 'P', new ItemStack(Items.ancientStaff.get(), 1, 2), 'H', new ItemStack(Items.ancientStaff.get(), 1, 1)}); GameRegistry.addRecipe(new ItemStack(Items.ancientStaff.get(), 1, 0), new Object[] {"T", "P", "H", 'T', new ItemStack(Items.ancientStaff.get(), 1, 3), 'P', new ItemStack(Items.ancientStaff.get(), 1, 2), 'H', new ItemStack(Items.ancientStaff.get(), 1, 1)});
GameRegistry.addRecipe(new ItemStack(Items.ancientStaff.get(), 1, 1), new Object[] {"ESE", "ETE", " E ", 'E', Block.whiteStone, 'T', new ItemStack(Items.miscItems.get(), 1, 13), 'S', new ItemStack(Items.miscItems.get(), 1, 15)}); GameRegistry.addRecipe(new ItemStack(Items.ancientStaff.get(), 1, 1), new Object[] {"ESE", "ETE", " E ", 'E', Block.whiteStone, 'T', new ItemStack(Items.miscItems.get(), 1, 13), 'S', new ItemStack(Items.miscItems.get(), 1, 15)});
@ -227,13 +228,13 @@ public class BOPCrafting
GameRegistry.addShapelessRecipe(new ItemStack(Items.ancientStaff.get(), 1, 0), new ItemStack(Items.ancientStaff.get(), 1, 4), new ItemStack(Item.netherStar, 1)); GameRegistry.addShapelessRecipe(new ItemStack(Items.ancientStaff.get(), 1, 0), new ItemStack(Items.ancientStaff.get(), 1, 4), new ItemStack(Item.netherStar, 1));
} }
if (BOPConfiguration.Misc.enderporterCrafting) if (BOPConfigurationMisc.enderporterCrafting)
{ {
GameRegistry.addRecipe(new ItemStack(Items.enderporter.get(), 1, 0), new Object[] {"IOI", "OAO", "IOI", 'I', Item.eyeOfEnder, 'O', Block.obsidian, 'A', new ItemStack(Blocks.amethystOre.get(), 1, 1)}); GameRegistry.addRecipe(new ItemStack(Items.enderporter.get(), 1, 0), new Object[] {"IOI", "OAO", "IOI", 'I', Item.eyeOfEnder, 'O', Block.obsidian, 'A', new ItemStack(Blocks.amethystOre.get(), 1, 1)});
GameRegistry.addRecipe(new ItemStack(Items.bopDiscMud.get(), 1), new Object[] {" M ", "MDM", " M ", 'M', Items.mudball.get(), 'D', Items.bopDisc.get()}); GameRegistry.addRecipe(new ItemStack(Items.bopDiscMud.get(), 1), new Object[] {" M ", "MDM", " M ", 'M', Items.mudball.get(), 'D', Items.bopDisc.get()});
} }
if (BOPConfiguration.Misc.altarCrafting) if (BOPConfigurationMisc.altarCrafting)
{ {
GameRegistry.addRecipe(new ItemStack(Items.soulManipulator.get(), 1, 0), new Object[] {"G", "T", "B", 'G', Block.glass, 'T', Item.ghastTear, 'B', Item.blazeRod}); GameRegistry.addRecipe(new ItemStack(Items.soulManipulator.get(), 1, 0), new Object[] {"G", "T", "B", 'G', Block.glass, 'T', Item.ghastTear, 'B', Item.blazeRod});
GameRegistry.addRecipe(new ItemStack(Items.soulManipulator.get(), 1, 1), new Object[] {"TSA", "PMS", "APT", 'S', new ItemStack(Items.miscItems.get(), 1, 16), 'A', Block.slowSand, 'T', Item.ghastTear, 'P', Item.blazePowder, 'M', new ItemStack(Items.soulManipulator.get(), 1, 0)}); GameRegistry.addRecipe(new ItemStack(Items.soulManipulator.get(), 1, 1), new Object[] {"TSA", "PMS", "APT", 'S', new ItemStack(Items.miscItems.get(), 1, 16), 'A', Block.slowSand, 'T', Item.ghastTear, 'P', Item.blazePowder, 'M', new ItemStack(Items.soulManipulator.get(), 1, 0)});
@ -243,7 +244,7 @@ public class BOPCrafting
} }
//Dart Blower //Dart Blower
if (BOPConfiguration.Misc.dartCrafting) if (BOPConfigurationMisc.dartCrafting)
{ {
GameRegistry.addRecipe(new ItemStack(Items.dartBlower.get(), 1), new Object[] {"R R", "R R", "R R", Character.valueOf('R'), new ItemStack(Blocks.plants.get(), 1, 8)}); GameRegistry.addRecipe(new ItemStack(Items.dartBlower.get(), 1), new Object[] {"R R", "R R", "R R", Character.valueOf('R'), new ItemStack(Blocks.plants.get(), 1, 8)});
GameRegistry.addRecipe(new ItemStack(Items.dart.get(), 4, 0), new Object[] {"T", "R", "F", Character.valueOf('T'), new ItemStack(Blocks.plants.get(), 1, 5), Character.valueOf('R'), new ItemStack(Blocks.plants.get(), 1, 8), Character.valueOf('F'), Item.feather}); GameRegistry.addRecipe(new ItemStack(Items.dart.get(), 4, 0), new Object[] {"T", "R", "F", Character.valueOf('T'), new ItemStack(Blocks.plants.get(), 1, 5), Character.valueOf('R'), new ItemStack(Blocks.plants.get(), 1, 8), Character.valueOf('F'), Item.feather});

15
common/biomesoplenty/configuration/BOPEntities.java
View file

@ -6,6 +6,7 @@ import net.minecraft.entity.EntityList;
import net.minecraft.entity.EnumCreatureType; import net.minecraft.entity.EnumCreatureType;
import biomesoplenty.BiomesOPlenty; import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.Biomes; import biomesoplenty.api.Biomes;
import biomesoplenty.configuration.configfile.BOPConfigurationIDs;
import biomesoplenty.entities.EntityGlob; import biomesoplenty.entities.EntityGlob;
import biomesoplenty.entities.EntityJungleSpider; import biomesoplenty.entities.EntityJungleSpider;
import biomesoplenty.entities.EntityPhantom; import biomesoplenty.entities.EntityPhantom;
@ -39,14 +40,14 @@ public class BOPEntities {
public static void init() public static void init()
{ {
EntityRegistry.registerModEntity(EntityMudball.class, "MudBall", BOPConfiguration.IDs.entityMudballID, BiomesOPlenty.instance, 80, 3, true); EntityRegistry.registerModEntity(EntityMudball.class, "MudBall", BOPConfigurationIDs.entityMudballID, BiomesOPlenty.instance, 80, 3, true);
EntityRegistry.registerModEntity(EntityDart.class, "Dart", BOPConfiguration.IDs.entityDartID, BiomesOPlenty.instance, 80, 3, true); EntityRegistry.registerModEntity(EntityDart.class, "Dart", BOPConfigurationIDs.entityDartID, BiomesOPlenty.instance, 80, 3, true);
EntityRegistry.registerModEntity(EntityPoisonDart.class, "PoisonDart", BOPConfiguration.IDs.entityPoisonDartID, BiomesOPlenty.instance, 80, 3, true); EntityRegistry.registerModEntity(EntityPoisonDart.class, "PoisonDart", BOPConfigurationIDs.entityPoisonDartID, BiomesOPlenty.instance, 80, 3, true);
EntityRegistry.registerModEntity(EntityJungleSpider.class, "JungleSpider", BOPConfiguration.IDs.jungleSpiderID, BiomesOPlenty.instance, 80, 3, true); EntityRegistry.registerModEntity(EntityJungleSpider.class, "JungleSpider", BOPConfigurationIDs.jungleSpiderID, BiomesOPlenty.instance, 80, 3, true);
EntityRegistry.registerModEntity(EntityRosester.class, "Rosester", BOPConfiguration.IDs.rosesterID, BiomesOPlenty.instance, 80, 3, true); EntityRegistry.registerModEntity(EntityRosester.class, "Rosester", BOPConfigurationIDs.rosesterID, BiomesOPlenty.instance, 80, 3, true);
EntityRegistry.registerModEntity(EntityGlob.class, "Glob", BOPConfiguration.IDs.globID, BiomesOPlenty.instance, 80, 3, true); EntityRegistry.registerModEntity(EntityGlob.class, "Glob", BOPConfigurationIDs.globID, BiomesOPlenty.instance, 80, 3, true);
EntityRegistry.registerModEntity(EntityPhantom.class, "Phantom", BOPConfiguration.IDs.phantomID, BiomesOPlenty.instance, 80, 3, true); EntityRegistry.registerModEntity(EntityPhantom.class, "Phantom", BOPConfigurationIDs.phantomID, BiomesOPlenty.instance, 80, 3, true);
registerEntityEgg(EntityJungleSpider.class, 5147192, 11013646); registerEntityEgg(EntityJungleSpider.class, 5147192, 11013646);
registerEntityEgg(EntityRosester.class, 14831439, 16756224); registerEntityEgg(EntityRosester.class, 14831439, 16756224);

11
common/biomesoplenty/configuration/BOPFluids.java
View file

@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidRegistry;
import biomesoplenty.api.Fluids; import biomesoplenty.api.Fluids;
import biomesoplenty.configuration.configfile.BOPConfigurationIDs;
import biomesoplenty.fluids.BlockFluidLiquidPoison; import biomesoplenty.fluids.BlockFluidLiquidPoison;
import biomesoplenty.fluids.BlockFluidSpringWater; import biomesoplenty.fluids.BlockFluidSpringWater;
import biomesoplenty.fluids.LiquidPoisonFluid; import biomesoplenty.fluids.LiquidPoisonFluid;
@ -28,23 +29,23 @@ public class BOPFluids
private static void registerFluids() private static void registerFluids()
{ {
Fluids.liquidPoisonFluid = Optional.of(new LiquidPoisonFluid("bop.liquidPoison").setBlockID(BOPConfiguration.IDs.liquidPoisonStillID)); Fluids.liquidPoisonFluid = Optional.of(new LiquidPoisonFluid("bop.liquidPoison").setBlockID(BOPConfigurationIDs.liquidPoisonStillID));
FluidRegistry.registerFluid(Fluids.liquidPoisonFluid.get()); FluidRegistry.registerFluid(Fluids.liquidPoisonFluid.get());
Fluids.springWaterFluid = Optional.of(new SpringWaterFluid("bop.springWater").setBlockID(BOPConfiguration.IDs.springWaterStillID)); Fluids.springWaterFluid = Optional.of(new SpringWaterFluid("bop.springWater").setBlockID(BOPConfigurationIDs.springWaterStillID));
FluidRegistry.registerFluid(Fluids.springWaterFluid.get()); FluidRegistry.registerFluid(Fluids.springWaterFluid.get());
} }
private static void initializeLiquids() private static void initializeLiquids()
{ {
Fluids.liquidPoison = Optional.of(new BlockFluidLiquidPoison(BOPConfiguration.IDs.liquidPoisonStillID, Fluids.liquidPoisonFluid.get(), Material.water).setUnlocalizedName("bop.liquidPoison")); Fluids.liquidPoison = Optional.of(new BlockFluidLiquidPoison(BOPConfigurationIDs.liquidPoisonStillID, Fluids.liquidPoisonFluid.get(), Material.water).setUnlocalizedName("bop.liquidPoison"));
Fluids.springWater = Optional.of(new BlockFluidSpringWater(BOPConfiguration.IDs.springWaterStillID, Fluids.springWaterFluid.get(), Material.water).setUnlocalizedName("bop.springWater")); Fluids.springWater = Optional.of(new BlockFluidSpringWater(BOPConfigurationIDs.springWaterStillID, Fluids.springWaterFluid.get(), Material.water).setUnlocalizedName("bop.springWater"));
} }
private static void initializeContainers() private static void initializeContainers()
{ {
Fluids.bopBucket = Optional.of((new ItemBOPBucket(BOPConfiguration.IDs.bopBucketID).setMaxStackSize(1).setUnlocalizedName("bop.bopBucket"))); Fluids.bopBucket = Optional.of((new ItemBOPBucket(BOPConfigurationIDs.bopBucketID).setMaxStackSize(1).setUnlocalizedName("bop.bopBucket")));
FluidContainerRegistry.registerFluidContainer(Fluids.liquidPoisonFluid.get(), new ItemStack(Fluids.bopBucket.get(), 1, 1), new ItemStack(Item.bucketEmpty)); FluidContainerRegistry.registerFluidContainer(Fluids.liquidPoisonFluid.get(), new ItemStack(Fluids.bopBucket.get(), 1, 1), new ItemStack(Item.bucketEmpty));
FluidContainerRegistry.registerFluidContainer(Fluids.springWaterFluid.get(), new ItemStack(Fluids.bopBucket.get(), 1, 2), new ItemStack(Fluids.bopBucket.get(), 1, 0)); FluidContainerRegistry.registerFluidContainer(Fluids.springWaterFluid.get(), new ItemStack(Fluids.bopBucket.get(), 1, 2), new ItemStack(Fluids.bopBucket.get(), 1, 0));

77
common/biomesoplenty/configuration/BOPItems.java
View file

@ -15,6 +15,7 @@ import biomesoplenty.armor.ArmorFlippers;
import biomesoplenty.armor.ArmorFlowerBand; import biomesoplenty.armor.ArmorFlowerBand;
import biomesoplenty.armor.ArmorMuddy; import biomesoplenty.armor.ArmorMuddy;
import biomesoplenty.armor.ArmorWadingBoots; import biomesoplenty.armor.ArmorWadingBoots;
import biomesoplenty.configuration.configfile.BOPConfigurationIDs;
import biomesoplenty.items.ItemBOP; import biomesoplenty.items.ItemBOP;
import biomesoplenty.items.ItemBOPAncientStaff; import biomesoplenty.items.ItemBOPAncientStaff;
import biomesoplenty.items.ItemBOPAxe; import biomesoplenty.items.ItemBOPAxe;
@ -104,50 +105,50 @@ public class BOPItems {
private static void initializeItems() private static void initializeItems()
{ {
// Item declaration // Item declaration
Items.food = Optional.of(new ItemBOPFood(BOPConfiguration.IDs.foodID).setUnlocalizedName("bop.food")); Items.food = Optional.of(new ItemBOPFood(BOPConfigurationIDs.foodID).setUnlocalizedName("bop.food"));
Items.miscItems = Optional.of(new ItemBOP(BOPConfiguration.IDs.miscItemsID).setUnlocalizedName("bop.miscItems")); Items.miscItems = Optional.of(new ItemBOP(BOPConfigurationIDs.miscItemsID).setUnlocalizedName("bop.miscItems"));
Items.mudball = Optional.of(new ItemBOPMudball(BOPConfiguration.IDs.mudballID).setUnlocalizedName("bop.mudball")); Items.mudball = Optional.of(new ItemBOPMudball(BOPConfigurationIDs.mudballID).setUnlocalizedName("bop.mudball"));
Items.dartBlower = Optional.of(new ItemDartBlower(BOPConfiguration.IDs.dartBlowerID).setUnlocalizedName("bop.dartblower")); Items.dartBlower = Optional.of(new ItemDartBlower(BOPConfigurationIDs.dartBlowerID).setUnlocalizedName("bop.dartblower"));
Items.dart = Optional.of(new ItemDart(BOPConfiguration.IDs.dartID).setUnlocalizedName("bop.dart")); Items.dart = Optional.of(new ItemDart(BOPConfigurationIDs.dartID).setUnlocalizedName("bop.dart"));
Items.soulManipulator = Optional.of(new ItemSoulManipulator(BOPConfiguration.IDs.soulManipulatorID).setUnlocalizedName("bop.soulManipulator")); Items.soulManipulator = Optional.of(new ItemSoulManipulator(BOPConfigurationIDs.soulManipulatorID).setUnlocalizedName("bop.soulManipulator"));
Items.ancientStaff = Optional.of(new ItemBOPAncientStaff(BOPConfiguration.IDs.ancientStaffID).setUnlocalizedName("bop.ancientStaff")); Items.ancientStaff = Optional.of(new ItemBOPAncientStaff(BOPConfigurationIDs.ancientStaffID).setUnlocalizedName("bop.ancientStaff"));
Items.enderporter = Optional.of(new ItemEnderporter(BOPConfiguration.IDs.enderporterID).setUnlocalizedName("bop.enderporter")); Items.enderporter = Optional.of(new ItemEnderporter(BOPConfigurationIDs.enderporterID).setUnlocalizedName("bop.enderporter"));
Items.bopDisc = Optional.of(new ItemBOPRecord(BOPConfiguration.IDs.bopDiscID, "bopdisc").setUnlocalizedName("bop.bopDisc")); Items.bopDisc = Optional.of(new ItemBOPRecord(BOPConfigurationIDs.bopDiscID, "bopdisc").setUnlocalizedName("bop.bopDisc"));
Items.bopDiscMud = Optional.of(new ItemBOPRecordMud(BOPConfiguration.IDs.bopDiscMudID, "bopdiscmud").setUnlocalizedName("bop.bopDiscMud")); Items.bopDiscMud = Optional.of(new ItemBOPRecordMud(BOPConfigurationIDs.bopDiscMudID, "bopdiscmud").setUnlocalizedName("bop.bopDiscMud"));
Items.swordMud = Optional.of((new ItemBOPSword(BOPConfiguration.IDs.swordMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.swordMud")); Items.swordMud = Optional.of((new ItemBOPSword(BOPConfigurationIDs.swordMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.swordMud"));
Items.shovelMud = Optional.of((new ItemBOPSpade(BOPConfiguration.IDs.shovelMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.shovelMud")); Items.shovelMud = Optional.of((new ItemBOPSpade(BOPConfigurationIDs.shovelMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.shovelMud"));
Items.pickaxeMud = Optional.of((new ItemBOPPickaxe(BOPConfiguration.IDs.pickaxeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.pickaxeMud")); Items.pickaxeMud = Optional.of((new ItemBOPPickaxe(BOPConfigurationIDs.pickaxeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.pickaxeMud"));
Items.axeMud = Optional.of((new ItemBOPAxe(BOPConfiguration.IDs.axeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.hatchetMud")); Items.axeMud = Optional.of((new ItemBOPAxe(BOPConfigurationIDs.axeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.hatchetMud"));
Items.hoeMud = Optional.of((new ItemBOPHoe(BOPConfiguration.IDs.hoeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.hoeMud")); Items.hoeMud = Optional.of((new ItemBOPHoe(BOPConfigurationIDs.hoeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.hoeMud"));
Items.helmetMud = Optional.of((new ArmorMuddy(BOPConfiguration.IDs.helmetMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 0)).setUnlocalizedName("bop.helmetMud")); Items.helmetMud = Optional.of((new ArmorMuddy(BOPConfigurationIDs.helmetMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 0)).setUnlocalizedName("bop.helmetMud"));
Items.chestplateMud = Optional.of((new ArmorMuddy(BOPConfiguration.IDs.chestplateMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 1)).setUnlocalizedName("bop.chestplateMud")); Items.chestplateMud = Optional.of((new ArmorMuddy(BOPConfigurationIDs.chestplateMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 1)).setUnlocalizedName("bop.chestplateMud"));
Items.leggingsMud = Optional.of((new ArmorMuddy(BOPConfiguration.IDs.leggingsMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 2)).setUnlocalizedName("bop.leggingsMud")); Items.leggingsMud = Optional.of((new ArmorMuddy(BOPConfigurationIDs.leggingsMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 2)).setUnlocalizedName("bop.leggingsMud"));
Items.bootsMud = Optional.of((new ArmorMuddy(BOPConfiguration.IDs.bootsMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 3)).setUnlocalizedName("bop.bootsMud")); Items.bootsMud = Optional.of((new ArmorMuddy(BOPConfigurationIDs.bootsMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 3)).setUnlocalizedName("bop.bootsMud"));
Items.swordAmethyst = Optional.of((new ItemBOPSword(BOPConfiguration.IDs.swordAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.swordAmethyst")); Items.swordAmethyst = Optional.of((new ItemBOPSword(BOPConfigurationIDs.swordAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.swordAmethyst"));
Items.shovelAmethyst = Optional.of((new ItemBOPSpade(BOPConfiguration.IDs.shovelAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.shovelAmethyst")); Items.shovelAmethyst = Optional.of((new ItemBOPSpade(BOPConfigurationIDs.shovelAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.shovelAmethyst"));
Items.pickaxeAmethyst = Optional.of((new ItemBOPPickaxe(BOPConfiguration.IDs.pickaxeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.pickaxeAmethyst")); Items.pickaxeAmethyst = Optional.of((new ItemBOPPickaxe(BOPConfigurationIDs.pickaxeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.pickaxeAmethyst"));
Items.axeAmethyst = Optional.of((new ItemBOPAxe(BOPConfiguration.IDs.axeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.hatchetAmethyst")); Items.axeAmethyst = Optional.of((new ItemBOPAxe(BOPConfigurationIDs.axeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.hatchetAmethyst"));
Items.hoeAmethyst = Optional.of((new ItemBOPHoe(BOPConfiguration.IDs.hoeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.hoeAmethyst")); Items.hoeAmethyst = Optional.of((new ItemBOPHoe(BOPConfigurationIDs.hoeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.hoeAmethyst"));
Items.helmetAmethyst = Optional.of((new ArmorAmethyst(BOPConfiguration.IDs.helmetAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 0)).setUnlocalizedName("bop.helmetAmethyst")); Items.helmetAmethyst = Optional.of((new ArmorAmethyst(BOPConfigurationIDs.helmetAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 0)).setUnlocalizedName("bop.helmetAmethyst"));
Items.chestplateAmethyst = Optional.of((new ArmorAmethyst(BOPConfiguration.IDs.chestplateAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 1)).setUnlocalizedName("bop.chestplateAmethyst")); Items.chestplateAmethyst = Optional.of((new ArmorAmethyst(BOPConfigurationIDs.chestplateAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 1)).setUnlocalizedName("bop.chestplateAmethyst"));
Items.leggingsAmethyst = Optional.of((new ArmorAmethyst(BOPConfiguration.IDs.leggingsAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 2)).setUnlocalizedName("bop.leggingsAmethyst")); Items.leggingsAmethyst = Optional.of((new ArmorAmethyst(BOPConfigurationIDs.leggingsAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 2)).setUnlocalizedName("bop.leggingsAmethyst"));
Items.bootsAmethyst = Optional.of((new ArmorAmethyst(BOPConfiguration.IDs.bootsAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 3)).setUnlocalizedName("bop.bootsAmethyst")); Items.bootsAmethyst = Optional.of((new ArmorAmethyst(BOPConfigurationIDs.bootsAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 3)).setUnlocalizedName("bop.bootsAmethyst"));
Items.scytheWood = Optional.of((new ItemBOPScythe(BOPConfiguration.IDs.scytheWoodID, 2, EnumToolMaterial.WOOD, 0).setUnlocalizedName("bop.scytheWood"))); Items.scytheWood = Optional.of((new ItemBOPScythe(BOPConfigurationIDs.scytheWoodID, 2, EnumToolMaterial.WOOD, 0).setUnlocalizedName("bop.scytheWood")));
Items.scytheStone = Optional.of((new ItemBOPScythe(BOPConfiguration.IDs.scytheStoneID, 2, EnumToolMaterial.STONE, 1).setUnlocalizedName("bop.scytheStone"))); Items.scytheStone = Optional.of((new ItemBOPScythe(BOPConfigurationIDs.scytheStoneID, 2, EnumToolMaterial.STONE, 1).setUnlocalizedName("bop.scytheStone")));
Items.scytheIron = Optional.of((new ItemBOPScythe(BOPConfiguration.IDs.scytheIronID, 2, EnumToolMaterial.IRON, 2).setUnlocalizedName("bop.scytheIron"))); Items.scytheIron = Optional.of((new ItemBOPScythe(BOPConfigurationIDs.scytheIronID, 2, EnumToolMaterial.IRON, 2).setUnlocalizedName("bop.scytheIron")));
Items.scytheGold = Optional.of((new ItemBOPScythe(BOPConfiguration.IDs.scytheGoldID, 2, EnumToolMaterial.GOLD, 3).setUnlocalizedName("bop.scytheGold"))); Items.scytheGold = Optional.of((new ItemBOPScythe(BOPConfigurationIDs.scytheGoldID, 2, EnumToolMaterial.GOLD, 3).setUnlocalizedName("bop.scytheGold")));
Items.scytheDiamond = Optional.of((new ItemBOPScythe(BOPConfiguration.IDs.scytheDiamondID, 2, EnumToolMaterial.EMERALD, 4).setUnlocalizedName("bop.scytheDiamond"))); Items.scytheDiamond = Optional.of((new ItemBOPScythe(BOPConfigurationIDs.scytheDiamondID, 2, EnumToolMaterial.EMERALD, 4).setUnlocalizedName("bop.scytheDiamond")));
Items.scytheMud = Optional.of((new ItemBOPScythe(BOPConfiguration.IDs.scytheMudID, 2, EnumToolMaterialMud, 5).setUnlocalizedName("bop.scytheMud"))); Items.scytheMud = Optional.of((new ItemBOPScythe(BOPConfigurationIDs.scytheMudID, 2, EnumToolMaterialMud, 5).setUnlocalizedName("bop.scytheMud")));
Items.scytheAmethyst = Optional.of((new ItemBOPScythe(BOPConfiguration.IDs.scytheAmethystID, 2, EnumToolMaterialAmethyst, 6).setUnlocalizedName("bop.scytheAmethyst"))); Items.scytheAmethyst = Optional.of((new ItemBOPScythe(BOPConfigurationIDs.scytheAmethystID, 2, EnumToolMaterialAmethyst, 6).setUnlocalizedName("bop.scytheAmethyst")));
Items.flowerBand = Optional.of((new ArmorFlowerBand(BOPConfiguration.IDs.flowerBandID, EnumArmorMaterialFlowerBand, BiomesOPlenty.proxy.addArmor("flowerBand"), 0)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.flowerBand")); Items.flowerBand = Optional.of((new ArmorFlowerBand(BOPConfigurationIDs.flowerBandID, EnumArmorMaterialFlowerBand, BiomesOPlenty.proxy.addArmor("flowerBand"), 0)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.flowerBand"));
Items.wadingBoots = Optional.of((new ArmorWadingBoots(BOPConfiguration.IDs.wadingBootsID, EnumArmorMaterialWadingBoots, BiomesOPlenty.proxy.addArmor("wadingBoots"), 3)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.wadingBoots")); Items.wadingBoots = Optional.of((new ArmorWadingBoots(BOPConfigurationIDs.wadingBootsID, EnumArmorMaterialWadingBoots, BiomesOPlenty.proxy.addArmor("wadingBoots"), 3)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.wadingBoots"));
Items.flippers = Optional.of((new ArmorFlippers(BOPConfiguration.IDs.flippersID, EnumArmorMaterialFlippers, BiomesOPlenty.proxy.addArmor("flippers"), 3)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.flippers")); Items.flippers = Optional.of((new ArmorFlippers(BOPConfigurationIDs.flippersID, EnumArmorMaterialFlippers, BiomesOPlenty.proxy.addArmor("flippers"), 3)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.flippers"));
} }
} }

3
common/biomesoplenty/configuration/BOPVanillaCompat.java
View file

@ -6,6 +6,7 @@ import net.minecraft.util.WeightedRandomChestContent;
import net.minecraftforge.common.ChestGenHooks; import net.minecraftforge.common.ChestGenHooks;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.api.Items; import biomesoplenty.api.Items;
import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.entities.projectiles.DispenserBehaviorDart; import biomesoplenty.entities.projectiles.DispenserBehaviorDart;
import biomesoplenty.entities.projectiles.DispenserBehaviorMudball; import biomesoplenty.entities.projectiles.DispenserBehaviorMudball;
@ -29,7 +30,7 @@ public class BOPVanillaCompat {
strongholdCrossing = ChestGenHooks.getInfo(ChestGenHooks.STRONGHOLD_CROSSING); strongholdCrossing = ChestGenHooks.getInfo(ChestGenHooks.STRONGHOLD_CROSSING);
village = ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH); village = ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH);
if (BOPConfiguration.Misc.dungeonLoot == true) if (BOPConfigurationMisc.dungeonLoot == true)
{ {
dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.bopDisc.get()), 1, 1, 2)); dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.bopDisc.get()), 1, 1, 2));
dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 10), 1, 2, 5)); dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 10), 1, 2, 5));

27
common/biomesoplenty/configuration/configfile/BOPConfiguration.java Normal file
View file

@ -0,0 +1,27 @@
package biomesoplenty.configuration.configfile;
import java.io.File;
public class BOPConfiguration
{
public static File mainConfigFile;
public static File biomeGenConfigFile;
public static File terrainGenConfigFile;
public static File idConfigFile;
public static File miscConfigFile;
public static void init(String configpath)
{
mainConfigFile = new File(configpath + "main.cfg");
biomeGenConfigFile = new File(configpath + "biomegen.cfg");
terrainGenConfigFile = new File(configpath + "terraingen.cfg");
idConfigFile = new File(configpath + "ids.cfg");
miscConfigFile = new File(configpath + "misc.cfg");
BOPConfigurationMain.init(mainConfigFile);
BOPConfigurationBiomeGen.init(biomeGenConfigFile);
BOPConfigurationTerrainGen.init(terrainGenConfigFile);
BOPConfigurationIDs.init(idConfigFile);
BOPConfigurationMisc.init(miscConfigFile);
}
}

238
common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java Normal file
View file

@ -0,0 +1,238 @@
package biomesoplenty.configuration.configfile;
import java.io.File;
import java.util.logging.Level;
import net.minecraftforge.common.Configuration;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.FMLLog;
public class BOPConfigurationBiomeGen
{
public static Configuration config;
public static boolean alpsGen;
public static boolean arcticGen;
public static boolean autumnHillsGen;
public static boolean badlandsGen;
public static boolean bambooForestGen;
public static boolean bayouGen;
public static boolean birchForestGen;
public static boolean bogGen;
public static boolean borealForestGen;
public static boolean brushlandGen;
public static boolean canyonGen;
public static boolean chaparralGen;
public static boolean cherryBlossomGroveGen;
public static boolean coniferousForestGen;
public static boolean coniferousForestSnowGen;
public static boolean cragGen;
public static boolean deadForestGen;
public static boolean deadForestSnowGen;
public static boolean deadSwampGen;
public static boolean deadlandsGen;
public static boolean deciduousForestGen;
public static boolean dunesGen;
public static boolean fenGen;
public static boolean fieldGen;
public static boolean frostForestGen;
public static boolean fungiForestGen;
public static boolean gardenGen;
public static boolean glacierGen;
public static boolean grasslandGen;
public static boolean groveGen;
public static boolean heathlandGen;
public static boolean highlandGen;
public static boolean hotSpringsGen;
public static boolean icyHillsGen;
public static boolean jadeCliffsGen;
public static boolean lushDesertGen;
public static boolean lushSwampGen;
public static boolean mangroveGen;
public static boolean mapleWoodsGen;
public static boolean marshGen;
public static boolean meadowGen;
public static boolean mesaGen;
public static boolean moorGen;
public static boolean mountainGen;
// public static boolean mushroomIslandGen;
public static boolean mysticGroveGen;
public static boolean oasisGen;
public static boolean oceanGen;
public static boolean ominousWoodsGen;
public static boolean orchardGen;
public static boolean originValleyGen;
public static boolean outbackGen;
public static boolean overgrownGreensGen;
public static boolean pastureGen;
public static boolean polarGen;
public static boolean prairieGen;
public static boolean quagmireGen;
public static boolean rainforestGen;
public static boolean redwoodForestGen;
public static boolean sacredSpringsGen;
public static boolean savannaGen;
public static boolean scrublandGen;
public static boolean seasonalForestGen;
public static boolean shieldGen;
public static boolean shrublandGen;
public static boolean silkgladesGen;
public static boolean sludgepitGen;
public static boolean spruceWoodsGen;
public static boolean steppeGen;
public static boolean temperateRainforestGen;
public static boolean thicketGen;
public static boolean timberGen;
public static boolean tropicalRainforestGen;
public static boolean tropicsGen;
public static boolean tundraGen;
public static boolean volcanoGen;
public static boolean wastelandGen;
public static boolean wetlandGen;
public static boolean woodlandGen;
// Vanilla biomes
public static boolean plainsGen;
public static boolean desertGen;
public static boolean extremeHillsGen;
public static boolean forestGen;
public static boolean taigaGen;
public static boolean swamplandGen;
public static boolean jungleGen;
// Nether biomes
public static boolean undergardenGen;
public static boolean corruptedSandsGen;
public static boolean phantasmagoricInfernoGen;
public static boolean boneyardGen;
//Beach variations
public static boolean gravelBeachGen;
public static boolean overgrownBeachGen;
public static void init(File configFile)
{
config = new Configuration(configFile);
try
{
config.load();
//Biome generation
alpsGen = config.get("Biomes To Generate", "Alps", true).getBoolean(false);
arcticGen = config.get("Biomes To Generate", "Arctic", true).getBoolean(false);
autumnHillsGen = config.get("Biomes To Generate", "AutumnHills", false).getBoolean(false);
badlandsGen = config.get("Biomes To Generate", "Badlands", true).getBoolean(false);
bambooForestGen = config.get("Biomes To Generate", "BambooForest", true).getBoolean(false);
bayouGen = config.get("Biomes To Generate", "Bayou", true).getBoolean(false);
birchForestGen = config.get("Biomes To Generate", "BirchForest", true).getBoolean(false);
bogGen = config.get("Biomes To Generate", "Bog", true).getBoolean(false);
borealForestGen = config.get("Biomes To Generate", "BorealForest", true).getBoolean(false);
brushlandGen = config.get("Biomes To Generate", "Brushland", true).getBoolean(false);
canyonGen = config.get("Biomes To Generate", "Canyon", true).getBoolean(false);
chaparralGen = config.get("Biomes To Generate", "Chaparral", true).getBoolean(false);
cherryBlossomGroveGen = config.get("Biomes To Generate", "CherryBlossomGrove", true).getBoolean(false);
coniferousForestGen = config.get("Biomes To Generate", "ConiferousForest", true).getBoolean(false);
coniferousForestSnowGen = config.get("Biomes To Generate", "ConiferousForestSnow", true).getBoolean(false);
cragGen = config.get("Biomes To Generate", "Crag", true).getBoolean(false);
deadForestGen = config.get("Biomes To Generate", "DeadForest", true).getBoolean(false);
deadForestSnowGen = config.get("Biomes To Generate", "DeadForestSnow", true).getBoolean(false);
deadSwampGen = config.get("Biomes To Generate", "DeadSwamp", true).getBoolean(false);
deadlandsGen = config.get("Biomes To Generate", "Deadlands", true).getBoolean(false);
deciduousForestGen = config.get("Biomes To Generate", "DeciduousForest", true).getBoolean(false);
dunesGen = config.get("Biomes To Generate", "Dunes", true).getBoolean(false);
fenGen = config.get("Biomes To Generate", "Fen", true).getBoolean(false);
fieldGen = config.get("Biomes To Generate", "Field", true).getBoolean(false);
frostForestGen = config.get("Biomes To Generate", "FrostForest", true).getBoolean(false);
fungiForestGen = config.get("Biomes To Generate", "FungiForest", true).getBoolean(false);
gardenGen = config.get("Biomes To Generate", "Garden", true).getBoolean(false);
glacierGen = config.get("Biomes To Generate", "Glacier", true).getBoolean(false);
grasslandGen = config.get("Biomes To Generate", "Grassland", true).getBoolean(false);
groveGen = config.get("Biomes To Generate", "Grove", true).getBoolean(false);
heathlandGen = config.get("Biomes To Generate", "Heathland", true).getBoolean(false);
highlandGen = config.get("Biomes To Generate", "Highland", true).getBoolean(false);
hotSpringsGen = config.get("Biomes To Generate", "HotSprings", true).getBoolean(false);
icyHillsGen = config.get("Biomes To Generate", "IcyHills", true).getBoolean(false);
jadeCliffsGen = config.get("Biomes To Generate", "JadeCliffs", true).getBoolean(false);
lushDesertGen = config.get("Biomes To Generate", "LushDesert", true).getBoolean(false);
lushSwampGen = config.get("Biomes To Generate", "LushSwamp", true).getBoolean(false);
mangroveGen = config.get("Biomes To Generate", "Mangrove", true).getBoolean(false);
mapleWoodsGen = config.get("Biomes To Generate", "MapleWoods", true).getBoolean(false);
marshGen = config.get("Biomes To Generate", "Marsh", true).getBoolean(false);
meadowGen = config.get("Biomes To Generate", "Meadow", true).getBoolean(false);
mesaGen = config.get("Biomes To Generate", "Mesa", true).getBoolean(false);
moorGen = config.get("Biomes To Generate", "Moor", true).getBoolean(false);
mountainGen = config.get("Biomes To Generate", "Mountain", true).getBoolean(false);
// mushroomIslandGen = config.get("Biomes To Generate", "MushroomIsland", true).getBoolean(false);
mysticGroveGen = config.get("Biomes To Generate", "MysticGrove", true).getBoolean(false);
oasisGen = config.get("Biomes To Generate", "Oasis", true).getBoolean(false);
ominousWoodsGen = config.get("Biomes To Generate", "OminousWoods", true).getBoolean(false);
orchardGen = config.get("Biomes To Generate", "Orchard", true).getBoolean(false);
originValleyGen = config.get("Biomes To Generate", "OriginValley", true).getBoolean(false);
outbackGen = config.get("Biomes To Generate", "Outback", true).getBoolean(false);
overgrownGreensGen = config.get("Biomes To Generate", "OvergrownGreens", false).getBoolean(false);
pastureGen = config.get("Biomes To Generate", "Pasture", true).getBoolean(false);
polarGen = config.get("Biomes To Generate", "Polar", true).getBoolean(false);
prairieGen = config.get("Biomes To Generate", "Prairie", true).getBoolean(false);
quagmireGen = config.get("Biomes To Generate", "Quagmire", true).getBoolean(false);
rainforestGen = config.get("Biomes To Generate", "Rainforest", true).getBoolean(false);
redwoodForestGen = config.get("Biomes To Generate", "RedwoodForest", true).getBoolean(false);
sacredSpringsGen = config.get("Biomes To Generate", "SacredSprings", true).getBoolean(false);
savannaGen = config.get("Biomes To Generate", "Savanna", true).getBoolean(false);
scrublandGen = config.get("Biomes To Generate", "Scrubland", true).getBoolean(false);
seasonalForestGen = config.get("Biomes To Generate", "SeasonalForest", true).getBoolean(false);
shieldGen = config.get("Biomes To Generate", "Shield", true).getBoolean(false);
shrublandGen = config.get("Biomes To Generate", "Shrubland", true).getBoolean(false);
silkgladesGen = config.get("Biomes To Generate", "Silkglades", false).getBoolean(false);
sludgepitGen = config.get("Biomes To Generate", "Sludgepit", true).getBoolean(false);
spruceWoodsGen = config.get("Biomes To Generate", "SpruceWoods", true).getBoolean(false);
steppeGen = config.get("Biomes To Generate", "Steppe", true).getBoolean(false);
temperateRainforestGen = config.get("Biomes To Generate", "TemperateRainforest", true).getBoolean(false);
thicketGen = config.get("Biomes To Generate", "Thicket", true).getBoolean(false);
timberGen = config.get("Biomes To Generate", "Timber", true).getBoolean(false);
tropicalRainforestGen = config.get("Biomes To Generate", "TropicalRainforest", true).getBoolean(false);
tropicsGen = config.get("Biomes To Generate", "Tropics", true).getBoolean(false);
tundraGen = config.get("Biomes To Generate", "Tundra", true).getBoolean(false);
volcanoGen = config.get("Biomes To Generate", "Volcano", true).getBoolean(false);
wastelandGen = config.get("Biomes To Generate", "Wasteland", true).getBoolean(false);
wetlandGen = config.get("Biomes To Generate", "Wetland", true).getBoolean(false);
woodlandGen = config.get("Biomes To Generate", "Woodland", true).getBoolean(false);
// Vanilla biomes
desertGen = config.get("Vanilla Biomes To Generate", "Desert", true).getBoolean(true);
extremeHillsGen = config.get("Vanilla Biomes To Generate", "ExtremeHills", true).getBoolean(true);
forestGen = config.get("Vanilla Biomes To Generate", "Forest", true).getBoolean(true);
jungleGen = config.get("Vanilla Biomes To Generate", "Jungle", true).getBoolean(true);
oceanGen = config.get("Vanilla Biomes To Generate", "Ocean", true).getBoolean(false);
plainsGen = config.get("Vanilla Biomes To Generate", "Plains", true).getBoolean(true);
swamplandGen = config.get("Vanilla Biomes To Generate", "Swampland", true).getBoolean(true);
taigaGen = config.get("Vanilla Biomes To Generate", "Taiga", true).getBoolean(true);
// Nether biomes
undergardenGen = config.get("Nether Biomes To Generate", "Undergarden", true).getBoolean(true);
corruptedSandsGen = config.get("Nether Biomes To Generate", "CorruptedSands", true).getBoolean(true);
phantasmagoricInfernoGen = config.get("Nether Biomes To Generate", "PhantasmagoricInferno", true).getBoolean(true);
boneyardGen = config.get("Nether Biomes To Generate", "Boneyard", true).getBoolean(true);
// Beach variations
gravelBeachGen = config.get("Beach Variations To Generate", "Gravel Beach", true).getBoolean(true);
overgrownBeachGen = config.get("Beach Variations To Generate", "Overgrown Beach", false).getBoolean(true);
FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generated Biome Gen Config!");
}
catch (Exception e)
{
FMLLog.log(Level.SEVERE, e, "Biomes O Plenty has had a problem loading its configuration");
}
finally
{
if (config.hasChanged()) {
config.save();
}
}
}
}

615
common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java Normal file
View file

@ -0,0 +1,615 @@
package biomesoplenty.configuration.configfile;
import java.io.File;
import java.util.logging.Level;
import net.minecraftforge.common.Configuration;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.FMLLog;
public class BOPConfigurationIDs
{
public static Configuration config;
public static int promisedLandDimID;
//Block IDS
public static int mudID;
public static int driedDirtID;
public static int redRockID;
public static int ashID;
public static int ashStoneID;
public static int hardIceID;
public static int originGrassID;
public static int longGrassID;
public static int hardSandID;
public static int hardDirtID;
public static int holyGrassID;
public static int holyDirtID;
public static int holyStoneID;
public static int cragRockID;
public static int plantsID;
public static int flowersID;
public static int mushroomsID;
public static int coralID;
public static int willowID;
public static int ivyID;
public static int leaves1ID;
public static int leaves2ID;
public static int foliageID;
public static int leavesFruitID;
public static int leavesFruit2ID;
public static int bambooID;
public static int mudBrickBlockID;
public static int mudBrickStairsID;
public static int stoneDoubleSlabID;
public static int stoneSingleSlabID;
public static int treeMossID;
public static int logs1ID;
public static int logs2ID;
public static int logs3ID;
public static int logs4ID;
public static int petalsID;
public static int saplingsID;
public static int colourizedSaplingsID;
public static int redCobbleStairsID;
public static int redBrickStairsID;
public static int holyCobbleStairsID;
public static int holyBrickStairsID;
public static int promisedLandPortalID;
public static int amethystOreID;
public static int mossID;
public static int puddleID;
public static int planksID;
public static int woodenDoubleSlab1ID;
public static int woodenSingleSlab1ID;
public static int woodenDoubleSlab2ID;
public static int woodenSingleSlab2ID;
public static int acaciaStairsID;
public static int cherryStairsID;
public static int darkStairsID;
public static int firStairsID;
public static int holyStairsID;
public static int magicStairsID;
public static int mangroveStairsID;
public static int palmStairsID;
public static int redwoodStairsID;
public static int willowStairsID;
public static int pineStairsID;
public static int hellBarkStairsID;
public static int jacarandaStairsID;
public static int colourizedLeavesID;
public static int crystalID;
public static int cloudID;
public static int bonesID;
public static int glassID;
public static int altarID;
public static int graveID;
//Item IDs
public static int foodID;
public static int ancientStaffID;
public static int enderporterID;
public static int bopDiscID;
public static int bopDiscMudID;
public static int miscItemsID;
public static int mudballID;
public static int dartBlowerID;
public static int dartID;
public static int soulManipulatorID;
public static int bopBucketID;
public static int swordMudID;
public static int shovelMudID;
public static int pickaxeMudID;
public static int axeMudID;
public static int hoeMudID;
public static int helmetMudID;
public static int chestplateMudID;
public static int leggingsMudID;
public static int bootsMudID;
public static int swordAmethystID;
public static int shovelAmethystID;
public static int pickaxeAmethystID;
public static int axeAmethystID;
public static int hoeAmethystID;
public static int helmetAmethystID;
public static int chestplateAmethystID;
public static int leggingsAmethystID;
public static int bootsAmethystID;
public static int scytheWoodID;
public static int scytheStoneID;
public static int scytheIronID;
public static int scytheGoldID;
public static int scytheDiamondID;
public static int scytheMudID;
public static int scytheAmethystID;
public static int flowerBandID;
public static int wadingBootsID;
public static int flippersID;
//Liquid IDs
public static int springWaterStillID;
public static int liquidPoisonStillID;
//Biome IDs
public static int alpsID;
public static int alpsForestID;
public static int alpsBaseID;
public static int arcticID;
public static int autumnHillsID;
public static int badlandsID;
public static int bambooForestID;
public static int bayouID;
public static int beachGravelID;
public static int beachOvergrownID;
public static int birchForestID;
public static int bogID;
public static int borealForestID;
public static int brushlandID;
public static int canyonID;
public static int canyonRavineID;
public static int chaparralID;
public static int cherryBlossomGroveID;
public static int coniferousForestID;
public static int coniferousForestSnowID;
public static int cragID;
public static int deadForestID;
public static int deadForestSnowID;
public static int deadSwampID;
public static int deadlandsID;
public static int deciduousForestID;
public static int dunesID;
public static int fenID;
public static int fieldID;
public static int fieldForestID;
public static int frostForestID;
public static int fungiForestID;
public static int gardenID;
public static int glacierID;
public static int grasslandID;
public static int groveID;
public static int heathlandID;
public static int highlandID;
public static int hotSpringsID;
public static int icyHillsID;
public static int jadeCliffsID;
public static int lushDesertID;
public static int lushSwampID;
public static int mangroveID;
public static int mapleWoodsID;
public static int marshID;
public static int meadowID;
public static int meadowForestID;
public static int mesaID;
public static int moorID;
public static int mountainID;
public static int mysticGroveID;
public static int netherBaseID;
public static int netherGardenID;
public static int netherDesertID;
public static int netherLavaID;
public static int netherBoneID;
public static int oasisID;
public static int oceanAbyssID;
public static int oceanCoralID;
public static int oceanKelpID;
public static int ominousWoodsID;
public static int ominousWoodsThickID;
public static int orchardID;
public static int originValleyID;
public static int outbackID;
public static int overgrownGreensID;
public static int pastureID;
public static int pastureMeadowID;
public static int pastureThinID;
public static int polarID;
public static int prairieID;
public static int promisedLandForestID;
public static int promisedLandPlainsID;
public static int promisedLandSwampID;
public static int quagmireID;
public static int rainforestID;
public static int redwoodForestID;
public static int reefID;
public static int sacredSpringsID;
public static int savannaID;
public static int savannaPlateauID;
public static int scrublandID;
public static int seasonalForestID;
public static int seasonalSpruceForestID;
public static int shieldID;
public static int shoreID;
public static int shrublandID;
public static int shrublandForestID;
public static int silkgladesID;
public static int sludgepitID;
public static int spruceWoodsID;
public static int steppeID;
public static int temperateRainforestID;
public static int thicketID;
public static int timberID;
public static int timberThinID;
public static int tropicalRainforestID;
public static int tropicsID;
public static int tundraID;
public static int volcanoID;
public static int wastelandID;
public static int wetlandID;
public static int woodlandID;
public static int plainsNewID;
public static int desertNewID;
public static int extremeHillsNewID;
public static int extremeHillsEdgeNewID;
public static int forestNewID;
public static int forestHillsNewID;
public static int taigaNewID;
public static int taigaHillsNewID;
public static int swamplandNewID;
public static int jungleNewID;
public static int jungleHillsNewID;
public static int entityMudballID;
public static int entityDartID;
public static int entityPoisonDartID;
public static int jungleSpiderID;
public static int rosesterID;
public static int globID;
public static int phantomID;
public static void init(File configFile)
{
config = new Configuration(configFile);
try
{
config.load();
promisedLandDimID = config.get("Dimension Settings", "Promised Land Dimension ID", 20, null).getInt();
// Get Terrain Block ID's
mudID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Mud ID", 160, null).getInt();
driedDirtID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Dried Dirt ID", 161, null).getInt();
redRockID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Red Rock ID", 162, null).getInt();
ashID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Ash Block ID", 163, null).getInt();
ashStoneID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Ash Stone ID", 164, null).getInt();
hardIceID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Hard Ice ID", 165, null).getInt();
originGrassID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Origin Grass ID", 166, null).getInt();
hardSandID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Hard Sand ID", 167, null).getInt();
hardDirtID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Hard Dirt ID", 168, null).getInt();
holyGrassID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Holy Grass ID", 169, null).getInt();
holyDirtID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Holy Dirt ID", 170, null).getInt();
holyStoneID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Skystone ID", 171, null).getInt();
cragRockID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Crag Rock ID", 172, null).getInt();
longGrassID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Long Grass ID", 173, null).getInt();
// Get Crafted Block ID's
plantsID = config.getBlock("Plant ID", 1920, null).getInt();
flowersID = config.getBlock("Flower ID", 1921, null).getInt();
willowID = config.getBlock("Willow ID", 1922, null).getInt();
leaves1ID = config.getBlock("Leaf Block ID 1", 1923, null).getInt();
leaves2ID = config.getBlock("Leaf Block ID 2", 1924, null).getInt();
foliageID = config.getBlock("Foliage ID", 1925, null).getInt();
leavesFruitID = config.getBlock("Fruit Leaf Block ID", 1926, null).getInt();
bambooID = config.getBlock("Bamboo ID", 1927, null).getInt();
mudBrickBlockID = config.getBlock("Mud Bricks ID", 1928, null).getInt();
mudBrickStairsID = config.getBlock("Mud Brick Stairs ID", 1929, null).getInt();
stoneDoubleSlabID = config.getBlock("Stone Double Slab ID", 1930, null).getInt();
stoneSingleSlabID = config.getBlock("Stone Single Slab ID", 1931, null).getInt();
treeMossID = config.getBlock("Tree Moss ID", 1932, null).getInt();
logs1ID = config.getBlock("Log Block ID 1", 1933, null).getInt();
logs2ID = config.getBlock("Log Block ID 2", 1934, null).getInt();
logs3ID = config.getBlock("Log Block ID 3", 1935, null).getInt();
petalsID = config.getBlock("Petal ID", 1936, null).getInt();
saplingsID = config.getBlock("Sapling ID", 1937, null).getInt();
colourizedSaplingsID = config.getBlock("Colourized Sapling ID", 1938, null).getInt();
redCobbleStairsID = config.getBlock("Red Cobble Stairs ID", 1939, null).getInt();
redBrickStairsID = config.getBlock("Red Brick Stairs ID", 1940, null).getInt();
promisedLandPortalID = config.getBlock("Promised Land Portal ID", 1941, null).getInt();
amethystOreID = config.getBlock("Amethyst Ore ID", 1942, null).getInt();
ivyID = config.getBlock("Ivy ID", 1943, null).getInt();
mossID = config.getBlock("Moss ID", 1944, null).getInt();
planksID = config.getBlock("Planks ID", 1947, null).getInt();
woodenDoubleSlab1ID = config.getBlock("Wooden Double Slab 1 ID", 1948, null).getInt();
woodenSingleSlab1ID = config.getBlock("Wooden Single Slab 1 ID", 1949, null).getInt();
woodenDoubleSlab2ID = config.getBlock("Wooden Double Slab 2 ID", 1950, null).getInt();
woodenSingleSlab2ID = config.getBlock("Wooden Single Slab 2 ID", 1951, null).getInt();
acaciaStairsID = config.getBlock("Acacia Stairs ID", 1952, null).getInt();
cherryStairsID = config.getBlock("Cherry Stairs ID", 1953, null).getInt();
darkStairsID = config.getBlock("Dark Stairs ID", 1954, null).getInt();
firStairsID = config.getBlock("Fir Stairs ID", 1955, null).getInt();
holyStairsID = config.getBlock("Holy Stairs ID", 1956, null).getInt();
magicStairsID = config.getBlock("Magic Stairs ID", 1957, null).getInt();
mangroveStairsID = config.getBlock("Mangrove Stairs ID", 1958, null).getInt();
palmStairsID = config.getBlock("Palm Stairs ID", 1959, null).getInt();
redwoodStairsID = config.getBlock("Redwood Stairs ID", 1960, null).getInt();
willowStairsID = config.getBlock("Willow Stairs ID", 1961, null).getInt();
colourizedLeavesID = config.getBlock("Colourized Leaves ID", 1962, null).getInt();
crystalID = config.getBlock("Crystal ID", 1963, null).getInt();
cloudID = config.getBlock("Cloud ID", 1964, null).getInt();
holyCobbleStairsID = config.getBlock("Skystone Cobble Stairs ID", 1965, null).getInt();
holyBrickStairsID = config.getBlock("Skystone Brick Stairs ID", 1966, null).getInt();
mushroomsID = config.getBlock("Mushroom ID", 1967, null).getInt();
bonesID = config.getBlock("Bones ID", 1968, null).getInt();
coralID = config.getBlock("Coral ID", 1969, null).getInt();
//1970, 1971, 1972 & 1973 used by Liquids
logs4ID = config.getBlock("Log Block ID 4", 1974, null).getInt();
pineStairsID = config.getBlock("Pine Stairs ID", 1975, null).getInt();
hellBarkStairsID = config.getBlock("Hell Bark Stairs ID", 1976, null).getInt();
jacarandaStairsID = config.getBlock("Jacaranda ID", 1977, null).getInt();
glassID = config.getBlock("Glass ID", 1978, null).getInt();
altarID = config.getBlock("Altar ID", 1979, null).getInt();
puddleID = config.getBlock("Puddle ID", 1980, null).getInt();
graveID = config.getBlock("Grave ID", 1981, null).getInt();
leavesFruit2ID = config.getBlock("Fruit Leaf Block 2 ID", 1982, null).getInt();
// Get Item ID's
foodID = config.getItem("Food ID", 21003, null).getInt();
ancientStaffID = config.getItem("Ancient Staff ID", 21006).getInt();
enderporterID = config.getItem("Enderporter ID", 21007).getInt();
miscItemsID = config.getItem("Misc Items ID", 21010).getInt();
mudballID = config.getItem("Mud Ball ID", 21011).getInt();
dartBlowerID = config.getItem("Dart Blower ID", 21012).getInt();
dartID = config.getItem("Dart ID", 21013).getInt();
bopDiscID = config.getItem("Traversia Music Disc ID", 21019, null).getInt();
bopDiscMudID = config.getItem("Muddy Music Disc ID", 21020, null).getInt();
swordMudID = config.getItem("Muddy Sword ID", 21060, null).getInt();
shovelMudID = config.getItem("Muddy Shovel ID", 21061, null).getInt();
pickaxeMudID = config.getItem("Muddy Pickaxe ID", 21062, null).getInt();
axeMudID = config.getItem("Muddy Axe ID", 21063, null).getInt();
hoeMudID = config.getItem("Muddy Hoe ID", 21064, null).getInt();
helmetMudID = config.getItem("Muddy Helmet ID", 21065, null).getInt();
chestplateMudID = config.getItem("Muddy Chestplate ID", 21066, null).getInt();
leggingsMudID = config.getItem("Muddy Leggings ID", 21067, null).getInt();
bootsMudID = config.getItem("Muddy Boots ID", 21068, null).getInt();
swordAmethystID = config.getItem("Amethyst Sword ID", 21069, null).getInt();
shovelAmethystID = config.getItem("Amethyst Shovel ID", 21070, null).getInt();
pickaxeAmethystID = config.getItem("Amethyst Pickaxe ID", 21071, null).getInt();
axeAmethystID = config.getItem("Amethyst Axe ID", 21072, null).getInt();
hoeAmethystID = config.getItem("Amethyst Hoe ID", 21073, null).getInt();
helmetAmethystID = config.getItem("Amethyst Helmet ID", 21074, null).getInt();
chestplateAmethystID = config.getItem("Amethyst Chestplate ID", 21075, null).getInt();
leggingsAmethystID = config.getItem("Amethyst Leggings ID", 21076, null).getInt();
bootsAmethystID = config.getItem("Amethyst Boots ID", 21077, null).getInt();
flowerBandID = config.getItem("Flower Band ID", 21078, null).getInt();
bopBucketID = config.getItem("Spring Water Bucket ID", 21079, null).getInt();
soulManipulatorID = config.getItem("Soul Manipulator ID", 21080).getInt();
scytheWoodID = config.getItem("Wood Scythe ID", 21081).getInt();
scytheStoneID = config.getItem("Stone Scythe ID", 21082).getInt();
scytheIronID = config.getItem("Iron Scythe ID", 21083).getInt();
scytheGoldID = config.getItem("Gold Scythe ID", 21084).getInt();
scytheDiamondID = config.getItem("Diamond Scythe ID", 21085).getInt();
scytheMudID = config.getItem("Mud Scythe ID", 21086).getInt();
scytheAmethystID = config.getItem("Amethyst Scythe ID", 21087).getInt();
wadingBootsID = config.getItem("Wading Boots ID", 21088).getInt();
flippersID = config.getItem("Flippers ID", 21089).getInt();
//Liquid Ids
springWaterStillID = config.get("Liquid IDs", "Spring Water Still ID (ID before this must be free!)", 1971, null).getInt();
liquidPoisonStillID = config.get("Liquid IDs", "Liquid Poison Still ID (ID before this must be free!)", 1973, null).getInt();
//Mob IDs
jungleSpiderID = config.get("Mob IDs", "Jungle Spider ID", 101, null).getInt();
rosesterID = config.get("Mob IDs", "Rosester ID", 102, null).getInt();
globID = config.get("Mob IDs", "Glob ID", 106, null).getInt();
phantomID = config.get("Mob IDs", "Phantom ID", 107, null).getInt();
//Projectile IDs
entityMudballID = config.get("Entity IDs", "Mudball ID", 103, null).getInt();;
entityDartID = config.get("Entity IDs", "Dart ID", 104, null).getInt();;
entityPoisonDartID = config.get("Entity IDs", "Poison Dart ID", 105, null).getInt();;
FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generating Biome ID's");
//23-79 ExtraBiomesXL
autumnHillsID = config.get("Biome IDs", "Autumn Hills ID", 33).getInt();
overgrownGreensID = config.get("Biome IDs", "Overgrown Greens ID", 34).getInt();
forestHillsNewID = config.get("Biome IDs", "Forest Hills (Sub-Biome) ID", 35).getInt();
taigaHillsNewID = config.get("Biome IDs", "Taiga Hills (Sub-Biome) ID", 36).getInt();
jungleHillsNewID = config.get("Biome IDs", "Jungle Hills (Sub-Biome) ID", 37).getInt();
silkgladesID = config.get("Biome IDs", "Silkglades ID", 38).getInt();
savannaPlateauID = config.get("Biome IDs", "Savanna Plateau (Sub-Biome) ID", 39).getInt();
fieldForestID = config.get("Biome IDs", "Forested Field (Sub-Biome) ID", 40).getInt();
seasonalSpruceForestID = config.get("Biome IDs", "Seasonal Spruce Forest (Sub-Biome) ID", 41).getInt();
alpsBaseID = config.get("Biome IDs", "Alps Forest (Sub-Biome) ID", 42).getInt();
alpsForestID = config.get("Biome IDs", "Alps Mountainside (Sub-Biome) ID", 43).getInt();
timberThinID = config.get("Biome IDs", "Thinned Timber (Sub-Biome) ID", 44).getInt();
pastureThinID = config.get("Biome IDs", "Thinned Pasture (Sub-Biome) ID", 45).getInt();
pastureMeadowID = config.get("Biome IDs", "Pasture Meadow (Sub-Biome) ID", 46).getInt();
ominousWoodsThickID = config.get("Biome IDs", "Thick Ominous Woods (Sub-Biome) ID", 47).getInt();
shrublandForestID = config.get("Biome IDs", "Thick Shrubland (Sub-Biome) ID", 48).getInt();
canyonRavineID = config.get("Biome IDs", "Canyon Ravine (Sub-Biome) ID", 49).getInt();
meadowForestID = config.get("Biome IDs", "Meadow Forest (Sub-Biome) ID", 50).getInt();
oceanAbyssID = config.get("Biome IDs", "Oceanic Abyss (Ocean) ID", 57).getInt();
oceanCoralID = config.get("Biome IDs", "Coral Reef (Ocean) ID", 58).getInt();
oceanKelpID = config.get("Biome IDs", "Kelp Forest (Ocean) ID", 59).getInt();
beachGravelID = config.get("Biome IDs", "Gravel Beach ID", 60).getInt();
beachOvergrownID = config.get("Biome IDs", "Overgrown Beach ID", 61).getInt();
promisedLandForestID = config.get("Biome IDs", "Wonderous Woods (Promised Land) ID", 62).getInt();
promisedLandPlainsID = config.get("Biome IDs", "Majestic Meadow (Promised Land) ID", 63).getInt();
promisedLandSwampID = config.get("Biome IDs", "Blessed Bog (Promised Land) ID", 64).getInt();
netherBaseID = config.get("Biome IDs", "Nether Base (Nether) ID", 65).getInt();
netherGardenID = config.get("Biome IDs", "Undergarden (Nether) ID", 66).getInt();
netherDesertID = config.get("Biome IDs", "Corrupted Sands (Nether) ID", 67).getInt();
netherLavaID = config.get("Biome IDs", "Phantasmagoric Inferno (Nether) ID", 68).getInt();
netherBoneID = config.get("Biome IDs", "Boneyard (Nether) ID", 69).getInt();
//70-87 Twilight Forest
//80-159 Better World Generation 4
//160-161 BuildCraft Oil Fields
//162-169 Thaumcraft
alpsID = config.get("Biome IDs", "Alps ID", 170).getInt();
arcticID = config.get("Biome IDs", "Arctic ID", 171).getInt();
badlandsID = config.get("Biome IDs", "Badlands ID", 172).getInt();
bambooForestID = config.get("Biome IDs", "Bamboo Forest ID", 173).getInt();
bayouID = config.get("Biome IDs", "Bayou ID", 174).getInt();
birchForestID = config.get("Biome IDs", "Birch Forest ID", 175).getInt();
bogID = config.get("Biome IDs", "Bog ID", 176).getInt();
borealForestID = config.get("Biome IDs", "Boreal Forest ID", 177).getInt();
brushlandID = config.get("Biome IDs", "Brushland ID", 178).getInt();
canyonID = config.get("Biome IDs", "Canyon ID", 179).getInt();
chaparralID = config.get("Biome IDs", "Chaparral ID", 180).getInt();
cherryBlossomGroveID = config.get("Biome IDs", "Cherry Blossom Grove ID", 181).getInt();
coniferousForestID = config.get("Biome IDs", "Coniferous Forest ID", 182).getInt();
coniferousForestSnowID = config.get("Biome IDs", "Coniferous Forest (Snow) ID", 183).getInt();
cragID = config.get("Biome IDs", "Crag ID", 184).getInt();
deadForestID = config.get("Biome IDs", "Dead Forest ID", 185).getInt();
deadForestSnowID = config.get("Biome IDs", "Dead Forest (Snow) ID", 186).getInt();
deadSwampID = config.get("Biome IDs", "Dead Swamp ID", 187).getInt();
deadlandsID = config.get("Biome IDs", "Deadlands ID", 188).getInt();
deciduousForestID = config.get("Biome IDs", "Deciduous Forest ID", 189).getInt();
dunesID = config.get("Biome IDs", "Dunes ID", 190).getInt();
fenID = config.get("Biome IDs", "Fen ID", 191).getInt();
fieldID = config.get("Biome IDs", "Field ID", 192).getInt();
frostForestID = config.get("Biome IDs", "Frost Forest ID", 193).getInt();
fungiForestID = config.get("Biome IDs", "Fungi Forest ID", 194).getInt();
gardenID = config.get("Biome IDs", "Garden ID", 195).getInt();
glacierID = config.get("Biome IDs", "Glacier ID", 196).getInt();
grasslandID = config.get("Biome IDs", "Grassland ID", 197).getInt();
groveID = config.get("Biome IDs", "Grove ID", 198).getInt();
heathlandID = config.get("Biome IDs", "Heathland ID", 199).getInt();
highlandID = config.get("Biome IDs", "Highland ID", 200).getInt();
hotSpringsID = config.get("Biome IDs", "Hot Springs ID", 201).getInt();
icyHillsID = config.get("Biome IDs", "Icy Hills ID", 202).getInt();
jadeCliffsID = config.get("Biome IDs", "Jade Cliffs ID", 203).getInt();
lushDesertID = config.get("Biome IDs", "Lush Desert ID", 204).getInt();
lushSwampID = config.get("Biome IDs", "Lush Swamp ID", 205).getInt();
mangroveID = config.get("Biome IDs", "Mangrove ID", 206).getInt();
//207-209 left for Mo Creatures
mapleWoodsID = config.get("Biome IDs", "Maple Woods ID", 210).getInt();
marshID = config.get("Biome IDs", "Marsh ID", 211).getInt();
meadowID = config.get("Biome IDs", "Meadow ID", 212).getInt();
mesaID = config.get("Biome IDs", "Mesa ID", 213).getInt();
moorID = config.get("Biome IDs", "Moor ID", 214).getInt();
mountainID = config.get("Biome IDs", "Mountain ID", 215).getInt();
mysticGroveID = config.get("Biome IDs", "Mystic Grove ID", 216).getInt();
oasisID = config.get("Biome IDs", "Oasis ID", 217).getInt();
ominousWoodsID = config.get("Biome IDs", "Ominous Woods ID", 218).getInt();
orchardID = config.get("Biome IDs", "Orchard ID", 219).getInt();
originValleyID = config.get("Biome IDs", "Origin Valley ID", 220).getInt();
outbackID = config.get("Biome IDs", "Outback ID", 221).getInt();
pastureID = config.get("Biome IDs", "Pasture ID", 222).getInt();
polarID = config.get("Biome IDs", "Polar ID", 223).getInt();
prairieID = config.get("Biome IDs", "Prairie ID", 224).getInt();
quagmireID = config.get("Biome IDs", "Quagmire ID", 225).getInt();
rainforestID = config.get("Biome IDs", "Rainforest ID", 226).getInt();
redwoodForestID = config.get("Biome IDs", "Redwood Forest ID", 227).getInt();
sacredSpringsID = config.get("Biome IDs", "Sacred Springs ID", 228).getInt();
savannaID = config.get("Biome IDs", "Savanna ID", 229).getInt();
scrublandID = config.get("Biome IDs", "Scrubland ID", 230).getInt();
seasonalForestID = config.get("Biome IDs", "Seasonal Forest ID", 231).getInt();
shieldID = config.get("Biome IDs", "Shield ID", 232).getInt();
shoreID = config.get("Biome IDs", "Shore ID", 233).getInt();
shrublandID = config.get("Biome IDs", "Shrubland ID", 234).getInt();
sludgepitID = config.get("Biome IDs", "Sludgepit ID", 235).getInt();
spruceWoodsID = config.get("Biome IDs", "Spruce Woods ID", 236).getInt();
steppeID = config.get("Biome IDs", "Steppe ID", 237).getInt();
temperateRainforestID = config.get("Biome IDs", "Temperate Rainforest ID", 238).getInt();
thicketID = config.get("Biome IDs", "Thicket ID", 239).getInt();
timberID = config.get("Biome IDs", "Timber ID", 240).getInt();
tropicalRainforestID = config.get("Biome IDs", "Tropical Rainforest ID", 241).getInt();
tropicsID = config.get("Biome IDs", "Tropics ID", 242).getInt();
tundraID = config.get("Biome IDs", "Tundra ID", 243).getInt();
volcanoID = config.get("Biome IDs", "Volcano ID", 244).getInt();
wastelandID = config.get("Biome IDs", "Wasteland ID", 245).getInt();
wetlandID = config.get("Biome IDs", "Wetland ID", 246).getInt();
woodlandID = config.get("Biome IDs", "Woodland ID", 247).getInt();
plainsNewID = config.get("Biome IDs", "Plains (New) ID", 248).getInt();
desertNewID = config.get("Biome IDs", "Desert (New) ID", 249).getInt();
forestNewID = config.get("Biome IDs", "Forest (New) ID", 250).getInt();
taigaNewID = config.get("Biome IDs", "Taiga (New) ID", 251).getInt();
swamplandNewID = config.get("Biome IDs", "Swampland (New) ID", 252).getInt();
extremeHillsNewID = config.get("Biome IDs", "Extreme Hills (New) ID", 253).getInt();
jungleNewID = config.get("Biome IDs", "Jungle (New) ID", 254).getInt();
FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generated IDs Config!");
}
catch (Exception e)
{
FMLLog.log(Level.SEVERE, e, "Biomes O Plenty has had a problem loading its configuration");
}
finally
{
if (config.hasChanged())
{
config.save();
}
}
}
}

48
common/biomesoplenty/configuration/configfile/BOPConfigurationMain.java Normal file
View file

@ -0,0 +1,48 @@
package biomesoplenty.configuration.configfile;
import java.io.File;
import java.util.logging.Level;
import net.minecraftforge.common.Configuration;
import net.minecraftforge.common.Property;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.FMLLog;
public class BOPConfigurationMain
{
public static Configuration config;
// Configuration variables
public static boolean realisticTrees;
public static Property seenVersion;
public static Property seenWorldTypeMsg;
public static void init(File configFile)
{
config = new Configuration(configFile);
try
{
config.load();
//realisticTrees = config.get("Biome Settings", "Realistic Trees", true).getBoolean(true);
realisticTrees = false;
seenVersion = config.get("Vars", "Seen Version", "null");
seenWorldTypeMsg = config.get("Vars", "Seen WorldType Msg", false);
FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generated Main Config!");
}
catch (Exception e)
{
FMLLog.log(Level.SEVERE, e, "Biomes O Plenty has had a problem loading its configuration");
}
finally
{
if (config.hasChanged()) {
config.save();
}
}
}
}

71
common/biomesoplenty/configuration/configfile/BOPConfigurationMisc.java Normal file
View file

@ -0,0 +1,71 @@
package biomesoplenty.configuration.configfile;
import java.io.File;
import java.util.logging.Level;
import net.minecraftforge.common.Configuration;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.FMLLog;
public class BOPConfigurationMisc
{
public static Configuration config;
public static boolean skyColors;
public static boolean achievements;
public static boolean dungeonLoot;
public static boolean rainCreatesPuddles;
public static boolean amethystTools;
public static boolean mudTools;
public static boolean altarCrafting;
public static boolean scytheCrafting;
public static boolean staffCrafting;
public static boolean enderporterCrafting;
public static boolean dartCrafting;
public static boolean flowerbandCrafting;
public static boolean hotSpringsRegeneration;
public static int promisedLandSkyColor;
public static void init(File configFile)
{
config = new Configuration(configFile);
try
{
config.load();
achievements = config.get("Miscellanious Settings", "Add Biomes O\' Plenty Achievements", true).getBoolean(false);
dungeonLoot = config.get("Miscellanious Settings", "Add Custom Dungeon Loot", true).getBoolean(false);
rainCreatesPuddles = config.get("Miscellanious Settings", "Enable Puddles During Rain", true).getBoolean(true);
hotSpringsRegeneration = config.get("Miscellanious Settings", "Enable Spring Water Regeneration Effect", true).getBoolean(true);
amethystTools = config.get("Crafting Settings", "Enable Amethyst Tool/Armor Crafting", true).getBoolean(true);
mudTools = config.get("Crafting Settings", "Enable Mud Tool/Armor Crafting", true).getBoolean(true);
altarCrafting = config.get("Crafting Settings", "Enable Altar Items Crafting", true).getBoolean(true);
scytheCrafting = config.get("Crafting Settings", "Enable Scythe Crafting", true).getBoolean(true);
staffCrafting = config.get("Crafting Settings", "Enable Ancient Staff Crafting", true).getBoolean(true);
enderporterCrafting = config.get("Crafting Settings", "Enable Enderporter Crafting", true).getBoolean(true);
dartCrafting = config.get("Crafting Settings", "Enable Dartblower/Dart Crafting", true).getBoolean(true);
flowerbandCrafting = config.get("Crafting Settings", "Enable Flower Band Crafting", true).getBoolean(true);
//Hard-Coded Colors
skyColors = config.get("Hard-Coded Colors", "Enable Sky Colors", true).getBoolean(false);
promisedLandSkyColor = config.get("Hard-Coded Colors", "Promised Land Sky Color", 50175, null).getInt();
FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generated Misc Config!");
}
catch (Exception e)
{
FMLLog.log(Level.SEVERE, e, "Biomes O Plenty has had a problem loading its configuration");
}
finally
{
if (config.hasChanged()) {
config.save();
}
}
}
}

243
common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java Normal file
View file

@ -0,0 +1,243 @@
package biomesoplenty.configuration.configfile;
import java.io.File;
import java.util.logging.Level;
import net.minecraftforge.common.Configuration;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.FMLLog;
public class BOPConfigurationTerrainGen
{
public static Configuration config;
public static double biomeSize;
public static boolean addToDefault;
public static boolean vanillaEnhanced;
public static boolean netherOverride;
public static boolean pumpkinGen;
public static boolean poisonIvyGen;
public static boolean thornGen;
public static boolean springWaterGen;
public static boolean poisonWaterGen;
public static boolean quicksandGen;
public static boolean exposedStone;
public static int villageDistance;
// Village biomes
public static boolean alpsVillage;
public static boolean arcticVillage;
public static boolean autumnHillsVillage;
public static boolean badlandsVillage;
public static boolean bambooForestVillage;
public static boolean bayouVillage;
public static boolean birchForestVillage;
public static boolean bogVillage;
public static boolean borealForestVillage;
public static boolean brushlandVillage;
public static boolean canyonVillage;
public static boolean chaparralVillage;
public static boolean cherryBlossomGroveVillage;
public static boolean coniferousForestVillage;
public static boolean coniferousForestSnowVillage;
public static boolean cragVillage;
public static boolean deadForestVillage;
public static boolean deadForestSnowVillage;
public static boolean deadSwampVillage;
public static boolean deadlandsVillage;
public static boolean deciduousForestVillage;
public static boolean dunesVillage;
public static boolean fenVillage;
public static boolean fieldVillage;
public static boolean frostForestVillage;
public static boolean fungiForestVillage;
public static boolean gardenVillage;
public static boolean glacierVillage;
public static boolean grasslandVillage;
public static boolean groveVillage;
public static boolean heathlandVillage;
public static boolean highlandVillage;
public static boolean hotSpringsVillage;
public static boolean icyHillsVillage;
public static boolean jadeCliffsVillage;
public static boolean lushDesertVillage;
public static boolean lushSwampVillage;
public static boolean mangroveVillage;
public static boolean mapleWoodsVillage;
public static boolean marshVillage;
public static boolean meadowVillage;
public static boolean mesaVillage;
public static boolean moorVillage;
public static boolean mountainVillage;
// public static boolean mushroomIslandVillage;
public static boolean mysticGroveVillage;
public static boolean oasisVillage;
public static boolean ominousWoodsVillage;
public static boolean orchardVillage;
public static boolean originValleyVillage;
public static boolean outbackVillage;
public static boolean overgrownGreensVillage;
public static boolean pastureVillage;
public static boolean polarVillage;
public static boolean prairieVillage;
public static boolean quagmireVillage;
public static boolean rainforestVillage;
public static boolean redwoodForestVillage;
public static boolean sacredSpringsVillage;
public static boolean savannaVillage;
public static boolean scrublandVillage;
public static boolean seasonalForestVillage;
public static boolean shieldVillage;
public static boolean shrublandVillage;
public static boolean silkgladesVillage;
public static boolean sludgepitVillage;
public static boolean spruceWoodsVillage;
public static boolean steppeVillage;
public static boolean temperateRainforestVillage;
public static boolean thicketVillage;
public static boolean timberVillage;
public static boolean tropicalRainforestVillage;
public static boolean tropicsVillage;
public static boolean tundraVillage;
public static boolean volcanoVillage;
public static boolean wastelandVillage;
public static boolean wetlandVillage;
public static boolean woodlandVillage;
public static boolean plainsVillage;
public static boolean desertVillage;
public static boolean extremeHillsVillage;
public static boolean forestVillage;
public static boolean taigaVillage;
public static boolean swamplandVillage;
public static boolean jungleVillage;
public static void init(File configFile)
{
config = new Configuration(configFile);
try
{
config.load();
biomeSize = config.get("Biomes O\' Plenty World Type Settings", "Biome Size", 4.0, "Default World Type has 4. Large Biomes World Type has 6.").getDouble(4.0);
addToDefault = config.get("Biome Settings", "Add Biomes To Default World", false).getBoolean(true);
vanillaEnhanced = config.get("Biome Settings", "Enhanced Vanilla Biomes", true).getBoolean(false);
netherOverride = config.get("Dimension Settings", "Enable Nether Override", true).getBoolean(true);
pumpkinGen = config.get("Decoration Settings", "Generate Pumpkins Without Faces", true).getBoolean(true);
poisonIvyGen = config.get("Decoration Settings", "Generate Poison Ivy", true).getBoolean(true);
thornGen = config.get("Decoration Settings", "Generate Thorns", true).getBoolean(true);
springWaterGen = config.get("Decoration Settings", "Generate Hot Springs", true).getBoolean(true);
poisonWaterGen = config.get("Decoration Settings", "Generate Poison Pools", true).getBoolean(true);
quicksandGen = config.get("Decoration Settings", "Generate Quicksand", true).getBoolean(true);
exposedStone = config.get("Decoration Settings", "Generate Sections Of Exposed Stone", true).getBoolean(true);
villageDistance = config.get("Biomes O\' Plenty World Type Settings", "Distance between villages", 32, "In Vanilla it is set to 32").getInt();
if (villageDistance < 8)
{
villageDistance = 8;
}
// Biomes with villages
alpsVillage = config.get("Allow Villages", "Alps", false).getBoolean(false);
arcticVillage = config.get("Allow Villages", "Arctic", true).getBoolean(false);
autumnHillsVillage = config.get("Allow Villages", "AutumnHills", false).getBoolean(false);
badlandsVillage = config.get("Allow Villages", "Badlands", false).getBoolean(false);
bambooForestVillage = config.get("Allow Villages", "BambooForest", false).getBoolean(false);
bayouVillage = config.get("Allow Villages", "Bayou", false).getBoolean(false);
birchForestVillage = config.get("Allow Villages", "BirchForest", false).getBoolean(false);
bogVillage = config.get("Allow Villages", "Bog", false).getBoolean(false);
borealForestVillage = config.get("Allow Villages", "BorealForest", false).getBoolean(false);
brushlandVillage = config.get("Allow Villages", "Brushland", true).getBoolean(false);
canyonVillage = config.get("Allow Villages", "Canyon", false).getBoolean(false);
chaparralVillage = config.get("Allow Villages", "Chaparral", true).getBoolean(false);
cherryBlossomGroveVillage = config.get("Allow Villages", "CherryBlossomGrove", false).getBoolean(false);
coniferousForestVillage = config.get("Allow Villages", "ConiferousForest", false).getBoolean(false);
coniferousForestSnowVillage = config.get("Allow Villages", "ConiferousForestSnow", false).getBoolean(false);
cragVillage = config.get("Allow Villages", "Crag", false).getBoolean(false);
deadForestVillage = config.get("Allow Villages", "DeadForest", false).getBoolean(false);
deadForestSnowVillage = config.get("Allow Villages", "DeadForestSnow", false).getBoolean(false);
deadSwampVillage = config.get("Allow Villages", "DeadSwamp", false).getBoolean(false);
deadlandsVillage = config.get("Allow Villages", "Deadlands", false).getBoolean(false);
deciduousForestVillage = config.get("Allow Villages", "DeciduousForest", false).getBoolean(false);
dunesVillage = config.get("Allow Villages", "Dunes", false).getBoolean(false);
fenVillage = config.get("Allow Villages", "Fen", false).getBoolean(false);
fieldVillage = config.get("Allow Villages", "Field", true).getBoolean(false);
frostForestVillage = config.get("Allow Villages", "FrostForest", false).getBoolean(false);
fungiForestVillage = config.get("Allow Villages", "FungiForest", false).getBoolean(false);
gardenVillage = config.get("Allow Villages", "Garden", false).getBoolean(false);
glacierVillage = config.get("Allow Villages", "Glacier", false).getBoolean(false);
grasslandVillage = config.get("Allow Villages", "Grassland", true).getBoolean(false);
groveVillage = config.get("Allow Villages", "Grove", true).getBoolean(false);
heathlandVillage = config.get("Allow Villages", "Heathland", true).getBoolean(false);
highlandVillage = config.get("Allow Villages", "Highland", false).getBoolean(false);
hotSpringsVillage = config.get("Allow Villages", "HotSprings", false).getBoolean(false);
icyHillsVillage = config.get("Allow Villages", "IcyHills", false).getBoolean(false);
jadeCliffsVillage = config.get("Allow Villages", "JadeCliffs", false).getBoolean(false);
lushDesertVillage = config.get("Allow Villages", "LushDesert", false).getBoolean(false);
lushSwampVillage = config.get("Allow Villages", "LushSwamp", false).getBoolean(false);
mangroveVillage = config.get("Allow Villages", "Mangrove", false).getBoolean(false);
mapleWoodsVillage = config.get("Allow Villages", "MapleWoods", false).getBoolean(false);
marshVillage = config.get("Allow Villages", "Marsh", false).getBoolean(false);
meadowVillage = config.get("Allow Villages", "Meadow", true).getBoolean(false);
mesaVillage = config.get("Allow Villages", "Mesa", false).getBoolean(false);
moorVillage = config.get("Allow Villages", "Moor", false).getBoolean(false);
mountainVillage = config.get("Allow Villages", "Mountain", false).getBoolean(false);
// mushroomIslandVillage = config.get("Allow Villages", "MushroomIsland", false).getBoolean(false);
mysticGroveVillage = config.get("Allow Villages", "MysticGrove", false).getBoolean(false);
oasisVillage = config.get("Allow Villages", "Oasis", false).getBoolean(false);
ominousWoodsVillage = config.get("Allow Villages", "OminousWoods", false).getBoolean(false);
orchardVillage = config.get("Allow Villages", "Orchard", false).getBoolean(false);
originValleyVillage = config.get("Allow Villages", "OriginValley", false).getBoolean(false);
outbackVillage = config.get("Allow Villages", "Outback", true).getBoolean(false);
overgrownGreensVillage = config.get("Allow Villages", "OvergrownGreens", true).getBoolean(false);
pastureVillage = config.get("Allow Villages", "Pasture", false).getBoolean(false);
polarVillage = config.get("Allow Villages", "Polar", false).getBoolean(false);
prairieVillage = config.get("Allow Villages", "Prairie", true).getBoolean(false);
quagmireVillage = config.get("Allow Villages", "Quagmire", false).getBoolean(false);
rainforestVillage = config.get("Allow Villages", "Rainforest", false).getBoolean(false);
redwoodForestVillage = config.get("Allow Villages", "RedwoodForest", false).getBoolean(false);
sacredSpringsVillage = config.get("Allow Villages", "SacredSprings", false).getBoolean(false);
savannaVillage = config.get("Allow Villages", "Savanna", true).getBoolean(false);
scrublandVillage = config.get("Allow Villages", "Scrubland", true).getBoolean(false);
seasonalForestVillage = config.get("Allow Villages", "SeasonalForest", false).getBoolean(false);
shieldVillage = config.get("Allow Villages", "Shield", false).getBoolean(false);
shrublandVillage = config.get("Allow Villages", "Shrubland", true).getBoolean(false);
silkgladesVillage = config.get("Allow Villages", "Silkgladess", false).getBoolean(false);
sludgepitVillage = config.get("Allow Villages", "Sludgepit", false).getBoolean(false);
spruceWoodsVillage = config.get("Allow Villages", "SpruceWoods", false).getBoolean(false);
steppeVillage = config.get("Allow Villages", "Steppe", true).getBoolean(false);
temperateRainforestVillage = config.get("Allow Villages", "TemperateRainforest", false).getBoolean(false);
thicketVillage = config.get("Allow Villages", "Thicket", false).getBoolean(false);
timberVillage = config.get("Allow Villages", "Timber", false).getBoolean(false);
tropicalRainforestVillage = config.get("Allow Villages", "TropicalRainforest", true).getBoolean(false);
tropicsVillage = config.get("Allow Villages", "Tropics", false).getBoolean(false);
tundraVillage = config.get("Allow Villages", "Tundra", true).getBoolean(false);
volcanoVillage = config.get("Allow Villages", "Volcano", false).getBoolean(false);
wastelandVillage = config.get("Allow Villages", "Wasteland", false).getBoolean(false);
wetlandVillage = config.get("Allow Villages", "Wetland", false).getBoolean(false);
woodlandVillage = config.get("Allow Villages", "Woodland", false).getBoolean(false);
// Vanilla biomes
desertVillage = config.get("Allow Villages", "Desert", true).getBoolean(true);
extremeHillsVillage = config.get("Allow Villages", "ExtremeHills", false).getBoolean(false);
forestVillage = config.get("Allow Villages", "Forest", false).getBoolean(false);
jungleVillage = config.get("Allow Villages", "Jungle", false).getBoolean(false);
plainsVillage = config.get("Allow Villages", "Plains", true).getBoolean(true);
swamplandVillage = config.get("Allow Villages", "Swampland", false).getBoolean(false);
taigaVillage = config.get("Allow Villages", "Taiga", false).getBoolean(false);
FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generated Terrain Gen Config!");
}
catch (Exception e)
{
FMLLog.log(Level.SEVERE, e, "Biomes O Plenty has had a problem loading its configuration");
}
finally
{
if (config.hasChanged()) {
config.save();
}
}
}
}

4
common/biomesoplenty/fluids/BlockFluidSpringWater.java
View file

@ -18,7 +18,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import biomesoplenty.BiomesOPlenty; import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.Fluids; import biomesoplenty.api.Fluids;
import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
@ -75,7 +75,7 @@ public class BlockFluidSpringWater extends BlockFluidClassic
{ {
int meta = world.getBlockMetadata(x, y, z); int meta = world.getBlockMetadata(x, y, z);
if (!world.isRemote && BOPConfiguration.Misc.hotSpringsRegeneration) if (!world.isRemote && BOPConfigurationMisc.hotSpringsRegeneration)
{ {
if (entity instanceof EntityLivingBase) if (entity instanceof EntityLivingBase)
{ {

Some files were not shown because too many files have changed in this diff Show more