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

Changed the Hedge block to Flax, an uncommon plant used to craft string

Browse source
This commit is contained in:
Matt Caughey 2014-08-01 01:16:58 -04:00
parent 8196dbe7de
commit 639025c398
35 changed files with 56 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/biomesoplenty/client/render/blocks/FoliageRenderer.java
View file

@ -13,7 +13,7 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
public class FoliageRenderer implements ISimpleBlockRenderingHandler
{
private final int HEDGETOP = 6;
private final int FLAXTOP = 6;
@Override
public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer)
@ -335,7 +335,7 @@ public class FoliageRenderer implements ISimpleBlockRenderingHandler
if (par1Block == BOPCBlocks.foliage)
{
long i1;
if (world.getBlockMetadata(par2, par3, par4) == HEDGETOP) {
if (world.getBlockMetadata(par2, par3, par4) == FLAXTOP) {
i1 = par2 * 3129871 ^ par4 * 116129781L ^ par3 - 1;
} else {
i1 = par2 * 3129871 ^ par4 * 116129781L ^ par3;
@ -353,9 +353,9 @@ public class FoliageRenderer implements ISimpleBlockRenderingHandler
renderer.drawCrossedSquares(par1Block.getIcon(0, world.getBlockMetadata(par2, par3, par4)), d0, d1 - 1, d2, 1.0F);
}
else if (world.getBlockMetadata(par2, par3, par4) == 3 && world.getBlock(par2, par3, par4) == BOPCBlocks.foliage)
else if (world.getBlockMetadata(par2, par3, par4) == 6 && world.getBlock(par2, par3, par4) == BOPCBlocks.foliage)
{
renderHedge(d0, d1, d2, 1.0F, f1, f2, f3, renderer);
renderFlax(d0, d1, d2, 1.0F, f1, f2, f3, renderer);
}
else if (world.getBlockMetadata(par2, par3, par4) == 8 && world.getBlock(par2, par3, par4) == BOPCBlocks.foliage)
@ -406,18 +406,18 @@ public class FoliageRenderer implements ISimpleBlockRenderingHandler
renderer.drawCrossedSquares(shrubBranch, par1, par2, par3, par4);
}
private static void renderHedge(double par1, double par2, double par3, float par4, float par5, float par6, float par7, RenderBlocks renderer)
private static void renderFlax(double par1, double par2, double par3, float par4, float par5, float par6, float par7, RenderBlocks renderer)
{
Tessellator tessellator = Tessellator.instance;
IIcon hedgeLeaf = renderer.getBlockIconFromSideAndMetadata(BOPCBlocks.foliage, 0, 3);
IIcon hedgeTrunk = ((BlockBOPFoliage)BOPCBlocks.foliage).hedgeTrunk;
IIcon flaxStem = renderer.getBlockIconFromSideAndMetadata(BOPCBlocks.foliage, 0, 6);
IIcon flaxFlowers = ((BlockBOPFoliage)BOPCBlocks.foliage).flaxFlowers;
tessellator.setColorOpaque_F(par4 * par5, par4 * par6, par4 * par7);
renderer.drawCrossedSquares(hedgeLeaf, par1, par2, par3, par4);
renderer.drawCrossedSquares(flaxStem, par1, par2, par3, par4);
tessellator.setColorOpaque_F(par4, par4, par4);
renderer.drawCrossedSquares(hedgeTrunk, par1, par2, par3, par4);
renderer.drawCrossedSquares(flaxFlowers, par1, par2, par3, par4);
}
}

1
src/main/java/biomesoplenty/common/biome/decoration/OverworldBiomeFeatures.java
View file

@ -70,6 +70,7 @@ public class OverworldBiomeFeatures extends BiomeFeaturesBase
@BiomeFeature public int redSandSplatterPerChunk = 0;
@BiomeFeature public int dirtSplatterPerChunk = 0;
@BiomeFeature public int sandstoneSpikesPerChunk = 0;
@BiomeFeature public int flaxPerChunk = 0;
//Ocean Features
@BiomeFeature public int seaweedPerChunk = 0;

