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

Merged changes from Forstride, fixed a nullpointer from left-in acacia references with Ore Dictionary registration

This commit is contained in:
Adubbz 2014-03-18 20:44:49 +11:00
parent 00d3c2f50a
commit 081bd5150b
49 changed files with 265 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/biomesoplenty/client/render/blocks/FoliageRenderer.java
View File

@ -1,15 +1,15 @@
package biomesoplenty.client.render.blocks;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.client.render.RenderUtils;
import biomesoplenty.common.blocks.BlockBOPFoliage;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.EntityRenderer;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.client.render.RenderUtils;
import biomesoplenty.common.blocks.BlockBOPFoliage;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
public class FoliageRenderer implements ISimpleBlockRenderingHandler
{

2
src/main/java/biomesoplenty/common/biomes/BiomeGenBayou.java
View File

@ -50,6 +50,8 @@ public class BiomeGenBayou extends BOPBiome
this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4);
this.bopWorldFeatures.setFeature("koruPerChunk", 1);
this.bopWorldFeatures.setFeature("seaweedPerChunk", 15);
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 5);
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 10);
this.bopWorldFeatures.setFeature("generatePumpkins", false);
weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D);

2
src/main/java/biomesoplenty/common/biomes/BiomeGenBog.java
View File

@ -72,7 +72,7 @@ public class BiomeGenBog extends BOPBiome
if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone))
{
world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 6, 2);
world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 10, 2);
}
}

1
src/main/java/biomesoplenty/common/biomes/BiomeGenChaparral.java
View File

@ -41,6 +41,7 @@ public class BiomeGenChaparral extends BOPBiome
this.bopWorldFeatures.setFeature("shrubsPerChunk", 10);
this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2);
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10);
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5);
this.bopWorldFeatures.setFeature("generatePumpkins", false);
weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 8);

2
src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForest.java
View File

@ -43,6 +43,8 @@ public class BiomeGenConiferousForest extends BOPBiome
this.bopWorldFeatures.setFeature("shrubsPerChunk", 8);
this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2);
this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 10);
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 4);
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 8);
this.bopWorldFeatures.setFeature("seaweedPerChunk", 5);
weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D);

1
src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForestSnow.java
View File

@ -38,6 +38,7 @@ public class BiomeGenConiferousForestSnow extends BOPBiome
this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 3);
this.bopWorldFeatures.setFeature("shrubsPerChunk", 4);
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 8);
weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 8), 8);

9
src/main/java/biomesoplenty/common/biomes/BiomeGenFrostForest.java
View File

@ -19,11 +19,8 @@ public class BiomeGenFrostForest extends BOPBiome
public BiomeGenFrostForest(int id)
{
super(id);
//TODO: setHeight()
this.setHeight(biomeHeight);
//TODO: setColor()
this.setColor(11261628);
this.setTemperatureRainfall(0.0F, 0.5F);
this.setEnableSnow();
@ -35,6 +32,8 @@ public class BiomeGenFrostForest extends BOPBiome
this.bopWorldFeatures.setFeature("shrubsPerChunk", 1);
this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 3);
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 2);
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 4);
this.bopWorldFeatures.setFeature("generatePumpkins", false);
}
@ -81,14 +80,12 @@ public class BiomeGenFrostForest extends BOPBiome
}
@Override
//TODO: getBiomeGrassColor()
public int getBiomeGrassColor(int x, int y, int z)
{
return 11261628;
}
@Override
//TODO: getBiomeFoliageColor()
public int getBiomeFoliageColor(int x, int y, int z)
{
return 11261628;

3
src/main/java/biomesoplenty/common/biomes/BiomeGenGrove.java
View File

@ -37,6 +37,7 @@ public class BiomeGenGrove extends BOPBiome
this.bopWorldFeatures.setFeature("berryBushesPerChunk", 2);
this.bopWorldFeatures.setFeature("shrubsPerChunk", 3);
this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 20);
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 5);
this.bopWorldFeatures.setFeature("generatePumpkins", false);
weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 0), 16);
@ -80,12 +81,14 @@ public class BiomeGenGrove extends BOPBiome
}
@Override
//TODO: getBiomeGrassColor()
public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_)
{
return 5341009;
}
@Override
//TODO: getBiomeFoliageColor()
public int getBiomeFoliageColor(int x, int y, int z)
{
return 6396257;

1
src/main/java/biomesoplenty/common/biomes/BiomeGenHeathland.java
View File

@ -38,6 +38,7 @@ public class BiomeGenHeathland extends BOPBiome
this.bopWorldFeatures.setFeature("berryBushesPerChunk", 1);
this.bopWorldFeatures.setFeature("shrubsPerChunk", 5);
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10);
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5);
this.bopWorldFeatures.setFeature("generatePumpkins", false);
weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 7), 8);

2
src/main/java/biomesoplenty/common/biomes/BiomeGenJadeCliffs.java
View File

@ -31,6 +31,8 @@ public class BiomeGenJadeCliffs extends BOPBiome
this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 3);
this.bopWorldFeatures.setFeature("wildCarrotsPerChunk", 1);
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 4);
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 2);
weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 6);
}

