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

Split the config file into sub files

Browse source
This commit is contained in:
Adubbz 2013-08-03 10:07:43 +10:00
parent 64df7049c5
commit 7791cadfe0
59 changed files with 1956 additions and 1818 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/minecraft/biomesoplenty/BiomesOPlenty.java
View file

@ -1,7 +1,5 @@
package biomesoplenty; package biomesoplenty;
import java.io.File;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
@ -54,13 +52,13 @@ public class BiomesOPlenty
public static CommonProxy proxy; public static CommonProxy proxy;
public static CreativeTabs tabBiomesOPlenty; public static CreativeTabs tabBiomesOPlenty;
public static String mainBOPConfig; public static String configPath;
@EventHandler @EventHandler
public void preInit(FMLPreInitializationEvent event) public void preInit(FMLPreInitializationEvent event)
{ {
mainBOPConfig = event.getModConfigurationDirectory() + "/biomesoplenty/" + "main.cfg"; configPath = event.getModConfigurationDirectory() + "/biomesoplenty/";
BOPConfiguration.init(new File(mainBOPConfig)); BOPConfiguration.init(configPath);
Version.check(); Version.check();
@ -81,7 +79,7 @@ public class BiomesOPlenty
} }
// Achievement declaration // Achievement declaration
if (BOPConfiguration.achievements) if (BOPConfiguration.Misc.achievements)
{ {
AchievementHelper.init(); AchievementHelper.init();
} }
@ -111,13 +109,13 @@ public class BiomesOPlenty
proxy.registerRenderers(); proxy.registerRenderers();
if (BOPConfiguration.netherOverride) if (BOPConfiguration.TerrainGen.netherOverride)
{ {
DimensionManager.unregisterProviderType(-1); DimensionManager.unregisterProviderType(-1);
DimensionManager.registerProviderType(-1, WorldProviderBOPhell.class, true); DimensionManager.registerProviderType(-1, WorldProviderBOPhell.class, true);
} }
DimensionManager.registerProviderType(BOPConfiguration.promisedLandDimID, WorldProviderPromised.class, false); DimensionManager.registerProviderType(BOPConfiguration.IDs.promisedLandDimID, WorldProviderPromised.class, false);
DimensionManager.registerDimension(BOPConfiguration.promisedLandDimID, BOPConfiguration.promisedLandDimID); DimensionManager.registerDimension(BOPConfiguration.IDs.promisedLandDimID, BOPConfiguration.IDs.promisedLandDimID);
BOPCrossIntegration.init(); BOPCrossIntegration.init();
} }

2
src/minecraft/biomesoplenty/biomes/BiomeGenBadlands.java
View file

@ -58,7 +58,7 @@ public class BiomeGenBadlands extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 9814727; return 9814727;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenBayou.java
View file

@ -108,7 +108,7 @@ public class BiomeGenBayou extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 11322556; return 11322556;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenConiferousForest.java
View file

@ -43,7 +43,7 @@ public class BiomeGenConiferousForest extends BiomeGenBase
@Override @Override
public WorldGenerator getRandomWorldGenForTrees(Random par1Random) public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
{ {
if (BOPConfiguration.realisticTrees) if (BOPConfiguration.Main.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());
} }

2
src/minecraft/biomesoplenty/biomes/BiomeGenCrag.java
View file

@ -52,7 +52,7 @@ public class BiomeGenCrag extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 4944498; return 4944498;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenDeadForest.java
View file

@ -68,7 +68,7 @@ public class BiomeGenDeadForest extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 9873591; return 9873591;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenDeadForestSnow.java
View file

@ -90,7 +90,7 @@ public class BiomeGenDeadForestSnow extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 9873591; return 9873591;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenDeadSwamp.java
View file

@ -95,7 +95,7 @@ public class BiomeGenDeadSwamp extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 6451816; return 6451816;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenDeadlands.java
View file

@ -78,7 +78,7 @@ public class BiomeGenDeadlands extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 4464929; return 4464929;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenDesertNew.java
View file

@ -67,7 +67,7 @@ public class BiomeGenDesertNew extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 13877903; return 13877903;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenFrostForest.java
View file

@ -79,7 +79,7 @@ public class BiomeGenFrostForest extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 13557994; return 13557994;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenFungiForest.java
View file

@ -109,7 +109,7 @@ public class BiomeGenFungiForest extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 5888980; return 5888980;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenIcyHills.java
View file

@ -67,7 +67,7 @@ public class BiomeGenIcyHills extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 16777215; return 16777215;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenJadeCliffs.java
View file

@ -60,7 +60,7 @@ public class BiomeGenJadeCliffs extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 12045485; return 12045485;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenJungleNew.java
View file

@ -115,7 +115,7 @@ public class BiomeGenJungleNew extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 9225359; return 9225359;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenMesa.java
View file

@ -57,7 +57,7 @@ public class BiomeGenMesa extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 15898486; return 15898486;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenMoor.java
View file

@ -99,7 +99,7 @@ public class BiomeGenMoor extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 10536403; return 10536403;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenMountain.java
View file

@ -31,7 +31,7 @@ public class BiomeGenMountain extends BiomeGenBase
@Override @Override
public WorldGenerator getRandomWorldGenForTrees(Random par1Random) public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
{ {
if (BOPConfiguration.realisticTrees) if (BOPConfiguration.Main.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);
} }

6
src/minecraft/biomesoplenty/biomes/BiomeGenMysticGrove.java
View file