1
src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPBirchForest.java
View file

@ -26,6 +26,7 @@ public class BiomeGenBOPBirchForest extends BOPInheritedOverworldBiome
this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 15;
this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 4;
this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 2;
this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1;
this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5;

1
src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPForest.java
View file

@ -24,6 +24,7 @@ public class BiomeGenBOPForest extends BOPInheritedOverworldBiome
this.theBiomeDecorator.bopFeatures.sproutsPerChunk = 1;
this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 1;
this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 2;
this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1;
this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5;
this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 2;

1
src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPPlains.java
View file

@ -15,6 +15,7 @@ public class BiomeGenBOPPlains extends BOPInheritedOverworldBiome
this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 8;
this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5;
this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1;
this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 0), 10);
this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 5);

1
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java
View file

@ -39,6 +39,7 @@ public class BiomeGenBorealForest extends BOPOverworldBiome
this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4;
this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 10;
this.theBiomeDecorator.bopFeatures.algaePerChunk = 2;
this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1;
this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 50;

1
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java
View file

@ -38,6 +38,7 @@ public class BiomeGenCherryBlossomGrove extends BOPOverworldBiome
this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 15;
this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
this.theBiomeDecorator.bopFeatures.algaePerChunk = 2;
this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1;
this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 15;

1
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java
View file

@ -51,6 +51,7 @@ public class BiomeGenConiferousForest extends BOPOverworldBiome
this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 8;
this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5;
this.theBiomeDecorator.bopFeatures.algaePerChunk = 2;
this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1;
this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 10;
this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 25;

1
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeciduousForest.java
View file

@ -39,6 +39,7 @@ public class BiomeGenDeciduousForest extends BOPOverworldBiome
this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10;
this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 10;
this.theBiomeDecorator.bopFeatures.algaePerChunk = 3;
this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1;
this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 10;

1
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java
View file

@ -47,6 +47,7 @@ public class BiomeGenGrassland extends BOPOverworldBiome
this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 5;
this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2;
this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1;
this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 2;

1
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java
View file

@ -42,6 +42,7 @@ public class BiomeGenMeadow extends BOPOverworldBiome
this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5;
this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
this.theBiomeDecorator.bopFeatures.algaePerChunk = 2;
this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1;
this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 10;

1
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java
View file

@ -44,6 +44,7 @@ public class BiomeGenMoor extends BOPOverworldBiome
this.theBiomeDecorator.bopFeatures.koruPerChunk = 6;
this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5;
this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1;
this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 15;

1
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java
View file

@ -35,6 +35,7 @@ public class BiomeGenMountain extends BOPOverworldBiome
this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10;
this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 10;
this.theBiomeDecorator.bopFeatures.algaePerChunk = 2;
this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1;
this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 8;

1
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java
View file

@ -38,6 +38,7 @@ public class BiomeGenPrairie extends BOPOverworldBiome
this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 3;
this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4;
this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 15;
this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1;
this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 999;

1
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java
View file

@ -39,6 +39,7 @@ public class BiomeGenSeasonalForest extends BOPOverworldBiome
this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 8;
this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 15;
this.theBiomeDecorator.bopFeatures.algaePerChunk = 3;
this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1;
this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 8;

1
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java
View file

@ -40,6 +40,7 @@ public class BiomeGenShield extends BOPOverworldBiome
this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5;
this.theBiomeDecorator.bopFeatures.algaePerChunk = 4;
this.theBiomeDecorator.bopFeatures.generateStoneInGrass2 = true;
this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1;
this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 12;

1
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java
View file

@ -40,6 +40,7 @@ public class BiomeGenShrubland extends BOPOverworldBiome
this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 1;
this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1;
this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 4);

1
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java
View file

@ -45,6 +45,7 @@ public class BiomeGenTemperateRainforest extends BOPOverworldBiome
this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 15;
this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 15;
this.theBiomeDecorator.bopFeatures.algaePerChunk = 5;
this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1;
this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 25;

1
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java
View file