4
src/main/java/biomesoplenty/common/biomes/BiomeGenLushDesert.java
View File

@ -46,6 +46,8 @@ public class BiomeGenLushDesert extends BOPBiome
this.bopWorldFeatures.setFeature("waterLakesPerChunk", 5);
this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4);
this.bopWorldFeatures.setFeature("bromeliadsPerChunk", 3);
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 2);
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 4);
this.bopWorldFeatures.setFeature("generateSand", true);
this.bopWorldFeatures.setFeature("generatePumpkins", false);
@ -79,12 +81,10 @@ public class BiomeGenLushDesert extends BOPBiome
int y = random.nextInt(28) + 4;
int z = chunkZ + random.nextInt(16);
//TODO: getBlock()
Block block = world.getBlock(x, y, z);
if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone))
{
//TODO: setBlock()
world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 2, 2);
}
}

10
src/main/java/biomesoplenty/common/biomes/BiomeGenMysticGrove.java
View File

@ -40,13 +40,15 @@ public class BiomeGenMysticGrove extends BOPBiome
this.theBiomeDecorator.sandPerChunk2 = -999;
this.theBiomeDecorator.flowersPerChunk = 8;
this.bopWorldFeatures.setFeature("generatePumpkins", 10);
this.bopWorldFeatures.setFeature("generatePumpkins", 1);
this.bopWorldFeatures.setFeature("generatePumpkins", 1);
this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 10);
this.bopWorldFeatures.setFeature("sproutsPerChunk", 1);
this.bopWorldFeatures.setFeature("blueMilksPerChunk", 1);
//TODO: FEATURE customBiomeDecorator.poisonWaterPerChunk = 1;
this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 10);
this.bopWorldFeatures.setFeature("shrubsPerChunk", 4);
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10);
this.bopWorldFeatures.setFeature("seaweedPerChunk", 5);
weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 6), 12);
weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 3), 10);
@ -69,7 +71,7 @@ public class BiomeGenMysticGrove extends BOPBiome
return random.nextInt(4) == 0 ? new WorldGenOriginalTree(BOPBlockHelper.get("logs2"), BOPBlockHelper.get("leaves1"), 1, 2, false, 5, 3, false) :
(random.nextInt(3) == 0 ? new WorldGenOriginalTree(BOPBlockHelper.get("logs4"), BOPBlockHelper.get("leaves4"), 2, 1) :
((random.nextInt(3) == 0 ? this.worldGeneratorBigTree :
((random.nextInt(8) == 0 ? new WorldGenBOPSwampTree(Blocks.log, Blocks.leaves, 0, 0, 8, 6, BOPBlockHelper.get("ivy"), -1) : this.worldGeneratorTrees)))));
((random.nextInt(5) == 0 ? new WorldGenBOPSwampTree(Blocks.log, Blocks.leaves, 0, 0, 8, 6, BOPBlockHelper.get("flowerVine"), -1) : this.worldGeneratorTrees)))));
}
@Override

2
src/main/java/biomesoplenty/common/biomes/BiomeGenOminousWoods.java
View File

@ -51,6 +51,8 @@ public class BiomeGenOminousWoods extends BOPBiome
this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 1);
this.bopWorldFeatures.setFeature("thornsPerChunk", 9);
this.bopWorldFeatures.setFeature("poisonIvyPerChunk", 3);
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 2);
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 4);
//TODO: FEATURE customBiomeDecorator.poisonWaterPerChunk = 15;
}

1
src/main/java/biomesoplenty/common/biomes/BiomeGenRedwoodForest.java
View File

@ -35,6 +35,7 @@ public class BiomeGenRedwoodForest extends BOPBiome
this.bopWorldFeatures.setFeature("shrubsPerChunk", 10);
this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2);
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 15);
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5);
this.bopWorldFeatures.setFeature("generatePumpkins", false);
weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 10);

4
src/main/java/biomesoplenty/common/biomes/BiomeGenSacredSprings.java
View File

@ -23,8 +23,7 @@ public class BiomeGenSacredSprings extends BOPBiome
public BiomeGenSacredSprings(int id)
{
super(id);
//TODO: setHeight()
this.setHeight(biomeHeight);
this.setColor(39259);
@ -35,6 +34,7 @@ public class BiomeGenSacredSprings extends BOPBiome
this.theBiomeDecorator.waterlilyPerChunk = 5;
this.bopWorldFeatures.setFeature("seaweedPerChunk", 15);
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10);
this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 2);

7
src/main/java/biomesoplenty/common/biomes/BiomeGenShield.java
View File