@ -25,7 +25,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.realisticTrees) if (BOPConfiguration.Main.realisticTrees)
{ {
customBiomeDecorator.treesPerChunk = 1; customBiomeDecorator.treesPerChunk = 1;
} }
@ -61,7 +61,7 @@ public class BiomeGenMysticGrove extends BiomeGenBase
@Override @Override
public WorldGenerator getRandomWorldGenForTrees(Random par1Random) public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
{ {
if (BOPConfiguration.realisticTrees) if (BOPConfiguration.Main.realisticTrees)
{ {
return new WorldGenRealMagic(); return new WorldGenRealMagic();
} }
@ -102,7 +102,7 @@ public class BiomeGenMysticGrove extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 16751558; return 16751558;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenOminousWoods.java
View file

@ -90,7 +90,7 @@ public class BiomeGenOminousWoods extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 5069168; return 5069168;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenOminousWoodsThick.java
View file

@ -92,7 +92,7 @@ public class BiomeGenOminousWoodsThick extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 5069168; return 5069168;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenOriginValley.java
View file

@ -60,7 +60,7 @@ public class BiomeGenOriginValley extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 8703228; return 8703228;
else else
{ {

4
src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandForest.java
View file

@ -110,8 +110,8 @@ public class BiomeGenPromisedLandForest extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return BOPConfiguration.promisedLandSkyColor; return BOPConfiguration.Misc.promisedLandSkyColor;
else else
{ {
par1 /= 3.0F; par1 /= 3.0F;

4
src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandPlains.java
View file

@ -104,8 +104,8 @@ public class BiomeGenPromisedLandPlains extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return BOPConfiguration.promisedLandSkyColor; return BOPConfiguration.Misc.promisedLandSkyColor;
else else
{ {
par1 /= 3.0F; par1 /= 3.0F;

4
src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandSwamp.java
View file

@ -109,8 +109,8 @@ public class BiomeGenPromisedLandSwamp extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return BOPConfiguration.promisedLandSkyColor; return BOPConfiguration.Misc.promisedLandSkyColor;
else else
{ {
par1 /= 3.0F; par1 /= 3.0F;

2
src/minecraft/biomesoplenty/biomes/BiomeGenQuagmire.java
View file

@ -86,7 +86,7 @@ public class BiomeGenQuagmire extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 12436670; return 12436670;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenRedwoodForest.java
View file

@ -36,7 +36,7 @@ public class BiomeGenRedwoodForest extends BiomeGenBase
@Override @Override
public WorldGenerator getRandomWorldGenForTrees(Random par1Random) public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
{ {
if (BOPConfiguration.realisticTrees) if (BOPConfiguration.Main.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());
} }

2
src/minecraft/biomesoplenty/biomes/BiomeGenSacredSprings.java
View file

@ -100,7 +100,7 @@ public class BiomeGenSacredSprings extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 1995007; return 1995007;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenSludgepit.java
View file

@ -103,7 +103,7 @@ public class BiomeGenSludgepit extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 7039816; return 7039816;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenSwampNew.java
View file

@ -108,7 +108,7 @@ public class BiomeGenSwampNew extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 4149332; return 4149332;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenTropicalRainforest.java
View file

@ -95,7 +95,7 @@ public class BiomeGenTropicalRainforest extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 12971089; return 12971089;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenTropics.java
View file

@ -72,7 +72,7 @@ public class BiomeGenTropics extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 3333631; return 3333631;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenVolcano.java
View file

@ -43,7 +43,7 @@ public class BiomeGenVolcano extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 8026746; return 8026746;
else else
{ {

2
src/minecraft/biomesoplenty/biomes/BiomeGenWasteland.java
View file

@ -63,7 +63,7 @@ public class BiomeGenWasteland extends BiomeGenBase
@Override @Override
public int getSkyColorByTemp(float par1) public int getSkyColorByTemp(float par1)
{ {
if (BOPConfiguration.skyColors) if (BOPConfiguration.Misc.skyColors)
return 10465942; return 10465942;
else else
{ {

4
src/minecraft/biomesoplenty/blocks/BlockPromisedPortal.java
View file

@ -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.promisedLandDimID) if (par5Entity.dimension != BOPConfiguration.IDs.promisedLandDimID)
{ {
thePlayer.mcServer.getConfigurationManager().transferPlayerToDimension(thePlayer, BOPConfiguration.promisedLandDimID, new TeleporterPromised(thePlayer.mcServer.worldServerForDimension(BOPConfiguration.promisedLandDimID))); thePlayer.mcServer.getConfigurationManager().transferPlayerToDimension(thePlayer, BOPConfiguration.IDs.promisedLandDimID, new TeleporterPromised(thePlayer.mcServer.worldServerForDimension(BOPConfiguration.IDs.promisedLandDimID)));
} }
else else
{ {

713
src/minecraft/biomesoplenty/configuration/BOPBiomes.java
View file

File diff suppressed because it is too large Load diff

140
src/minecraft/biomesoplenty/configuration/BOPBlocks.java
View file

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

2120
src/minecraft/biomesoplenty/configuration/BOPConfiguration.java
View file

File diff suppressed because it is too large Load diff

16
src/minecraft/biomesoplenty/configuration/BOPCrafting.java
View file

@ -158,7 +158,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.scytheCrafting) if (BOPConfiguration.Misc.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 +174,7 @@ public class BOPCrafting
} }
//Mud Tools and Armor //Mud Tools and Armor
if (BOPConfiguration.mudTools) if (BOPConfiguration.Misc.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 +190,7 @@ public class BOPCrafting
} }
//Amethyst Tools and Armor //Amethyst Tools and Armor
if (BOPConfiguration.amethystTools) if (BOPConfiguration.Misc.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 +207,7 @@ public class BOPCrafting
} }
//Flower Bands //Flower Bands
if (BOPConfiguration.flowerbandCrafting) if (BOPConfiguration.Misc.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 +218,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.staffCrafting) if (BOPConfiguration.Misc.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 +227,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.enderporterCrafting) if (BOPConfiguration.Misc.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.altarCrafting) if (BOPConfiguration.Misc.altarCrafting)
{ {
GameRegistry.addRecipe(new ItemStack(Items.miscItems.get(), 1, 16), new Object[] {"SBS", "GKG", "SBS", 'S', Block.slowSand, 'B', Item.blazePowder, 'G', Item.ghastTear, 'K', new ItemStack(Item.skull, 1, 1)}); GameRegistry.addRecipe(new ItemStack(Items.miscItems.get(), 1, 16), new Object[] {"SBS", "GKG", "SBS", 'S', Block.slowSand, 'B', Item.blazePowder, 'G', Item.ghastTear, 'K', new ItemStack(Item.skull, 1, 1)});
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});
@ -244,7 +244,7 @@ public class BOPCrafting
} }
//Dart Blower //Dart Blower
if (BOPConfiguration.dartCrafting) if (BOPConfiguration.Misc.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});

12
src/minecraft/biomesoplenty/configuration/BOPEntities.java
View file

@ -38,13 +38,13 @@ public class BOPEntities {
public static void init() public static void init()
{ {
EntityRegistry.registerModEntity(EntityMudball.class, "MudBall", BOPConfiguration.entityMudballID, BiomesOPlenty.instance, 80, 3, true); EntityRegistry.registerModEntity(EntityMudball.class, "MudBall", BOPConfiguration.IDs.entityMudballID, BiomesOPlenty.instance, 80, 3, true);
EntityRegistry.registerModEntity(EntityDart.class, "Dart", BOPConfiguration.entityDartID, BiomesOPlenty.instance, 80, 3, true); EntityRegistry.registerModEntity(EntityDart.class, "Dart", BOPConfiguration.IDs.entityDartID, BiomesOPlenty.instance, 80, 3, true);
EntityRegistry.registerModEntity(EntityPoisonDart.class, "PoisonDart", BOPConfiguration.entityPoisonDartID, BiomesOPlenty.instance, 80, 3, true); EntityRegistry.registerModEntity(EntityPoisonDart.class, "PoisonDart", BOPConfiguration.IDs.entityPoisonDartID, BiomesOPlenty.instance, 80, 3, true);
EntityRegistry.registerModEntity(EntityJungleSpider.class, "JungleSpider", BOPConfiguration.jungleSpiderID, BiomesOPlenty.instance, 80, 3, true); EntityRegistry.registerModEntity(EntityJungleSpider.class, "JungleSpider", BOPConfiguration.IDs.jungleSpiderID, BiomesOPlenty.instance, 80, 3, true);
EntityRegistry.registerModEntity(EntityRosester.class, "Rosester", BOPConfiguration.rosesterID, BiomesOPlenty.instance, 80, 3, true); EntityRegistry.registerModEntity(EntityRosester.class, "Rosester", BOPConfiguration.IDs.rosesterID, BiomesOPlenty.instance, 80, 3, true);
EntityRegistry.registerModEntity(EntityGlob.class, "Glob", BOPConfiguration.globID, BiomesOPlenty.instance, 80, 3, true); EntityRegistry.registerModEntity(EntityGlob.class, "Glob", BOPConfiguration.IDs.globID, 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);

10
src/minecraft/biomesoplenty/configuration/BOPFluids.java
View file

@ -28,23 +28,23 @@ public class BOPFluids
private static void registerFluids() private static void registerFluids()
{ {
Fluids.liquidPoisonFluid = Optional.of(new LiquidPoisonFluid("bop.liquidPoison").setBlockID(BOPConfiguration.liquidPoisonStillID)); Fluids.liquidPoisonFluid = Optional.of(new LiquidPoisonFluid("bop.liquidPoison").setBlockID(BOPConfiguration.IDs.liquidPoisonStillID));
FluidRegistry.registerFluid(Fluids.liquidPoisonFluid.get()); FluidRegistry.registerFluid(Fluids.liquidPoisonFluid.get());
Fluids.springWaterFluid = Optional.of(new SpringWaterFluid("bop.springWater").setBlockID(BOPConfiguration.springWaterStillID)); Fluids.springWaterFluid = Optional.of(new SpringWaterFluid("bop.springWater").setBlockID(BOPConfiguration.IDs.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.liquidPoisonStillID, Fluids.liquidPoisonFluid.get(), Material.water).setUnlocalizedName("bop.liquidPoison")); Fluids.liquidPoison = Optional.of(new BlockFluidLiquidPoison(BOPConfiguration.IDs.liquidPoisonStillID, Fluids.liquidPoisonFluid.get(), Material.water).setUnlocalizedName("bop.liquidPoison"));
Fluids.springWater = Optional.of(new BlockFluidSpringWater(BOPConfiguration.springWaterStillID, Fluids.springWaterFluid.get(), Material.water).setUnlocalizedName("bop.springWater")); Fluids.springWater = Optional.of(new BlockFluidSpringWater(BOPConfiguration.IDs.springWaterStillID, Fluids.springWaterFluid.get(), Material.water).setUnlocalizedName("bop.springWater"));
} }
private static void initializeContainers() private static void initializeContainers()
{ {
Fluids.bopBucket = Optional.of((new ItemBOPBucket(BOPConfiguration.bopBucketID).setMaxStackSize(1).setUnlocalizedName("bop.bopBucket"))); Fluids.bopBucket = Optional.of((new ItemBOPBucket(BOPConfiguration.IDs.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));

72
src/minecraft/biomesoplenty/configuration/BOPItems.java
View file

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

2
src/minecraft/biomesoplenty/configuration/BOPVanillaCompat.java
View file

@ -29,7 +29,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.dungeonLoot == true) if (BOPConfiguration.Misc.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));

2
src/minecraft/biomesoplenty/handlers/BOPCraftHandler.java
View file

@ -13,7 +13,7 @@ public class BOPCraftHandler implements ICraftingHandler
@Override @Override
public void onCrafting(EntityPlayer var1, ItemStack var2, IInventory var3) public void onCrafting(EntityPlayer var1, ItemStack var2, IInventory var3)
{ {
if (var2.itemID == Items.flowerBand.get().itemID && BOPConfiguration.achievements) { if (var2.itemID == Items.flowerBand.get().itemID && BOPConfiguration.Misc.achievements) {
var1.addStat(AchievementHelper.achFlowerP, 1); var1.addStat(AchievementHelper.achFlowerP, 1);
} }
} }

2
src/minecraft/biomesoplenty/handlers/EntityEventHandler.java
View file

@ -85,7 +85,7 @@ public class EntityEventHandler
@ForgeSubscribe @ForgeSubscribe
public void fallingFromPromisedLand(LivingHurtEvent event) public void fallingFromPromisedLand(LivingHurtEvent event)
{ {
if (event.source == DamageSource.outOfWorld && event.entityLiving.dimension == BOPConfiguration.promisedLandDimID) if (event.source == DamageSource.outOfWorld && event.entityLiving.dimension == BOPConfiguration.IDs.promisedLandDimID)
{ {
event.setCanceled(true); event.setCanceled(true);

2
src/minecraft/biomesoplenty/handlers/TickHandlerServer.java
View file

@ -27,7 +27,7 @@ public class TickHandlerServer implements ITickHandler
int rand = new Random().nextInt(); int rand = new Random().nextInt();
if (BOPConfiguration.rainCreatesPuddles) if (BOPConfiguration.Misc.rainCreatesPuddles)
{ {
while (iterator.hasNext()) while (iterator.hasNext())
{ {

4
src/minecraft/biomesoplenty/helpers/AchievementHelper.java
View file

@ -363,7 +363,7 @@ public class AchievementHelper
// Achievement checker // Achievement checker
private static void onItemPickup(EntityPlayer player, ItemStack item) private static void onItemPickup(EntityPlayer player, ItemStack item)
{ {
if (BOPConfiguration.achievements) if (BOPConfiguration.Misc.achievements)
{ {
if (item.itemID == Blocks.flowers.get().blockID || item.itemID == Block.plantRed.blockID || item.itemID == Block.plantYellow.blockID) if (item.itemID == Blocks.flowers.get().blockID || item.itemID == Block.plantRed.blockID || item.itemID == Block.plantYellow.blockID)
{ {
@ -415,7 +415,7 @@ public class AchievementHelper
@ForgeSubscribe @ForgeSubscribe
public void chunkEntered(EntityEvent.EnteringChunk event) public void chunkEntered(EntityEvent.EnteringChunk event)
{ {
if (BOPConfiguration.achievements) if (BOPConfiguration.Misc.achievements)
{ {
if (event.entity != null) if (event.entity != null)
{ {

10
src/minecraft/biomesoplenty/helpers/Version.java
View file

@ -46,7 +46,7 @@ public class Version implements Runnable {
if (!isOutdated()) if (!isOutdated())
return false; return false;
//Property property = BOPConfiguration.config.get("Vars", "Seen Version", VERSION); //Property property = BOPConfiguration.Main.config.get("Vars", "Seen Version", VERSION);
//String seenVersion = property.getString(); //String seenVersion = property.getString();
//if (recommendedVersion == null || recommendedVersion.equals(seenVersion)) //if (recommendedVersion == null || recommendedVersion.equals(seenVersion))
@ -54,7 +54,7 @@ public class Version implements Runnable {
/*property.set(recommendedVersion); /*property.set(recommendedVersion);
BOPConfiguration.config.save();*/ BOPConfiguration.Main.config.save();*/
return true; return true;
} }
@ -64,7 +64,7 @@ public class Version implements Runnable {
WorldType terrainType = world.getWorldInfo().getTerrainType(); WorldType terrainType = world.getWorldInfo().getTerrainType();
WorldTypeBOP bopType = new WorldTypeBOP(); WorldTypeBOP bopType = new WorldTypeBOP();
Property property = BOPConfiguration.config.get("Vars", "Seen WorldType Msg", false); Property property = BOPConfiguration.Main.config.get("Vars", "Seen WorldType Msg", false);
String worldTypeProp = property.getString(); String worldTypeProp = property.getString();
if (terrainType == null || property.getBoolean(false) == true) if (terrainType == null || property.getBoolean(false) == true)
@ -74,13 +74,13 @@ public class Version implements Runnable {
{ {
property.set(true); property.set(true);
BOPConfiguration.config.save(); BOPConfiguration.Main.config.save();
return false; return false;
} }
property.set(true); property.set(true);
BOPConfiguration.config.save(); BOPConfiguration.Main.config.save();
return true; return true;
} }

368
src/minecraft/biomesoplenty/integration/ForestryIntegration.java
View file

@ -33,221 +33,221 @@ public class ForestryIntegration
private static void addClimateInfo() private static void addClimateInfo()
{ {
//Hell //Hell
EnumTemperature.hellishBiomeIds.add(BOPConfiguration.netherBaseID); EnumTemperature.hellishBiomeIds.add(BOPConfiguration.IDs.netherBaseID);
EnumTemperature.hellishBiomeIds.add(BOPConfiguration.netherBoneID); EnumTemperature.hellishBiomeIds.add(BOPConfiguration.IDs.netherBoneID);
EnumTemperature.hellishBiomeIds.add(BOPConfiguration.netherDesertID); EnumTemperature.hellishBiomeIds.add(BOPConfiguration.IDs.netherDesertID);
EnumTemperature.hellishBiomeIds.add(BOPConfiguration.netherGardenID); EnumTemperature.hellishBiomeIds.add(BOPConfiguration.IDs.netherGardenID);
EnumTemperature.hellishBiomeIds.add(BOPConfiguration.netherLavaID); EnumTemperature.hellishBiomeIds.add(BOPConfiguration.IDs.netherLavaID);
EnumHumidity.aridBiomeIds.add(BOPConfiguration.netherBaseID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.netherBaseID);
EnumHumidity.aridBiomeIds.add(BOPConfiguration.netherBoneID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.netherBoneID);
EnumHumidity.aridBiomeIds.add(BOPConfiguration.netherDesertID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.netherDesertID);
EnumHumidity.aridBiomeIds.add(BOPConfiguration.netherGardenID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.netherGardenID);
EnumHumidity.aridBiomeIds.add(BOPConfiguration.netherLavaID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.netherLavaID);
//Hot - Arid //Hot - Arid
//Desert Hives //Desert Hives
EnumTemperature.hotBiomeIds.add(BOPConfiguration.badlandsID); EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.badlandsID);
EnumTemperature.hotBiomeIds.add(BOPConfiguration.beachGravelID); EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.beachGravelID);
EnumTemperature.hotBiomeIds.add(BOPConfiguration.beachOvergrownID); EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.beachOvergrownID);
EnumTemperature.hotBiomeIds.add(BOPConfiguration.brushlandID); EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.brushlandID);
EnumTemperature.hotBiomeIds.add(BOPConfiguration.deadlandsID); EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.deadlandsID);
EnumTemperature.hotBiomeIds.add(BOPConfiguration.dunesID); EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.dunesID);
EnumTemperature.hotBiomeIds.add(BOPConfiguration.mesaID); EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.mesaID);
EnumTemperature.hotBiomeIds.add(BOPConfiguration.steppeID); EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.steppeID);
EnumTemperature.hotBiomeIds.add(BOPConfiguration.volcanoID); EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.volcanoID);
EnumTemperature.hotBiomeIds.add(BOPConfiguration.wastelandID); EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.wastelandID);
EnumTemperature.hotBiomeIds.add(BOPConfiguration.promisedLandPlainsID); EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.promisedLandPlainsID);
EnumTemperature.hotBiomeIds.add(BOPConfiguration.deadForestID); EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.deadForestID);
EnumTemperature.hotBiomeIds.add(BOPConfiguration.desertNewID); EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.desertNewID);
EnumHumidity.aridBiomeIds.add(BOPConfiguration.badlandsID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.badlandsID);
EnumHumidity.aridBiomeIds.add(BOPConfiguration.brushlandID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.brushlandID);
EnumHumidity.aridBiomeIds.add(BOPConfiguration.deadlandsID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.deadlandsID);
EnumHumidity.aridBiomeIds.add(BOPConfiguration.dunesID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.dunesID);
EnumHumidity.aridBiomeIds.add(BOPConfiguration.mesaID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.mesaID);
EnumHumidity.aridBiomeIds.add(BOPConfiguration.steppeID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.steppeID);
EnumHumidity.aridBiomeIds.add(BOPConfiguration.volcanoID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.volcanoID);
EnumHumidity.aridBiomeIds.add(BOPConfiguration.wastelandID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.wastelandID);
EnumHumidity.aridBiomeIds.add(BOPConfiguration.promisedLandPlainsID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.promisedLandPlainsID);
EnumHumidity.aridBiomeIds.add(BOPConfiguration.deadForestID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.deadForestID);
EnumHumidity.aridBiomeIds.add(BOPConfiguration.desertNewID); EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.desertNewID);
//Warm - Damp //Warm - Damp
//Jungle Hives //Jungle Hives
EnumTemperature.warmBiomeIds.add(BOPConfiguration.bambooForestID); EnumTemperature.warmBiomeIds.add(BOPConfiguration.IDs.bambooForestID);
EnumTemperature.warmBiomeIds.add(BOPConfiguration.hotSpringsID); EnumTemperature.warmBiomeIds.add(BOPConfiguration.IDs.hotSpringsID);
EnumTemperature.warmBiomeIds.add(BOPConfiguration.sacredSpringsID); EnumTemperature.warmBiomeIds.add(BOPConfiguration.IDs.sacredSpringsID);
EnumTemperature.warmBiomeIds.add(BOPConfiguration.tropicalRainforestID); EnumTemperature.warmBiomeIds.add(BOPConfiguration.IDs.tropicalRainforestID);
EnumTemperature.warmBiomeIds.add(BOPConfiguration.promisedLandSwampID); EnumTemperature.warmBiomeIds.add(BOPConfiguration.IDs.promisedLandSwampID);
EnumTemperature.warmBiomeIds.add(BOPConfiguration.oasisID); EnumTemperature.warmBiomeIds.add(BOPConfiguration.IDs.oasisID);
EnumTemperature.warmBiomeIds.add(BOPConfiguration.rainforestID); EnumTemperature.warmBiomeIds.add(BOPConfiguration.IDs.rainforestID);
EnumTemperature.warmBiomeIds.add(BOPConfiguration.tropicsID); EnumTemperature.warmBiomeIds.add(BOPConfiguration.IDs.tropicsID);
EnumTemperature.warmBiomeIds.add(BOPConfiguration.woodlandID); EnumTemperature.warmBiomeIds.add(BOPConfiguration.IDs.woodlandID);
EnumTemperature.warmBiomeIds.add(BOPConfiguration.jungleNewID); EnumTemperature.warmBiomeIds.add(BOPConfiguration.IDs.jungleNewID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.bambooForestID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.bambooForestID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.hotSpringsID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.hotSpringsID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.sacredSpringsID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.sacredSpringsID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.tropicalRainforestID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.tropicalRainforestID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.promisedLandSwampID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.promisedLandSwampID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.oasisID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.oasisID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.rainforestID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.rainforestID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.tropicsID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.tropicsID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.woodlandID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.woodlandID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.jungleNewID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.jungleNewID);
//Normal - Damp //Normal - Damp
//Marshy Hives //Marshy Hives
EnumTemperature.normalBiomeIds.add(BOPConfiguration.bayouID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.bayouID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.bogID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.bogID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.deadSwampID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.deadSwampID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.fungiForestID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.fungiForestID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.lushSwampID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.lushSwampID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.mangroveID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.mangroveID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.marshID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.marshID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.moorID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.moorID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.mysticGroveID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.mysticGroveID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.ominousWoodsID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.ominousWoodsID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.quagmireID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.quagmireID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.sludgepitID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.sludgepitID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.wetlandID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.wetlandID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.fenID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.fenID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.swamplandNewID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.swamplandNewID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.bayouID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.bayouID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.bogID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.bogID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.deadSwampID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.deadSwampID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.fungiForestID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.fungiForestID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.lushSwampID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.lushSwampID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.mangroveID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.mangroveID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.marshID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.marshID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.moorID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.moorID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.mysticGroveID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.mysticGroveID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.ominousWoodsID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.ominousWoodsID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.quagmireID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.quagmireID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.sludgepitID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.sludgepitID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.wetlandID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.wetlandID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.fenID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.fenID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.swamplandNewID); EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.swamplandNewID);
//Normal //Normal
//Forest and Meadows Hives //Forest and Meadows Hives
EnumTemperature.normalBiomeIds.add(BOPConfiguration.birchForestID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.birchForestID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.borealForestID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.borealForestID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.canyonID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.canyonID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.chaparralID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.chaparralID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.cherryBlossomGroveID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.cherryBlossomGroveID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.coniferousForestID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.coniferousForestID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.deciduousForestID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.deciduousForestID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.fieldID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.fieldID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.gardenID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.gardenID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.grasslandID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.grasslandID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.groveID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.groveID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.highlandID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.highlandID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.lushDesertID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.lushDesertID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.mapleWoodsID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.mapleWoodsID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.meadowID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.meadowID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.orchardID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.orchardID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.originValleyID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.originValleyID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.pastureID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.pastureID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.prairieID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.prairieID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.redwoodForestID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.redwoodForestID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.seasonalForestID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.seasonalForestID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.shieldID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.shieldID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.shoreID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.shoreID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.spruceWoodsID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.spruceWoodsID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.temperateRainforestID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.temperateRainforestID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.heathlandID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.heathlandID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.promisedLandForestID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.promisedLandForestID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.savannaID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.savannaID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.scrublandID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.scrublandID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.cragID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.cragID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.jadeCliffsID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.jadeCliffsID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.outbackID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.outbackID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.shrublandID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.shrublandID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.thicketID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.thicketID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.timberID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.timberID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.plainsNewID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.plainsNewID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.extremeHillsNewID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.extremeHillsNewID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.forestNewID); EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.forestNewID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.beachGravelID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.beachGravelID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.beachOvergrownID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.beachOvergrownID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.birchForestID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.birchForestID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.borealForestID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.borealForestID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.canyonID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.canyonID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.chaparralID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.chaparralID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.cherryBlossomGroveID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.cherryBlossomGroveID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.coniferousForestID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.coniferousForestID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.deciduousForestID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.deciduousForestID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.fieldID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.fieldID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.gardenID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.gardenID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.grasslandID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.grasslandID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.groveID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.groveID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.highlandID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.highlandID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.lushDesertID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.lushDesertID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.mapleWoodsID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.mapleWoodsID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.meadowID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.meadowID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.orchardID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.orchardID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.originValleyID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.originValleyID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.pastureID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.pastureID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.prairieID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.prairieID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.redwoodForestID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.redwoodForestID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.seasonalForestID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.seasonalForestID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.shieldID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.shieldID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.shoreID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.shoreID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.spruceWoodsID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.spruceWoodsID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.temperateRainforestID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.temperateRainforestID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.heathlandID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.heathlandID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.promisedLandForestID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.promisedLandForestID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.savannaID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.savannaID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.scrublandID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.scrublandID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.cragID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.cragID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.jadeCliffsID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.jadeCliffsID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.outbackID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.outbackID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.shrublandID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.shrublandID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.thicketID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.thicketID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.timberID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.timberID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.plainsNewID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.plainsNewID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.extremeHillsNewID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.extremeHillsNewID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.forestNewID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.forestNewID);
//Cold- Normal //Cold- Normal
//Wintry Bees //Wintry Bees
EnumTemperature.coldBiomeIds.add(BOPConfiguration.tundraID); EnumTemperature.coldBiomeIds.add(BOPConfiguration.IDs.tundraID);
EnumTemperature.coldBiomeIds.add(BOPConfiguration.arcticID); EnumTemperature.coldBiomeIds.add(BOPConfiguration.IDs.arcticID);
EnumTemperature.coldBiomeIds.add(BOPConfiguration.deadForestSnowID); EnumTemperature.coldBiomeIds.add(BOPConfiguration.IDs.deadForestSnowID);
EnumTemperature.coldBiomeIds.add(BOPConfiguration.mountainID); EnumTemperature.coldBiomeIds.add(BOPConfiguration.IDs.mountainID);
EnumTemperature.coldBiomeIds.add(BOPConfiguration.taigaNewID); EnumTemperature.coldBiomeIds.add(BOPConfiguration.IDs.taigaNewID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.arcticID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.arcticID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.tundraID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.tundraID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.deadForestSnowID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.deadForestSnowID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.mountainID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.mountainID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.taigaNewID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.taigaNewID);
//Icy - Normal //Icy - Normal
//Wintry Bees //Wintry Bees
EnumTemperature.icyBiomeIds.add(BOPConfiguration.alpsID); EnumTemperature.icyBiomeIds.add(BOPConfiguration.IDs.alpsID);
EnumTemperature.icyBiomeIds.add(BOPConfiguration.coniferousForestSnowID); EnumTemperature.icyBiomeIds.add(BOPConfiguration.IDs.coniferousForestSnowID);
EnumTemperature.icyBiomeIds.add(BOPConfiguration.frostForestID); EnumTemperature.icyBiomeIds.add(BOPConfiguration.IDs.frostForestID);
EnumTemperature.icyBiomeIds.add(BOPConfiguration.glacierID); EnumTemperature.icyBiomeIds.add(BOPConfiguration.IDs.glacierID);
EnumTemperature.icyBiomeIds.add(BOPConfiguration.icyHillsID); EnumTemperature.icyBiomeIds.add(BOPConfiguration.IDs.icyHillsID);
EnumTemperature.icyBiomeIds.add(BOPConfiguration.polarID); EnumTemperature.icyBiomeIds.add(BOPConfiguration.IDs.polarID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.alpsID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.alpsID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.coniferousForestSnowID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.coniferousForestSnowID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.frostForestID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.frostForestID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.glacierID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.glacierID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.icyHillsID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.icyHillsID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.polarID); EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.polarID);
} }
private static void addFermenterRecipes() private static void addFermenterRecipes()

2
src/minecraft/biomesoplenty/items/ItemBOPAncientStaff.java
View file

@ -93,7 +93,7 @@ public class ItemBOPAncientStaff extends Item
@Override @Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{ {
if (par3EntityPlayer.dimension == 0 || par3EntityPlayer.dimension == BOPConfiguration.promisedLandDimID) if (par3EntityPlayer.dimension == 0 || par3EntityPlayer.dimension == BOPConfiguration.IDs.promisedLandDimID)
{ {
int i = MathHelper.floor_double(par3EntityPlayer.posX - 8); int i = MathHelper.floor_double(par3EntityPlayer.posX - 8);
int j = 145; int j = 145;

2
src/minecraft/biomesoplenty/world/ChunkProviderBOP.java
View file

@ -247,7 +247,7 @@ public class ChunkProviderBOP implements IChunkProvider
} }
else if (k1 >= b0 - 4 && k1 <= b0 + 1) else if (k1 >= b0 - 4 && k1 <= b0 + 1)
{ {
if(biomegenbase.biomeID == BOPConfiguration.originValleyID) if(biomegenbase.biomeID == BOPConfiguration.IDs.originValleyID)
{ {
if(gravelbeach) if(gravelbeach)
{ {

2
src/minecraft/biomesoplenty/world/WorldProviderPromised.java
View file

@ -22,7 +22,7 @@ public class WorldProviderPromised extends WorldProvider
{ {
worldChunkMgr = new WorldChunkManagerPromised(worldObj); worldChunkMgr = new WorldChunkManagerPromised(worldObj);
} }
dimensionId = BOPConfiguration.promisedLandDimID; dimensionId = BOPConfiguration.IDs.promisedLandDimID;
} }
@Override @Override

176
src/minecraft/biomesoplenty/world/WorldTypeBOP.java
View file

@ -17,307 +17,307 @@ public class WorldTypeBOP extends WorldType
this.biomesForWorldType = super.getBiomesForWorldType(); this.biomesForWorldType = super.getBiomesForWorldType();
this.removeAllBiomes(); this.removeAllBiomes();
if (BOPConfiguration.alpsGen == true) if (BOPConfiguration.BiomeGen.alpsGen == true)
{ {
addNewBiome(Biomes.alps); addNewBiome(Biomes.alps);
} }
if (BOPConfiguration.arcticGen == true) if (BOPConfiguration.BiomeGen.arcticGen == true)
{ {
addNewBiome(Biomes.arctic); addNewBiome(Biomes.arctic);
} }
if (BOPConfiguration.badlandsGen == true) if (BOPConfiguration.BiomeGen.badlandsGen == true)
{ {
addNewBiome(Biomes.badlands); addNewBiome(Biomes.badlands);
} }
if (BOPConfiguration.bambooForestGen == true) if (BOPConfiguration.BiomeGen.bambooForestGen == true)
{ {
addNewBiome(Biomes.bambooForest); addNewBiome(Biomes.bambooForest);
} }
if (BOPConfiguration.bayouGen == true) if (BOPConfiguration.BiomeGen.bayouGen == true)
{ {
addNewBiome(Biomes.bayou); addNewBiome(Biomes.bayou);
} }
if (BOPConfiguration.birchForestGen == true) if (BOPConfiguration.BiomeGen.birchForestGen == true)
{ {
addNewBiome(Biomes.birchForest); addNewBiome(Biomes.birchForest);
} }
if (BOPConfiguration.bogGen == true) if (BOPConfiguration.BiomeGen.bogGen == true)
{ {
addNewBiome(Biomes.bog); addNewBiome(Biomes.bog);
} }
if (BOPConfiguration.borealForestGen == true) if (BOPConfiguration.BiomeGen.borealForestGen == true)
{ {
addNewBiome(Biomes.borealForest); addNewBiome(Biomes.borealForest);
} }
if (BOPConfiguration.brushlandGen == true) if (BOPConfiguration.BiomeGen.brushlandGen == true)
{ {
addNewBiome(Biomes.brushland); addNewBiome(Biomes.brushland);
} }
if (BOPConfiguration.canyonGen == true) if (BOPConfiguration.BiomeGen.canyonGen == true)
{ {
addNewBiome(Biomes.canyon); addNewBiome(Biomes.canyon);
} }
if (BOPConfiguration.chaparralGen == true) if (BOPConfiguration.BiomeGen.chaparralGen == true)
{ {
addNewBiome(Biomes.chaparral); addNewBiome(Biomes.chaparral);
} }
if (BOPConfiguration.cherryBlossomGroveGen == true) if (BOPConfiguration.BiomeGen.cherryBlossomGroveGen == true)
{ {
addNewBiome(Biomes.cherryBlossomGrove); addNewBiome(Biomes.cherryBlossomGrove);
} }
if (BOPConfiguration.coniferousForestGen == true) if (BOPConfiguration.BiomeGen.coniferousForestGen == true)
{ {
addNewBiome(Biomes.coniferousForest); addNewBiome(Biomes.coniferousForest);
} }
if (BOPConfiguration.coniferousForestSnowGen == true) if (BOPConfiguration.BiomeGen.coniferousForestSnowGen == true)
{ {
addNewBiome(Biomes.coniferousForestSnow); addNewBiome(Biomes.coniferousForestSnow);
} }
if (BOPConfiguration.cragGen == true) if (BOPConfiguration.BiomeGen.cragGen == true)
{ {
addNewBiome(Biomes.crag); addNewBiome(Biomes.crag);
} }
if (BOPConfiguration.deadForestGen == true) if (BOPConfiguration.BiomeGen.deadForestGen == true)
{ {
addNewBiome(Biomes.deadForest); addNewBiome(Biomes.deadForest);
} }
if (BOPConfiguration.deadForestSnowGen == true) if (BOPConfiguration.BiomeGen.deadForestSnowGen == true)
{ {
addNewBiome(Biomes.deadForestSnow); addNewBiome(Biomes.deadForestSnow);
} }
if (BOPConfiguration.deadSwampGen == true) if (BOPConfiguration.BiomeGen.deadSwampGen == true)
{ {
addNewBiome(Biomes.deadSwamp); addNewBiome(Biomes.deadSwamp);
} }
if (BOPConfiguration.deadlandsGen == true) if (BOPConfiguration.BiomeGen.deadlandsGen == true)
{ {
addNewBiome(Biomes.deadlands); addNewBiome(Biomes.deadlands);
} }
if (BOPConfiguration.deciduousForestGen == true) if (BOPConfiguration.BiomeGen.deciduousForestGen == true)
{ {
addNewBiome(Biomes.deciduousForest); addNewBiome(Biomes.deciduousForest);
} }
if (BOPConfiguration.dunesGen == true) if (BOPConfiguration.BiomeGen.dunesGen == true)
{ {
addNewBiome(Biomes.dunes); addNewBiome(Biomes.dunes);
} }
if (BOPConfiguration.fenGen == true) if (BOPConfiguration.BiomeGen.fenGen == true)
{ {
addNewBiome(Biomes.fen); addNewBiome(Biomes.fen);
} }
if (BOPConfiguration.fieldGen == true) if (BOPConfiguration.BiomeGen.fieldGen == true)
{ {
addNewBiome(Biomes.field); addNewBiome(Biomes.field);
} }
if (BOPConfiguration.frostForestGen == true) if (BOPConfiguration.BiomeGen.frostForestGen == true)
{ {
addNewBiome(Biomes.frostForest); addNewBiome(Biomes.frostForest);
} }
if (BOPConfiguration.fungiForestGen == true) if (BOPConfiguration.BiomeGen.fungiForestGen == true)
{ {
addNewBiome(Biomes.fungiForest); addNewBiome(Biomes.fungiForest);
} }
if (BOPConfiguration.gardenGen == true) if (BOPConfiguration.BiomeGen.gardenGen == true)
{ {
addNewBiome(Biomes.garden); addNewBiome(Biomes.garden);
} }
if (BOPConfiguration.glacierGen == true) if (BOPConfiguration.BiomeGen.glacierGen == true)
{ {
addNewBiome(Biomes.glacier); addNewBiome(Biomes.glacier);
} }
if (BOPConfiguration.grasslandGen == true) if (BOPConfiguration.BiomeGen.grasslandGen == true)
{ {
addNewBiome(Biomes.grassland); addNewBiome(Biomes.grassland);
} }
if (BOPConfiguration.groveGen == true) if (BOPConfiguration.BiomeGen.groveGen == true)
{ {
addNewBiome(Biomes.grove); addNewBiome(Biomes.grove);
} }
if (BOPConfiguration.heathlandGen == true) if (BOPConfiguration.BiomeGen.heathlandGen == true)
{ {
addNewBiome(Biomes.heathland); addNewBiome(Biomes.heathland);
} }
if (BOPConfiguration.highlandGen == true) if (BOPConfiguration.BiomeGen.highlandGen == true)
{ {
addNewBiome(Biomes.highland); addNewBiome(Biomes.highland);
} }
if (BOPConfiguration.hotSpringsGen == true) if (BOPConfiguration.BiomeGen.hotSpringsGen == true)
{ {
addNewBiome(Biomes.hotSprings); addNewBiome(Biomes.hotSprings);
} }
if (BOPConfiguration.icyHillsGen == true) if (BOPConfiguration.BiomeGen.icyHillsGen == true)
{ {
addNewBiome(Biomes.icyHills); addNewBiome(Biomes.icyHills);
} }
if (BOPConfiguration.jadeCliffsGen == true) if (BOPConfiguration.BiomeGen.jadeCliffsGen == true)
{ {
addNewBiome(Biomes.jadeCliffs); addNewBiome(Biomes.jadeCliffs);
} }
if (BOPConfiguration.lushDesertGen == true) if (BOPConfiguration.BiomeGen.lushDesertGen == true)
{ {
addNewBiome(Biomes.lushDesert); addNewBiome(Biomes.lushDesert);
} }
if (BOPConfiguration.lushSwampGen == true) if (BOPConfiguration.BiomeGen.lushSwampGen == true)
{ {
addNewBiome(Biomes.lushSwamp); addNewBiome(Biomes.lushSwamp);
} }
if (BOPConfiguration.mangroveGen == true) if (BOPConfiguration.BiomeGen.mangroveGen == true)
{ {
addNewBiome(Biomes.mangrove); addNewBiome(Biomes.mangrove);
} }
if (BOPConfiguration.mapleWoodsGen == true) if (BOPConfiguration.BiomeGen.mapleWoodsGen == true)
{ {
addNewBiome(Biomes.mapleWoods); addNewBiome(Biomes.mapleWoods);
} }
if (BOPConfiguration.marshGen == true) if (BOPConfiguration.BiomeGen.marshGen == true)
{ {
addNewBiome(Biomes.marsh); addNewBiome(Biomes.marsh);
} }
if (BOPConfiguration.meadowGen == true) if (BOPConfiguration.BiomeGen.meadowGen == true)
{ {
addNewBiome(Biomes.meadow); addNewBiome(Biomes.meadow);
} }
if (BOPConfiguration.mesaGen == true) if (BOPConfiguration.BiomeGen.mesaGen == true)
{ {
addNewBiome(Biomes.mesa); addNewBiome(Biomes.mesa);
} }
if (BOPConfiguration.moorGen == true) if (BOPConfiguration.BiomeGen.moorGen == true)
{ {
addNewBiome(Biomes.moor); addNewBiome(Biomes.moor);
} }
if (BOPConfiguration.mountainGen == true) if (BOPConfiguration.BiomeGen.mountainGen == true)
{ {
addNewBiome(Biomes.mountain); addNewBiome(Biomes.mountain);
} }
if (BOPConfiguration.mysticGroveGen == true) if (BOPConfiguration.BiomeGen.mysticGroveGen == true)
{ {
addNewBiome(Biomes.mysticGrove); addNewBiome(Biomes.mysticGrove);
} }
if (BOPConfiguration.oasisGen == true) if (BOPConfiguration.BiomeGen.oasisGen == true)
{ {
addNewBiome(Biomes.oasis); addNewBiome(Biomes.oasis);
} }
if (BOPConfiguration.ominousWoodsGen == true) if (BOPConfiguration.BiomeGen.ominousWoodsGen == true)
{ {
addNewBiome(Biomes.ominousWoods); addNewBiome(Biomes.ominousWoods);
} }
if (BOPConfiguration.orchardGen == true) if (BOPConfiguration.BiomeGen.orchardGen == true)
{ {
addNewBiome(Biomes.orchard); addNewBiome(Biomes.orchard);
} }
if (BOPConfiguration.originValleyGen == true) if (BOPConfiguration.BiomeGen.originValleyGen == true)
{ {
addNewBiome(Biomes.originValley); addNewBiome(Biomes.originValley);
} }
if (BOPConfiguration.outbackGen == true) if (BOPConfiguration.BiomeGen.outbackGen == true)
{ {
addNewBiome(Biomes.outback); addNewBiome(Biomes.outback);
} }
if (BOPConfiguration.pastureGen == true) if (BOPConfiguration.BiomeGen.pastureGen == true)
{ {
addNewBiome(Biomes.pasture); addNewBiome(Biomes.pasture);
} }
if (BOPConfiguration.polarGen == true) if (BOPConfiguration.BiomeGen.polarGen == true)
{ {
addNewBiome(Biomes.polar); addNewBiome(Biomes.polar);
} }
if (BOPConfiguration.prairieGen == true) if (BOPConfiguration.BiomeGen.prairieGen == true)
{ {
addNewBiome(Biomes.prairie); addNewBiome(Biomes.prairie);
} }
if (BOPConfiguration.quagmireGen == true) if (BOPConfiguration.BiomeGen.quagmireGen == true)
{ {
addNewBiome(Biomes.quagmire); addNewBiome(Biomes.quagmire);
} }
if (BOPConfiguration.rainforestGen == true) if (BOPConfiguration.BiomeGen.rainforestGen == true)
{ {
addNewBiome(Biomes.rainforest); addNewBiome(Biomes.rainforest);
} }
if (BOPConfiguration.redwoodForestGen == true) if (BOPConfiguration.BiomeGen.redwoodForestGen == true)
{ {
addNewBiome(Biomes.redwoodForest); addNewBiome(Biomes.redwoodForest);
} }
if (BOPConfiguration.sacredSpringsGen == true) if (BOPConfiguration.BiomeGen.sacredSpringsGen == true)
{ {
addNewBiome(Biomes.sacredSprings); addNewBiome(Biomes.sacredSprings);
} }
if (BOPConfiguration.savannaGen == true) if (BOPConfiguration.BiomeGen.savannaGen == true)
{ {
addNewBiome(Biomes.savanna); addNewBiome(Biomes.savanna);
} }
if (BOPConfiguration.scrublandGen == true) if (BOPConfiguration.BiomeGen.scrublandGen == true)
{ {
addNewBiome(Biomes.scrubland); addNewBiome(Biomes.scrubland);
} }
if (BOPConfiguration.seasonalForestGen == true) if (BOPConfiguration.BiomeGen.seasonalForestGen == true)
{ {
addNewBiome(Biomes.seasonalForest); addNewBiome(Biomes.seasonalForest);
} }
if (BOPConfiguration.shieldGen == true) if (BOPConfiguration.BiomeGen.shieldGen == true)
{ {
addNewBiome(Biomes.shield); addNewBiome(Biomes.shield);
} }
if (BOPConfiguration.shrublandGen == true) if (BOPConfiguration.BiomeGen.shrublandGen == true)
{ {
addNewBiome(Biomes.shrubland); addNewBiome(Biomes.shrubland);
} }
if (BOPConfiguration.sludgepitGen == true) if (BOPConfiguration.BiomeGen.sludgepitGen == true)
{ {
addNewBiome(Biomes.sludgepit); addNewBiome(Biomes.sludgepit);
} }
if (BOPConfiguration.spruceWoodsGen == true) if (BOPConfiguration.BiomeGen.spruceWoodsGen == true)
{ {
addNewBiome(Biomes.spruceWoods); addNewBiome(Biomes.spruceWoods);
} }
if (BOPConfiguration.steppeGen == true) if (BOPConfiguration.BiomeGen.steppeGen == true)
{ {
addNewBiome(Biomes.steppe); addNewBiome(Biomes.steppe);
} }
if (BOPConfiguration.temperateRainforestGen == true) if (BOPConfiguration.BiomeGen.temperateRainforestGen == true)
{ {
addNewBiome(Biomes.temperateRainforest); addNewBiome(Biomes.temperateRainforest);
} }
if (BOPConfiguration.thicketGen == true) if (BOPConfiguration.BiomeGen.thicketGen == true)
{ {
addNewBiome(Biomes.thicket); addNewBiome(Biomes.thicket);
} }
if (BOPConfiguration.timberGen == true) if (BOPConfiguration.BiomeGen.timberGen == true)
{ {
addNewBiome(Biomes.timber); addNewBiome(Biomes.timber);
} }
if (BOPConfiguration.tropicalRainforestGen == true) if (BOPConfiguration.BiomeGen.tropicalRainforestGen == true)
{ {
addNewBiome(Biomes.tropicalRainforest); addNewBiome(Biomes.tropicalRainforest);
} }
if (BOPConfiguration.tropicsGen == true) if (BOPConfiguration.BiomeGen.tropicsGen == true)
{ {
addNewBiome(Biomes.tropics); addNewBiome(Biomes.tropics);
} }
if (BOPConfiguration.tundraGen == true) if (BOPConfiguration.BiomeGen.tundraGen == true)
{ {
addNewBiome(Biomes.tundra); addNewBiome(Biomes.tundra);
} }
if (BOPConfiguration.volcanoGen == true) if (BOPConfiguration.BiomeGen.volcanoGen == true)
{ {
addNewBiome(Biomes.volcano); addNewBiome(Biomes.volcano);
} }
if (BOPConfiguration.wastelandGen == true) if (BOPConfiguration.BiomeGen.wastelandGen == true)
{ {
addNewBiome(Biomes.wasteland); addNewBiome(Biomes.wasteland);
} }
if (BOPConfiguration.wetlandGen == true) if (BOPConfiguration.BiomeGen.wetlandGen == true)
{ {
addNewBiome(Biomes.wetland); addNewBiome(Biomes.wetland);
} }
if (BOPConfiguration.woodlandGen == true) if (BOPConfiguration.BiomeGen.woodlandGen == true)
{ {
addNewBiome(Biomes.woodland); addNewBiome(Biomes.woodland);
} }
if (BOPConfiguration.plainsGen == true) if (BOPConfiguration.BiomeGen.plainsGen == true)
{ {
if (BOPConfiguration.vanillaEnhanced == true) if (BOPConfiguration.TerrainGen.vanillaEnhanced == true)
{ {
addNewBiome(Biomes.plainsNew); addNewBiome(Biomes.plainsNew);
} }
@ -326,9 +326,9 @@ public class WorldTypeBOP extends WorldType
this.addNewBiome(BiomeGenBase.plains); this.addNewBiome(BiomeGenBase.plains);
} }
} }
if (BOPConfiguration.desertGen == true) if (BOPConfiguration.BiomeGen.desertGen == true)
{ {
if (BOPConfiguration.vanillaEnhanced == true) if (BOPConfiguration.TerrainGen.vanillaEnhanced == true)
{ {
addNewBiome(Biomes.desertNew); addNewBiome(Biomes.desertNew);
} }
@ -337,9 +337,9 @@ public class WorldTypeBOP extends WorldType
this.addNewBiome(BiomeGenBase.desert); this.addNewBiome(BiomeGenBase.desert);
} }
} }
if (BOPConfiguration.extremeHillsGen == true) if (BOPConfiguration.BiomeGen.extremeHillsGen == true)
{ {
if (BOPConfiguration.vanillaEnhanced == true) if (BOPConfiguration.TerrainGen.vanillaEnhanced == true)
{ {
addNewBiome(Biomes.extremeHillsNew); addNewBiome(Biomes.extremeHillsNew);
} }
@ -348,9 +348,9 @@ public class WorldTypeBOP extends WorldType
this.addNewBiome(BiomeGenBase.extremeHills); this.addNewBiome(BiomeGenBase.extremeHills);
} }
} }
if (BOPConfiguration.forestGen == true) if (BOPConfiguration.BiomeGen.forestGen == true)
{ {
if (BOPConfiguration.vanillaEnhanced == true) if (BOPConfiguration.TerrainGen.vanillaEnhanced == true)
{ {
addNewBiome(Biomes.forestNew); addNewBiome(Biomes.forestNew);
} }
@ -359,9 +359,9 @@ public class WorldTypeBOP extends WorldType
this.addNewBiome(BiomeGenBase.forest); this.addNewBiome(BiomeGenBase.forest);
} }
} }
if (BOPConfiguration.taigaGen == true) if (BOPConfiguration.BiomeGen.taigaGen == true)
{ {
if (BOPConfiguration.vanillaEnhanced == true) if (BOPConfiguration.TerrainGen.vanillaEnhanced == true)
{ {
addNewBiome(Biomes.taigaNew); addNewBiome(Biomes.taigaNew);
} }
@ -370,9 +370,9 @@ public class WorldTypeBOP extends WorldType
this.addNewBiome(BiomeGenBase.taiga); this.addNewBiome(BiomeGenBase.taiga);
} }
} }
if (BOPConfiguration.swamplandGen == true) if (BOPConfiguration.BiomeGen.swamplandGen == true)
{ {
if (BOPConfiguration.vanillaEnhanced == true) if (BOPConfiguration.TerrainGen.vanillaEnhanced == true)
{ {
addNewBiome(Biomes.swamplandNew); addNewBiome(Biomes.swamplandNew);
} }
@ -381,9 +381,9 @@ public class WorldTypeBOP extends WorldType
this.addNewBiome(BiomeGenBase.swampland); this.addNewBiome(BiomeGenBase.swampland);
} }
} }
if (BOPConfiguration.jungleGen == true) if (BOPConfiguration.BiomeGen.jungleGen == true)
{ {
if (BOPConfiguration.vanillaEnhanced == true) if (BOPConfiguration.TerrainGen.vanillaEnhanced == true)
{ {
addNewBiome(Biomes.jungleNew); addNewBiome(Biomes.jungleNew);
} }

2
src/minecraft/biomesoplenty/world/WorldTypeSize.java
View file

@ -10,7 +10,7 @@ public class WorldTypeSize
public void BiomeSize(WorldTypeEvent.BiomeSize event) public void BiomeSize(WorldTypeEvent.BiomeSize event)
{ {
if (event.worldType.getWorldTypeName() == "BIOMESOP") { if (event.worldType.getWorldTypeName() == "BIOMESOP") {
event.newSize = (byte)BOPConfiguration.biomeSize; event.newSize = (byte)BOPConfiguration.TerrainGen.biomeSize;
} }
} }

8
src/minecraft/biomesoplenty/world/layer/BiomeLayerBiomes.java
View file

@ -44,28 +44,28 @@ public class BiomeLayerBiomes extends BiomeLayer
} }
if (Biomes.netherGarden.isPresent()) if (Biomes.netherGarden.isPresent())
{ {
if (BOPConfiguration.undergardenGen == true) if (BOPConfiguration.BiomeGen.undergardenGen == true)
{ {
netherBiomes.add(Biomes.netherGarden.get()); netherBiomes.add(Biomes.netherGarden.get());
} }
} }
if (Biomes.netherDesert.isPresent()) if (Biomes.netherDesert.isPresent())
{ {
if (BOPConfiguration.corruptedSandsGen == true) if (BOPConfiguration.BiomeGen.corruptedSandsGen == true)
{ {
netherBiomes.add(Biomes.netherDesert.get()); netherBiomes.add(Biomes.netherDesert.get());
} }
} }
if (Biomes.netherLava.isPresent()) if (Biomes.netherLava.isPresent())
{ {
if (BOPConfiguration.phantasmagoricInfernoGen == true) if (BOPConfiguration.BiomeGen.phantasmagoricInfernoGen == true)
{ {
netherBiomes.add(Biomes.netherLava.get()); netherBiomes.add(Biomes.netherLava.get());
} }
} }
if (Biomes.netherBone.isPresent()) if (Biomes.netherBone.isPresent())
{ {
if (BOPConfiguration.boneyardGen == true) if (BOPConfiguration.BiomeGen.boneyardGen == true)
{ {
netherBiomes.add(Biomes.netherBone.get()); netherBiomes.add(Biomes.netherBone.get());
} }

4
src/minecraft/biomesoplenty/world/layer/BiomeLayerCreate.java
View file

@ -1,7 +1,7 @@
package biomesoplenty.world.layer; package biomesoplenty.world.layer;
import biomesoplenty.configuration.BOPConfiguration;
import net.minecraft.world.gen.layer.IntCache; import net.minecraft.world.gen.layer.IntCache;
import biomesoplenty.configuration.BOPConfiguration;
public class BiomeLayerCreate extends BiomeLayer public class BiomeLayerCreate extends BiomeLayer
{ {
@ -15,7 +15,7 @@ public class BiomeLayerCreate extends BiomeLayer
{ {
int[] var5 = IntCache.getIntCache(par3 * par4); int[] var5 = IntCache.getIntCache(par3 * par4);
boolean ocean = BOPConfiguration.oceanGen; boolean ocean = BOPConfiguration.BiomeGen.oceanGen;
//boolean coral = Biomes.oceanCoral.isPresent(); //boolean coral = Biomes.oceanCoral.isPresent();
//boolean kelp = Biomes.oceanKelp.isPresent(); //boolean kelp = Biomes.oceanKelp.isPresent();

4
src/minecraft/biomesoplenty/world/layer/BiomeLayerShore.java
View file

@ -21,14 +21,14 @@ public class BiomeLayerShore extends BiomeLayer
beachBiomes.add(BiomeGenBase.beach); beachBiomes.add(BiomeGenBase.beach);
if (Biomes.beachGravel.isPresent()) if (Biomes.beachGravel.isPresent())
{ {
if (BOPConfiguration.gravelBeachGen == true) if (BOPConfiguration.BiomeGen.gravelBeachGen == true)
{ {
beachBiomes.add(Biomes.beachGravel.get()); beachBiomes.add(Biomes.beachGravel.get());
} }
} }
if (Biomes.beachOvergrown.isPresent()) if (Biomes.beachOvergrown.isPresent())
{ {
if (BOPConfiguration.overgrownBeachGen == true) if (BOPConfiguration.BiomeGen.overgrownBeachGen == true)
{ {
beachBiomes.add(Biomes.beachOvergrown.get()); beachBiomes.add(Biomes.beachOvergrown.get());
} }

1
src/minecraft/biomesoplenty/worldgen/WorldGenBOPShrub.java
View file

@ -1,6 +1,7 @@
package biomesoplenty.worldgen; package biomesoplenty.worldgen;
import java.util.Random; import java.util.Random;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;

4
src/minecraft/biomesoplenty/worldgen/structure/BOPMapGenVillage.java
View file

@ -27,8 +27,8 @@ public class BOPMapGenVillage extends MapGenStructure
public BOPMapGenVillage() public BOPMapGenVillage()
{ {
terrainType = 0; terrainType = 0;
maxDistance = BOPConfiguration.villageDistance; maxDistance = BOPConfiguration.TerrainGen.villageDistance;
minDistance = BOPConfiguration.villageDistance / 4; minDistance = BOPConfiguration.TerrainGen.villageDistance / 4;
villageSpawnBiomes = MapGenVillage.villageSpawnBiomes; villageSpawnBiomes = MapGenVillage.villageSpawnBiomes;
} }