@ -45,6 +45,7 @@ public class BiomeGenWetland extends BOPOverworldBiome
this.theBiomeDecorator.sandPerChunk = -999;
this.theBiomeDecorator.sandPerChunk2 = -999;
this.theBiomeDecorator.waterlilyPerChunk = 4;
this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1;
this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 1;
this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 15;

1
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java
View file

@ -37,6 +37,7 @@ public class BiomeGenWoodland extends BOPOverworldBiome
this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 10;
this.theBiomeDecorator.bopFeatures.logsPerChunk = 10;
this.theBiomeDecorator.bopFeatures.algaePerChunk = 3;
this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1;
this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 7;

1
src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenMeadowForest.java
View file

@ -42,6 +42,7 @@ public class BiomeGenMeadowForest extends BOPSubBiome
this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5;
this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
this.theBiomeDecorator.bopFeatures.algaePerChunk = 2;
this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1;
this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5;

1
src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenOrchard.java
View file

@ -40,6 +40,7 @@ public class BiomeGenOrchard extends BOPSubBiome
this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 10;
this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4;
this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 15;
this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1;
this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 20;
this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 15;

1
src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenSpruceWoods.java
View file

@ -44,6 +44,7 @@ public class BiomeGenSpruceWoods extends BOPSubBiome
this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 5;
this.theBiomeDecorator.bopFeatures.algaePerChunk = 2;
this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 2;
this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1;
this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 2;
this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5;

29
src/main/java/biomesoplenty/common/blocks/BlockBOPFoliage.java
View file