@ -19,10 +19,8 @@ public class BiomeGenShield extends BOPBiome
public BiomeGenShield(int id)
{
super(id);
//TODO: setHeight()
this.setHeight(biomeHeight);
//TODO: setColor()
this.setColor(6586168);
this.setTemperatureRainfall(0.5F, 0.8F);
@ -35,6 +33,7 @@ public class BiomeGenShield extends BOPBiome
this.bopWorldFeatures.setFeature("shrubsPerChunk", 4);
this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4);
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10);
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5);
this.bopWorldFeatures.setFeature("seaweedPerChunk", 5);
this.bopWorldFeatures.setFeature("generateStoneInGrass2", true);
@ -69,14 +68,12 @@ public class BiomeGenShield extends BOPBiome
}
@Override
//TODO: getBiomeGrassColor()
public int getBiomeGrassColor(int x, int y, int z)
{
return 6586168;
}
@Override
//TODO: getBiomeFoliageColor()
public int getBiomeFoliageColor(int x, int y, int z)
{
return 7902787;

5
src/main/java/biomesoplenty/common/biomes/BiomeGenSpruceWoods.java
View File

@ -18,8 +18,7 @@ public class BiomeGenSpruceWoods extends BOPBiome
public BiomeGenSpruceWoods(int id)
{
super(id);
//TODO: setColor()
this.setColor(6396257);
this.setTemperatureRainfall(0.6F, 0.7F);
@ -36,6 +35,8 @@ public class BiomeGenSpruceWoods extends BOPBiome
this.bopWorldFeatures.setFeature("wildCarrotsPerChunk", 1);
this.bopWorldFeatures.setFeature("shrubsPerChunk", 5);
this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2);
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 6);
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 3);
weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers2"), 5), 15);

10
src/main/java/biomesoplenty/common/biomes/BiomeGenThicket.java
View File

@ -17,8 +17,10 @@ public class BiomeGenThicket extends BOPBiome
public BiomeGenThicket(int id)
{
super(id);
//TODO: setHeight()
this.setHeight(biomeHeight);
//TODO: setColor()
this.setColor(7248193);
this.setTemperatureRainfall(0.6F, 0.2F);
@ -28,8 +30,8 @@ public class BiomeGenThicket extends BOPBiome
this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 5);
this.bopWorldFeatures.setFeature("thornsPerChunk", 55);
this.bopWorldFeatures.setFeature("shrubsPerChunk", 5);
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10);
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5);
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 5);
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 10);
weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 4);
}
@ -48,12 +50,14 @@ public class BiomeGenThicket extends BOPBiome
}
@Override
//TODO: getBiomeGrassColor()
public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_)
{
return 11049591;
}
@Override
//TODO: getBiomeFoliageColor()
public int getBiomeFoliageColor(int x, int y, int z)
{
return 10854765;

2
src/main/java/biomesoplenty/common/biomes/BiomeGenTundra.java
View File

@ -37,6 +37,8 @@ public class BiomeGenTundra extends BOPBiome
this.bopWorldFeatures.setFeature("shrubsPerChunk", 2);
this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2);
this.bopWorldFeatures.setFeature("rockpilesPerChunk", 25);
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 5);
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5);
weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 8), 4);

1
src/main/java/biomesoplenty/common/biomes/BiomeGenWasteland.java
View File

@ -38,6 +38,7 @@ public class BiomeGenWasteland extends BOPBiome
this.bopWorldFeatures.setFeature("wasteland2PerChunk", 1);
this.bopWorldFeatures.setFeature("wasteland3PerChunk", 1);
this.bopWorldFeatures.setFeature("wasteland4PerChunk", 1);
this.bopWorldFeatures.setFeature("wastelandRockPilesPerChunk", 1);
weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("plants"), 0), 1D);
}

1
src/main/java/biomesoplenty/common/biomes/BiomeGenWetland.java
View File

@ -59,6 +59,7 @@ public class BiomeGenWetland extends BOPBiome
this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 15);
this.bopWorldFeatures.setFeature("seaweedPerChunk", 15);
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10);
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5);
weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 1), 10);
weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 6);

18
src/main/java/biomesoplenty/common/blocks/BlockBOPFlower.java
View File