@ -36,15 +36,15 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockBOPFoliage extends BOPBlockWorldDecor implements IShearable
{
private static final String[] foliageTypes = new String[] {"duckweed", "shortgrass", "mediumgrass", "hedgebottom", "bush", "sprout", "hedgetop", "poisonivy", "berrybush", "shrub", "wheatgrass", "dampgrass", "koru", "cloverpatch", "leafpile", "deadleafpile"};
private static final String[] foliageTypes = new String[] {"duckweed", "shortgrass", "mediumgrass", "flaxbottom", "bush", "sprout", "flaxtop", "poisonivy", "berrybush", "shrub", "wheatgrass", "dampgrass", "koru", "cloverpatch", "leafpile", "deadleafpile"};
private IIcon[] textures;
public IIcon hedgeTrunk;
public IIcon flaxFlowers;
public IIcon shrubBranch;
public IIcon berryBushBerry;
private static final int HEDGETOP = 6;
private static final int HEDGEBOTTOM = 3;
private static final int FLAXTOP = 6;
private static final int FLAXBOTTOM = 3;
public BlockBOPFoliage()
{
@ -66,7 +66,7 @@ public class BlockBOPFoliage extends BOPBlockWorldDecor implements IShearable
textures[i] = iconRegister.registerIcon("biomesoplenty:"+foliageTypes[i]);
}
hedgeTrunk = iconRegister.registerIcon("biomesoplenty:" + "hedge_trunk");
flaxFlowers = iconRegister.registerIcon("biomesoplenty:" + "flax_flowers");
shrubBranch = iconRegister.registerIcon("biomesoplenty:" + "shrub_branch");
berryBushBerry = iconRegister.registerIcon("biomesoplenty:" + "berrybush_berry");
}
@ -86,7 +86,7 @@ public class BlockBOPFoliage extends BOPBlockWorldDecor implements IShearable
{
for (int i = 0; i < foliageTypes.length; ++i)
{
if (i != HEDGETOP)
if (i != FLAXTOP)
{
list.add(new ItemStack(block, 1, i));
}
@ -152,7 +152,7 @@ public class BlockBOPFoliage extends BOPBlockWorldDecor implements IShearable
switch (metadata)
{
case HEDGETOP:
case FLAXTOP:
return block == this;
case 0: //Duckweed
@ -197,11 +197,12 @@ public class BlockBOPFoliage extends BOPBlockWorldDecor implements IShearable
int metadata = world.getBlockMetadata(x, y, z);
if (world.getBlockMetadata(x, y, z) == HEDGEBOTTOM)
if (world.getBlockMetadata(x, y, z) == FLAXBOTTOM)
{
if (world.getBlock(x, y + 1, z) != this)
{
world.setBlock(x, y, z, Blocks.tallgrass, 1, 2);
this.dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
world.setBlockToAir(x, y, z);
}
else if (!this.isValidPosition(world, x, y, z, metadata))
{
@ -262,7 +263,7 @@ public class BlockBOPFoliage extends BOPBlockWorldDecor implements IShearable
@Override
public int colorMultiplier(IBlockAccess world, int x, int y, int z)
{
if (world.getBlockMetadata(x, y, z) == 3 || world.getBlockMetadata(x, y, z) == 6 || world.getBlockMetadata(x, y, z) == 9 || world.getBlockMetadata(x, y, z) == 14)
if (world.getBlockMetadata(x, y, z) == 9 || world.getBlockMetadata(x, y, z) == 14)
{
return world.getBiomeGenForCoords(x, z).getBiomeFoliageColor(x, y, z);
}
@ -279,9 +280,9 @@ public class BlockBOPFoliage extends BOPBlockWorldDecor implements IShearable
public int getDamageValue(World world, int x, int y, int z)
{
int meta = world.getBlockMetadata(x, y, z);
if (meta == HEDGETOP)
if (meta == FLAXTOP)
{
meta = HEDGEBOTTOM;
meta = FLAXBOTTOM;
}
return meta;
}
@ -366,9 +367,9 @@ public class BlockBOPFoliage extends BOPBlockWorldDecor implements IShearable
{
ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
if (world.getBlockMetadata(x, y, z) == HEDGETOP)
if (world.getBlockMetadata(x, y, z) == FLAXTOP)
{
ret.add(new ItemStack(Blocks.tallgrass, 1, 1));
ret.add(new ItemStack(BOPCBlocks.foliage, 1, 3));
}
else if (world.getBlockMetadata(x, y, z) == 8)
{

1
src/main/java/biomesoplenty/common/core/BOPCrafting.java
View file

@ -154,6 +154,7 @@ public class BOPCrafting
addRecipeToFront(new ItemStack(BOPCBlocks.mahoganyStairs, 4), new Object[] {" R", " RR", "RRR", 'R', new ItemStack(BOPCBlocks.planks, 1, 14)});
addRecipeToFront(new ItemStack(BOPCBlocks.mahoganyStairs, 4), new Object[] {"R ", "RR ", "RRR", 'R', new ItemStack(BOPCBlocks.planks, 1, 14)});
GameRegistry.addRecipe(new ItemStack(Items.string, 1, 0), new Object[] {"F", "F", "F", 'F', new ItemStack(BOPCBlocks.foliage, 1, 3)});
GameRegistry.addRecipe(new ItemStack(BOPCBlocks.overgrownNetherrack, 1, 0), new Object[] {"SSS", "SNS", "SSS", 'S', Items.wheat_seeds, 'N', Blocks.netherrack});
GameRegistry.addRecipe(new ItemStack(Blocks.wool, 1, 0), new Object[] {"CCC", "CCC", "CCC", 'C', new ItemStack(BOPCBlocks.plants, 1, 7)});
GameRegistry.addRecipe(new ItemStack(Items.coal, 1), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(BOPCItems.misc, 1, 1)});

12
src/main/java/biomesoplenty/common/itemblocks/ItemBlockFoliage.java
View file

@ -16,10 +16,10 @@ import cpw.mods.fml.relauncher.SideOnly;
public class ItemBlockFoliage extends ItemColored
{
private static final String[] foliageTypes = new String[] {"duckweed", "shortgrass", "mediumgrass", "hedgebottom", "bush", "sprout", "hedgetop", "poisonivy", "berrybush", "shrub", "wheatgrass", "dampgrass", "koru", "cloverpatch", "leafpile", "deadleafpile"};
private static final String[] foliageTypes = new String[] {"duckweed", "shortgrass", "mediumgrass", "flaxbottom", "bush", "sprout", "flaxtop", "poisonivy", "berrybush", "shrub", "wheatgrass", "dampgrass", "koru", "cloverpatch", "leafpile", "deadleafpile"};
@SideOnly(Side.CLIENT)
private IIcon[] textures;
private static final int HEDGETOP = 6;
private static final int FLAXTOP = 6;
public ItemBlockFoliage(Block block)
{
@ -39,7 +39,7 @@ public class ItemBlockFoliage extends ItemColored
textures[i] = iconRegister.registerIcon("biomesoplenty:" + foliageTypes[i]);
}
textures[3] = iconRegister.registerIcon("biomesoplenty:hedgetop");
textures[3] = iconRegister.registerIcon("biomesoplenty:item_flax");
textures[8] = iconRegister.registerIcon("biomesoplenty:item_berrybush");
textures[9] = iconRegister.registerIcon("biomesoplenty:item_shrub");
textures[15] = iconRegister.registerIcon("biomesoplenty:deadleafpile");
@ -49,7 +49,7 @@ public class ItemBlockFoliage extends ItemColored
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack itemStack, int par2)
{
if (itemStack.getItemDamage() == 8 || itemStack.getItemDamage() == 9 || itemStack.getItemDamage() == 15)
if (itemStack.getItemDamage() == 3 || itemStack.getItemDamage() == 8 || itemStack.getItemDamage() == 9 || itemStack.getItemDamage() == 15)
return 16777215;
else
//TODO: getRenderColor()
@ -76,7 +76,7 @@ public class ItemBlockFoliage extends ItemColored
@Override
public IIcon getIconFromDamage(int meta)
{
if (meta == HEDGETOP) {
if (meta == FLAXTOP) {
meta = 3;
}
@ -129,7 +129,7 @@ public class ItemBlockFoliage extends ItemColored
{
if (metadata == 3)
{
if (!placeBlockAt(stack, player, world, x, y + 1, z, side, hitX, hitY + 1, hitZ, HEDGETOP)) return false;
if (!placeBlockAt(stack, player, world, x, y + 1, z, side, hitX, hitY + 1, hitZ, FLAXTOP)) return false;
}
return super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata);

1
src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java
View file

@ -87,6 +87,7 @@ public class WorldGenFieldAssociation
associateFeature("blueMilksPerChunk", new WorldGenBOPFlora(BOPCBlocks.mushrooms, 2));
associateFeature("cattailsPerChunk", new WorldGenBOPFlora(BOPCBlocks.plants, 7));
associateFeature("highCattailsPerChunk", new WorldGenBOPDoubleFlora(BOPCBlocks.plants, BOPCBlocks.plants, 10, 9));
associateFeature("flaxPerChunk", new WorldGenBOPDoubleFlora(BOPCBlocks.foliage, BOPCBlocks.foliage, 3, 6, 24));
associateFeature("algaePerChunk", new WorldGenBOPFlora(BOPCBlocks.foliage, 0, 256));
associateFeature("sproutsPerChunk", new WorldGenBOPFlora(BOPCBlocks.foliage, 5));
associateFeature("tinyCactiPerChunk", new WorldGenBOPFlora(BOPCBlocks.plants, 12));

4
src/main/resources/assets/biomesoplenty/lang/en_US.lang
View file

@ -70,10 +70,10 @@ tile.stoneFormations.stalactite.name=Stalactite
tile.foliage.duckweed.name=Duckweed
tile.foliage.shortgrass.name=Short Grass
tile.foliage.mediumgrass.name=Medium Grass
tile.foliage.hedgebottom.name=Hedge
tile.foliage.flaxbottom.name=Flax
tile.foliage.bush.name=Bush
tile.foliage.sprout.name=Sprout
tile.foliage.hedgetop.name=Hedge
tile.foliage.flaxtop.name=Flax
tile.foliage.poisonivy.name=Poison Ivy
tile.foliage.berrybush.name=Berry Bush
tile.foliage.shrub.name=Shrub

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/flax_flowers.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 567 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/flaxbottom.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 596 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/flaxtop.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 524 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/hedge_trunk.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 584 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/hedgebottom.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 442 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/hedgetop.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 457 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/item_flax.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 592 B