@ -1,8 +1,11 @@
package biomesoplenty.common.blocks;
import java.util.List;
import java.util.Random;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.client.render.RenderUtils;
import biomesoplenty.common.blocks.templates.BOPBlockWorldDecor;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
@ -20,12 +23,9 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.client.render.RenderUtils;
import biomesoplenty.common.blocks.templates.BOPBlockWorldDecor;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
import java.util.Random;
public class BlockBOPFlower extends BOPBlockWorldDecor
{

23
src/main/java/biomesoplenty/common/blocks/BlockBOPFoliage.java
View File

@ -1,12 +1,13 @@
package biomesoplenty.common.blocks;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.client.render.RenderUtils;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.BlockTallGrass;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
@ -20,22 +21,18 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.potion.PotionHelper;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.IIcon;
import net.minecraft.world.ColorizerFoliage;
import net.minecraft.world.ColorizerGrass;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.common.IShearable;
import net.minecraftforge.common.util.FakePlayer;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.client.render.RenderUtils;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
public class BlockBOPFoliage extends BlockTallGrass implements IShearable
{

19
src/main/java/biomesoplenty/common/blocks/BlockBOPLeaves.java
View File

@ -1,16 +1,15 @@
package biomesoplenty.common.blocks;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.api.BOPItemHelper;
import cpw.mods.fml.common.Loader;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLeavesBase;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
@ -18,12 +17,10 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.IShearable;
import net.minecraftforge.common.util.ForgeDirection;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.api.BOPItemHelper;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
public class BlockBOPLeaves extends BlockLeavesBase implements IShearable
{

4
src/main/java/biomesoplenty/common/blocks/BlockFlowerVine.java
View File

@ -1,14 +1,12 @@
package biomesoplenty.common.blocks;
import biomesoplenty.BiomesOPlenty;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.BlockVine;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.init.Blocks;
import net.minecraft.world.ColorizerFoliage;
import net.minecraft.world.IBlockAccess;
import biomesoplenty.BiomesOPlenty;
public class BlockFlowerVine extends BlockVine
{

3
src/main/java/biomesoplenty/common/blocks/BlockTreeMoss.java
View File

@ -1,13 +1,12 @@
package biomesoplenty.common.blocks;
import biomesoplenty.BiomesOPlenty;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.BlockVine;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.init.Blocks;
import net.minecraft.world.IBlockAccess;
import biomesoplenty.BiomesOPlenty;
public class BlockTreeMoss extends BlockVine
{

88
src/main/java/biomesoplenty/common/core/BOPBlocks.java
View File

@ -1,87 +1,19 @@
package biomesoplenty.common.core;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.blocks.*;
import biomesoplenty.common.blocks.BlockBOPColorizedLeaves.ColourizedLeafCategory;
import biomesoplenty.common.blocks.BlockBOPGeneric.BlockType;
import biomesoplenty.common.blocks.BlockBOPLeaves.LeafCategory;
import biomesoplenty.common.blocks.BlockBOPLog.LogCategory;
import biomesoplenty.common.blocks.BlockBOPSlab.SlabCategory;
import biomesoplenty.common.blocks.BlockBOPStairs.Category;
import biomesoplenty.common.itemblocks.*;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemBlock;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.blocks.BlockAsh;
import biomesoplenty.common.blocks.BlockBOPAppleLeaves;
import biomesoplenty.common.blocks.BlockBOPColorizedLeaves;
import biomesoplenty.common.blocks.BlockBOPColorizedLeaves.ColourizedLeafCategory;
import biomesoplenty.common.blocks.BlockBOPColorizedSapling;
import biomesoplenty.common.blocks.BlockBOPCoral;
import biomesoplenty.common.blocks.BlockBOPFlower;
import biomesoplenty.common.blocks.BlockBOPFlower2;
import biomesoplenty.common.blocks.BlockBOPFoliage;
import biomesoplenty.common.blocks.BlockBOPGems;
import biomesoplenty.common.blocks.BlockBOPGeneric;
import biomesoplenty.common.blocks.BlockBOPGeneric.BlockType;
import biomesoplenty.common.blocks.BlockBOPGrass;
import biomesoplenty.common.blocks.BlockBOPLeaves;
import biomesoplenty.common.blocks.BlockBOPLeaves.LeafCategory;
import biomesoplenty.common.blocks.BlockBOPLog;
import biomesoplenty.common.blocks.BlockBOPLog.LogCategory;
import biomesoplenty.common.blocks.BlockBOPMushroom;
import biomesoplenty.common.blocks.BlockBOPPersimmonLeaves;
import biomesoplenty.common.blocks.BlockBOPPetals;
import biomesoplenty.common.blocks.BlockBOPPlank;
import biomesoplenty.common.blocks.BlockBOPPlant;
import biomesoplenty.common.blocks.BlockBOPRedRock;
import biomesoplenty.common.blocks.BlockBOPSapling;
import biomesoplenty.common.blocks.BlockBOPSkystone;
import biomesoplenty.common.blocks.BlockBOPSlab;
import biomesoplenty.common.blocks.BlockBOPSlab.SlabCategory;
import biomesoplenty.common.blocks.BlockBOPStairs;
import biomesoplenty.common.blocks.BlockBOPStairs.Category;
import biomesoplenty.common.blocks.BlockBamboo;
import biomesoplenty.common.blocks.BlockBones;
import biomesoplenty.common.blocks.BlockCloud;
import biomesoplenty.common.blocks.BlockFlesh;
import biomesoplenty.common.blocks.BlockFlowerVine;
import biomesoplenty.common.blocks.BlockGrave;
import biomesoplenty.common.blocks.BlockHive;
import biomesoplenty.common.blocks.BlockHoney;
import biomesoplenty.common.blocks.BlockIvy;
import biomesoplenty.common.blocks.BlockLongGrass;
import biomesoplenty.common.blocks.BlockMoss;
import biomesoplenty.common.blocks.BlockMud;
import biomesoplenty.common.blocks.BlockOriginGrass;
import biomesoplenty.common.blocks.BlockOvergrownNetherrack;
import biomesoplenty.common.blocks.BlockPromisedPortal;
import biomesoplenty.common.blocks.BlockStoneFormations;
import biomesoplenty.common.blocks.BlockTreeMoss;
import biomesoplenty.common.blocks.BlockTurnip;
import biomesoplenty.common.blocks.BlockWillow;
import biomesoplenty.common.itemblocks.ItemBlockAppleLeaves;
import biomesoplenty.common.itemblocks.ItemBlockBamboo;
import biomesoplenty.common.itemblocks.ItemBlockBones;
import biomesoplenty.common.itemblocks.ItemBlockColorizedLeaves;
import biomesoplenty.common.itemblocks.ItemBlockColorizedSapling;
import biomesoplenty.common.itemblocks.ItemBlockCoral;
import biomesoplenty.common.itemblocks.ItemBlockFlower;
import biomesoplenty.common.itemblocks.ItemBlockFlower2;
import biomesoplenty.common.itemblocks.ItemBlockFoliage;
import biomesoplenty.common.itemblocks.ItemBlockGems;
import biomesoplenty.common.itemblocks.ItemBlockGrave;
import biomesoplenty.common.itemblocks.ItemBlockHive;
import biomesoplenty.common.itemblocks.ItemBlockIvy;
import biomesoplenty.common.itemblocks.ItemBlockLeaves;
import biomesoplenty.common.itemblocks.ItemBlockLog;
import biomesoplenty.common.itemblocks.ItemBlockMoss;
import biomesoplenty.common.itemblocks.ItemBlockMud;
import biomesoplenty.common.itemblocks.ItemBlockMushroom;
import biomesoplenty.common.itemblocks.ItemBlockPersimmonLeaves;
import biomesoplenty.common.itemblocks.ItemBlockPetals;
import biomesoplenty.common.itemblocks.ItemBlockPlank;
import biomesoplenty.common.itemblocks.ItemBlockPlant;
import biomesoplenty.common.itemblocks.ItemBlockRedRock;
import biomesoplenty.common.itemblocks.ItemBlockSapling;
import biomesoplenty.common.itemblocks.ItemBlockSkystone;
import biomesoplenty.common.itemblocks.ItemBlockSlab;
import biomesoplenty.common.itemblocks.ItemBlockStoneFormations;
import biomesoplenty.common.itemblocks.ItemBlockWillow;
import cpw.mods.fml.common.registry.GameRegistry;
public class BOPBlocks
{

28
src/main/java/biomesoplenty/common/core/BOPCrafting.java
View File

@ -1,9 +1,11 @@
package biomesoplenty.common.core;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.common.configuration.BOPConfigurationMisc;
import biomesoplenty.common.handlers.FurnaceFuelHandler;
import biomesoplenty.common.recipes.BiomeEssenceRecipe;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@ -13,12 +15,10 @@ import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.item.crafting.ShapedRecipes;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.oredict.ShapedOreRecipe;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.common.configuration.BOPConfigurationMisc;
import biomesoplenty.common.handlers.FurnaceFuelHandler;
import biomesoplenty.common.recipes.BiomeEssenceRecipe;
import cpw.mods.fml.common.registry.GameRegistry;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
public class BOPCrafting
{
@ -92,11 +92,11 @@ public class BOPCrafting
addRecipeToFront(new ItemStack(BOPBlockHelper.get("willowStairs"), 4), new Object[] {" R", " RR", "RRR", 'R', new ItemStack(BOPBlockHelper.get("planks"), 1, 9)});
addRecipeToFront(new ItemStack(BOPBlockHelper.get("willowStairs"), 4), new Object[] {"R ", "RR ", "RRR", 'R', new ItemStack(BOPBlockHelper.get("planks"), 1, 9)});
//Acacia
//Sacred Oak
GameRegistry.addShapelessRecipe(new ItemStack(BOPBlockHelper.get("planks"), 4, 0), new Object[] {new ItemStack(BOPBlockHelper.get("logs1"),1,0)});
addRecipeToFront(new ItemStack(BOPBlockHelper.get("woodenSingleSlab1"),6,0), new Object[] {"RRR", 'R', new ItemStack(BOPBlockHelper.get("planks"), 1, 0)});
addRecipeToFront(new ItemStack(BOPBlockHelper.get("acaciaStairs"), 4), new Object[] {" R", " RR", "RRR", 'R', new ItemStack(BOPBlockHelper.get("planks"), 1, 0)});
addRecipeToFront(new ItemStack(BOPBlockHelper.get("acaciaStairs"), 4), new Object[] {"R ", "RR ", "RRR", 'R', new ItemStack(BOPBlockHelper.get("planks"), 1, 0)});
addRecipeToFront(new ItemStack(BOPBlockHelper.get("sacredoakStairs"), 4), new Object[] {" R", " RR", "RRR", 'R', new ItemStack(BOPBlockHelper.get("planks"), 1, 0)});
addRecipeToFront(new ItemStack(BOPBlockHelper.get("sacredoakStairs"), 4), new Object[] {"R ", "RR ", "RRR", 'R', new ItemStack(BOPBlockHelper.get("planks"), 1, 0)});
//Fir
GameRegistry.addShapelessRecipe(new ItemStack(BOPBlockHelper.get("planks"), 4, 3), new Object[] {new ItemStack(BOPBlockHelper.get("logs1"),1,3)});
@ -376,7 +376,7 @@ public class BOPCrafting
OreDictionary.registerOre("stairWood", new ItemStack(BOPBlockHelper.get("redwoodStairs")));
OreDictionary.registerOre("stairWood", new ItemStack(BOPBlockHelper.get("willowStairs")));
OreDictionary.registerOre("stairWood", new ItemStack(BOPBlockHelper.get("acaciaStairs")));
OreDictionary.registerOre("stairWood", new ItemStack(BOPBlockHelper.get("sacredoakStairs")));
OreDictionary.registerOre("stairWood", new ItemStack(BOPBlockHelper.get("firStairs")));
OreDictionary.registerOre("stairWood", new ItemStack(BOPBlockHelper.get("cherryStairs")));
OreDictionary.registerOre("stairWood", new ItemStack(BOPBlockHelper.get("darkStairs")));

8
src/main/java/biomesoplenty/common/integration/TreecapitatorIntegration.java
View File

@ -1,10 +1,10 @@
package biomesoplenty.common.integration;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.api.BOPItemHelper;
import cpw.mods.fml.common.event.FMLInterModComms;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
public class TreecapitatorIntegration
{
@ -62,9 +62,9 @@ public class TreecapitatorIntegration
/*
* logs1 trees
*/
// BoP acacia
// BoP sacred oak
tree = new NBTTagCompound();
tree.setString("treeName", "acacia");
tree.setString("treeName", "sacredoak");
tree.setString("logs", String.format("%s,0; %s,4; %s,8", logs1, logs1, logs1));
tree.setString("leaves", String.format("%s,0; %s,8", leavesColorized1, leavesColorized1));
tree.setBoolean("requireLeafDecayCheck", false);

12
src/main/java/biomesoplenty/common/itemblocks/ItemBlockFlower.java
View File

@ -1,21 +1,19 @@
package biomesoplenty.common.itemblocks;
import java.util.Random;
import biomesoplenty.BiomesOPlenty;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.EnumAction;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import biomesoplenty.BiomesOPlenty;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.Random;
public class ItemBlockFlower extends ItemBlock
{

5
src/main/java/biomesoplenty/common/itemblocks/ItemBlockFoliage.java
View File

@ -1,19 +1,18 @@
package biomesoplenty.common.itemblocks;
import biomesoplenty.api.BOPBlockHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemColored;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.MovingObjectPosition.MovingObjectType;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class ItemBlockFoliage extends ItemColored
{

1
src/main/java/biomesoplenty/common/world/decoration/BOPWorldFeatures.java
View File

@ -73,6 +73,7 @@ public class BOPWorldFeatures
setFeature("wasteland2PerChunk", 0);
setFeature("wasteland3PerChunk", 0);
setFeature("wasteland4PerChunk", 0);
setFeature("wastelandRockPilesPerChunk", 0);
setFeature("bopFlowersPerChunk", 0);
}

6
src/main/java/biomesoplenty/common/world/features/trees/WorldGenBayou1.java
View File

@ -1,7 +1,6 @@
package biomesoplenty.common.world.features.trees;
import java.util.Random;
import biomesoplenty.api.BOPBlockHelper;
import net.minecraft.block.Block;
import net.minecraft.block.BlockSapling;
import net.minecraft.block.material.Material;
@ -9,7 +8,8 @@ import net.minecraft.init.Blocks;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenAbstractTree;
import net.minecraftforge.common.util.ForgeDirection;
import biomesoplenty.api.BOPBlockHelper;
import java.util.Random;
public class WorldGenBayou1 extends WorldGenAbstractTree
{

6
src/main/java/biomesoplenty/common/world/features/trees/WorldGenBayou2.java
View File

@ -1,7 +1,6 @@
package biomesoplenty.common.world.features.trees;
import java.util.Random;
import biomesoplenty.api.BOPBlockHelper;
import net.minecraft.block.Block;
import net.minecraft.block.BlockSapling;
import net.minecraft.block.material.Material;
@ -9,7 +8,8 @@ import net.minecraft.init.Blocks;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenAbstractTree;
import net.minecraftforge.common.util.ForgeDirection;
import biomesoplenty.api.BOPBlockHelper;
import java.util.Random;
public class WorldGenBayou2 extends WorldGenAbstractTree
{

13
src/main/java/biomesoplenty/common/world/forceddecorators/BirchForestForcedDecorator.java
View File

@ -3,6 +3,8 @@ package biomesoplenty.common.world.forceddecorators;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.world.decoration.ForcedDecorator;
import biomesoplenty.common.world.features.WorldGenBOPFlora;
import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
import net.minecraft.init.Blocks;
public class BirchForestForcedDecorator extends ForcedDecorator
{
@ -10,8 +12,15 @@ public class BirchForestForcedDecorator extends ForcedDecorator
{
this.bopWorldFeatures.setFeature("poisonIvyPerChunk", 3);
this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 15);
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 4);
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 2);
weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 0), 10);
weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 1), 15);
this.weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 0), 10);
this.weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 1), 15);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 1), 0.5D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.25D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.25D);
}
}

4
src/main/java/biomesoplenty/common/world/forceddecorators/DesertForcedDecorator.java
View File

@ -6,7 +6,7 @@ public class DesertForcedDecorator extends ForcedDecorator
{
public DesertForcedDecorator()
{
this.bopWorldFeatures.tinyCactiPerChunk = 10;
this.bopWorldFeatures.generateQuicksand = true;
this.bopWorldFeatures.setFeature("tinyCactiPerChunk", 10);
this.bopWorldFeatures.setFeature("generateQuicksand", true);
}
}

15
src/main/java/biomesoplenty/common/world/forceddecorators/ExtremeHillsForcedDecorator.java
View File

@ -1,11 +1,26 @@
package biomesoplenty.common.world.forceddecorators;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.world.decoration.ForcedDecorator;
import biomesoplenty.common.world.features.WorldGenBOPFlora;
import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
import net.minecraft.init.Blocks;
public class ExtremeHillsForcedDecorator extends ForcedDecorator
{
public ExtremeHillsForcedDecorator()
{
this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 3);
this.bopWorldFeatures.setFeature("shrubsPerChunk", 1);
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 3);
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 1);
this.weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 8), 8);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 2), 0.5D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D);
}
}

22
src/main/java/biomesoplenty/common/world/forceddecorators/ForestForcedDecorator.java
View File

@ -1,11 +1,33 @@
package biomesoplenty.common.world.forceddecorators;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.world.decoration.ForcedDecorator;
import biomesoplenty.common.world.features.WorldGenBOPFlora;
import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
import net.minecraft.init.Blocks;
public class ForestForcedDecorator extends ForcedDecorator
{
public ForestForcedDecorator()
{
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 15);
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5);
this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 5);
this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 5);
this.bopWorldFeatures.setFeature("riverCanePerChunk", 5);
this.bopWorldFeatures.setFeature("shrubsPerChunk", 2);
this.bopWorldFeatures.setFeature("waterReedsPerChunk", 6);
this.bopWorldFeatures.setFeature("poisonIvyPerChunk", 1);
this.bopWorldFeatures.setFeature("bushesPerChunk", 2);
this.bopWorldFeatures.setFeature("berryBushesPerChunk", 1);
this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 2);
this.weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 4), 8);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 1), 0.5D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 2), 0.5D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D);
}
}

6
src/main/java/biomesoplenty/common/world/forceddecorators/IcePlainsForcedDecorator.java
View File

@ -1,11 +1,15 @@
package biomesoplenty.common.world.forceddecorators;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.world.decoration.ForcedDecorator;
import biomesoplenty.common.world.features.WorldGenBOPFlora;
public class IcePlainsForcedDecorator extends ForcedDecorator
{
public IcePlainsForcedDecorator()
{
{
this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 1);
this.weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 8), 8);
}
}

16
src/main/java/biomesoplenty/common/world/forceddecorators/JungleForcedDecorator.java
View File

@ -1,11 +1,27 @@
package biomesoplenty.common.world.forceddecorators;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.world.decoration.ForcedDecorator;
import biomesoplenty.common.world.features.WorldGenBOPFlora;
import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
import net.minecraft.init.Blocks;
public class JungleForcedDecorator extends ForcedDecorator
{
public JungleForcedDecorator()
{
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10);
this.bopWorldFeatures.setFeature("generatePumpkins", 10);
this.bopWorldFeatures.setFeature("generatePumpkins", 15);
this.bopWorldFeatures.setFeature("generatePumpkins", 1);
this.weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 5), 12);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 1D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 1), 0.5D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 2), 0.5D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D);
}
}

7
src/main/java/biomesoplenty/common/world/forceddecorators/MesaForcedDecorator.java
View File

@ -1,11 +1,18 @@
package biomesoplenty.common.world.forceddecorators;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.world.decoration.ForcedDecorator;
import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
import net.minecraft.init.Blocks;
public class MesaForcedDecorator extends ForcedDecorator
{
public MesaForcedDecorator()
{
this.bopWorldFeatures.setFeature("tinyCactiPerChunk", 10);
this.bopWorldFeatures.setFeature("bromeliadsPerChunk", 10);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("plants"), 1), 1D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
}
}

6
src/main/java/biomesoplenty/common/world/forceddecorators/MushroomIslandForcedDecorator.java
View File

@ -6,8 +6,8 @@ public class MushroomIslandForcedDecorator extends ForcedDecorator
{
public MushroomIslandForcedDecorator()
{
this.bopWorldFeatures.blueMilksPerChunk = 2;
this.bopWorldFeatures.toadstoolsPerChunk = 8;
this.bopWorldFeatures.portobellosPerChunk = 6;
this.bopWorldFeatures.setFeature("blueMilksPerChunk", 2);
this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 8);
this.bopWorldFeatures.setFeature("portobellosPerChunk", 6);
}
}

2
src/main/java/biomesoplenty/common/world/forceddecorators/OceanForcedDecorator.java
View File

@ -6,6 +6,6 @@ public class OceanForcedDecorator extends ForcedDecorator
{
public OceanForcedDecorator()
{
this.bopWorldFeatures.seaweedPerChunk = 20;
this.bopWorldFeatures.setFeature("seaweedPerChunk", 20);
}
}

14
src/main/java/biomesoplenty/common/world/forceddecorators/PlainsForcedDecorator.java
View File

@ -1,11 +1,25 @@
package biomesoplenty.common.world.forceddecorators;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.world.decoration.ForcedDecorator;
import biomesoplenty.common.world.features.WorldGenBOPFlora;
import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
import net.minecraft.init.Blocks;
public class PlainsForcedDecorator extends ForcedDecorator
{
public PlainsForcedDecorator()
{
this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 8);
this.bopWorldFeatures.setFeature("wildCarrotsPerChunk", 1);
this.weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 0), 10);
this.weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 9), 5);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 1), 0.5D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 2), 0.5D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D);
}
}

14
src/main/java/biomesoplenty/common/world/forceddecorators/RoofedForestForcedDecorator.java
View File

@ -1,11 +1,25 @@
package biomesoplenty.common.world.forceddecorators;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.world.decoration.ForcedDecorator;
import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
import net.minecraft.init.Blocks;
public class RoofedForestForcedDecorator extends ForcedDecorator
{
public RoofedForestForcedDecorator()
{
this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 1);
this.bopWorldFeatures.setFeature("blueMilksPerChunk", 1);
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 8);
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 4);
this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 1), 0.5D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 2), 0.5D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.25D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.25D);
}
}

15
src/main/java/biomesoplenty/common/world/forceddecorators/SavannaForcedDecorator.java
View File

@ -1,11 +1,26 @@
package biomesoplenty.common.world.forceddecorators;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.world.decoration.ForcedDecorator;
import biomesoplenty.common.world.features.WorldGenBOPFlora;
import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
import net.minecraft.init.Blocks;
public class SavannaForcedDecorator extends ForcedDecorator
{
public SavannaForcedDecorator()
{
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10);
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5);
this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 10);
this.bopWorldFeatures.setFeature("bushesPerChunk", 3);
this.bopWorldFeatures.setFeature("waterReedsPerChunk", 5);
weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 7), 8);
weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 2), 0.5D);
weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D);
weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D);
}
}

10
src/main/java/biomesoplenty/common/world/forceddecorators/SwampForcedDecorator.java
View File

@ -3,6 +3,8 @@ package biomesoplenty.common.world.forceddecorators;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.world.decoration.ForcedDecorator;
import biomesoplenty.common.world.features.WorldGenBOPFlora;
import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
import net.minecraft.init.Blocks;
public class SwampForcedDecorator extends ForcedDecorator
{
@ -16,7 +18,15 @@ public class SwampForcedDecorator extends ForcedDecorator
this.bopWorldFeatures.setFeature("waterReedsPerChunk", 5);
this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 1);
this.bopWorldFeatures.setFeature("blueMilksPerChunk", 1);
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 2);
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 4);
this.weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 1), 15);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 1), 0.5D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 2), 0.5D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D);
this.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D);
}
}

6
src/main/java/biomesoplenty/common/world/forceddecorators/TaigaForcedDecorator.java
View File

@ -1,11 +1,17 @@
package biomesoplenty.common.world.forceddecorators;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.world.decoration.ForcedDecorator;
import biomesoplenty.common.world.features.WorldGenBOPFlora;
public class TaigaForcedDecorator extends ForcedDecorator
{
public TaigaForcedDecorator()
{
this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 2);
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 2);
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 4);
weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 8), 8);
}
}

10
src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java
View File

@ -6,10 +6,7 @@ import biomesoplenty.common.world.forcedgenerators.LakesForcedGenerator;
import biomesoplenty.common.world.forcedgenerators.MelonForcedGenerator;
import biomesoplenty.common.world.forcedgenerators.PondForcedGenerator;
import net.minecraft.init.Blocks;
import net.minecraft.world.gen.feature.WorldGenLakes;
import net.minecraft.world.gen.feature.WorldGenLiquids;
import net.minecraft.world.gen.feature.WorldGenMelon;
import net.minecraft.world.gen.feature.WorldGenerator;
import net.minecraft.world.gen.feature.*;
import java.util.HashMap;
@ -65,7 +62,8 @@ public class WorldGenFieldAssociation
associateFeature("minersDelightPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("flowers2"), 6));
associateFeature("rootsPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("plants"), 15));
associateFeature("grassSplatterPerChunk", new WorldGenGrassSplatter());
associateFeature("rockpilesPerChunk", new WorldGenRockpile());
associateFeature("rockpilesPerChunk", new WorldGenBlockBlob(Blocks.stone, 0));
associateFeature("wastelandRockPilesPerChunk", new WorldGenBlockBlob(BOPBlockHelper.get("driedDirt"), 0));
associateFeature("logsPerChunk", new WorldGenLog());
associateFeature("lavaSpoutsPerChunk", new WorldGenLavaSpout());
associateFeature("cobwebsPerChunk", new WorldGenBOPFlora(Blocks.web, 0));
@ -143,4 +141,4 @@ public class WorldGenFieldAssociation
return null;
}
}
}
}