Renamed Algae to Duckweed, renamed Seaweed to Algae, changed a few textures, and other minor changes.
This commit is contained in:
parent
5eac042a59
commit
27a026f155
18 changed files with 41 additions and 14 deletions
|
@ -37,7 +37,7 @@ public class BiomeGenBog extends BOPBiome
|
||||||
|
|
||||||
this.bopWorldFeatures.setFeature("bushesPerChunk", 6);
|
this.bopWorldFeatures.setFeature("bushesPerChunk", 6);
|
||||||
this.bopWorldFeatures.setFeature("mudPerChunk", 2);
|
this.bopWorldFeatures.setFeature("mudPerChunk", 2);
|
||||||
this.bopWorldFeatures.setFeature("algaePerChunk", 2);
|
this.bopWorldFeatures.setFeature("algaePerChunk", 3);
|
||||||
this.bopWorldFeatures.setFeature("riverCanePerChunk", 8);
|
this.bopWorldFeatures.setFeature("riverCanePerChunk", 8);
|
||||||
this.bopWorldFeatures.setFeature("blueMilksPerChunk", 1);
|
this.bopWorldFeatures.setFeature("blueMilksPerChunk", 1);
|
||||||
this.bopWorldFeatures.setFeature("waterLakesPerChunk", 6);
|
this.bopWorldFeatures.setFeature("waterLakesPerChunk", 6);
|
||||||
|
|
|
@ -44,7 +44,7 @@ public class BiomeGenFen extends BOPBiome
|
||||||
this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 2);
|
this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 2);
|
||||||
this.bopWorldFeatures.setFeature("mudPerChunk", 1);
|
this.bopWorldFeatures.setFeature("mudPerChunk", 1);
|
||||||
this.bopWorldFeatures.setFeature("riverCanePerChunk", 5);
|
this.bopWorldFeatures.setFeature("riverCanePerChunk", 5);
|
||||||
this.bopWorldFeatures.setFeature("algaePerChunk", 1);
|
this.bopWorldFeatures.setFeature("algaePerChunk", 3);
|
||||||
this.bopWorldFeatures.setFeature("portobellosPerChunk", 1);
|
this.bopWorldFeatures.setFeature("portobellosPerChunk", 1);
|
||||||
this.bopWorldFeatures.setFeature("waterReedsPerChunk", 10);
|
this.bopWorldFeatures.setFeature("waterReedsPerChunk", 10);
|
||||||
this.bopWorldFeatures.setFeature("koruPerChunk", 1);
|
this.bopWorldFeatures.setFeature("koruPerChunk", 1);
|
||||||
|
|
|
@ -36,6 +36,7 @@ public class BiomeGenLushSwamp extends BOPBiome
|
||||||
this.bopWorldFeatures.setFeature("cattailsPerChunk", 10);
|
this.bopWorldFeatures.setFeature("cattailsPerChunk", 10);
|
||||||
this.bopWorldFeatures.setFeature("highCattailsPerChunk", 5);
|
this.bopWorldFeatures.setFeature("highCattailsPerChunk", 5);
|
||||||
this.bopWorldFeatures.setFeature("riverCanePerChunk", 5);
|
this.bopWorldFeatures.setFeature("riverCanePerChunk", 5);
|
||||||
|
this.bopWorldFeatures.setFeature("algaePerChunk", 1);
|
||||||
//TODO: FEATURE this.bopWorldFeatures.poisonWaterPerChunk = 2;
|
//TODO: FEATURE this.bopWorldFeatures.poisonWaterPerChunk = 2;
|
||||||
this.bopWorldFeatures.setFeature("wildCarrotsPerChunk", 1);
|
this.bopWorldFeatures.setFeature("wildCarrotsPerChunk", 1);
|
||||||
this.bopWorldFeatures.setFeature("shrubsPerChunk", 5);
|
this.bopWorldFeatures.setFeature("shrubsPerChunk", 5);
|
||||||
|
|
|
@ -41,6 +41,7 @@ public class BiomeGenMarsh extends BOPBiome
|
||||||
this.bopWorldFeatures.setFeature("waterLakesPerChunk", 100);
|
this.bopWorldFeatures.setFeature("waterLakesPerChunk", 100);
|
||||||
this.bopWorldFeatures.setFeature("waterReedsPerChunk", 10);
|
this.bopWorldFeatures.setFeature("waterReedsPerChunk", 10);
|
||||||
this.bopWorldFeatures.setFeature("seaweedPerChunk", 15);
|
this.bopWorldFeatures.setFeature("seaweedPerChunk", 15);
|
||||||
|
this.bopWorldFeatures.setFeature("algaePerChunk", 1);
|
||||||
this.bopWorldFeatures.setFeature("generatePumpkins", false);
|
this.bopWorldFeatures.setFeature("generatePumpkins", false);
|
||||||
|
|
||||||
this.bopWorldFeatures.setFeature("bopGrassPerChunk", 50);
|
this.bopWorldFeatures.setFeature("bopGrassPerChunk", 50);
|
||||||
|
|
|
@ -39,6 +39,7 @@ public class BiomeGenQuagmire extends BOPBiome
|
||||||
this.theBiomeDecorator.flowersPerChunk = -999;
|
this.theBiomeDecorator.flowersPerChunk = -999;
|
||||||
this.theBiomeDecorator.sandPerChunk = -999;
|
this.theBiomeDecorator.sandPerChunk = -999;
|
||||||
this.theBiomeDecorator.sandPerChunk2 = -999;
|
this.theBiomeDecorator.sandPerChunk2 = -999;
|
||||||
|
this.bopWorldFeatures.setFeature("algaePerChunk", 1);
|
||||||
|
|
||||||
this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2);
|
this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2);
|
||||||
this.bopWorldFeatures.setFeature("koruPerChunk", 1);
|
this.bopWorldFeatures.setFeature("koruPerChunk", 1);
|
||||||
|
|
|
@ -61,6 +61,7 @@ public class BiomeGenWetland extends BOPBiome
|
||||||
this.bopWorldFeatures.setFeature("seaweedPerChunk", 15);
|
this.bopWorldFeatures.setFeature("seaweedPerChunk", 15);
|
||||||
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10);
|
this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10);
|
||||||
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5);
|
this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5);
|
||||||
|
this.bopWorldFeatures.setFeature("algaePerChunk", 5);
|
||||||
|
|
||||||
this.bopWorldFeatures.setFeature("bopGrassPerChunk", 10);
|
this.bopWorldFeatures.setFeature("bopGrassPerChunk", 10);
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
public class BlockBOPCoral extends BOPBlockWorldDecor
|
public class BlockBOPCoral extends BOPBlockWorldDecor
|
||||||
{
|
{
|
||||||
private static final String[] coral = new String[] {"kelpbottom", "kelpmiddle", "kelptop", "kelpsingle", "pinkcoral", "orangecoral", "bluecoral", "glowcoral", "seaweed"};
|
private static final String[] coral = new String[] {"kelpbottom", "kelpmiddle", "kelptop", "kelpsingle", "pinkcoral", "orangecoral", "bluecoral", "glowcoral", "algae"};
|
||||||
private IIcon[] textures;
|
private IIcon[] textures;
|
||||||
|
|
||||||
public BlockBOPCoral()
|
public BlockBOPCoral()
|
||||||
|
|
|
@ -36,7 +36,7 @@ import java.util.Random;
|
||||||
|
|
||||||
public class BlockBOPFoliage extends BlockTallGrass implements IShearable
|
public class BlockBOPFoliage extends BlockTallGrass implements IShearable
|
||||||
{
|
{
|
||||||
private static final String[] foliageTypes = new String[] {"algae", "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", "hedgebottom", "bush", "sprout", "hedgetop", "poisonivy", "berrybush", "shrub", "wheatgrass", "dampgrass", "koru", "cloverpatch", "leafpile", "deadleafpile"};
|
||||||
|
|
||||||
private IIcon[] textures;
|
private IIcon[] textures;
|
||||||
public IIcon hedgeTrunk;
|
public IIcon hedgeTrunk;
|
||||||
|
@ -44,7 +44,7 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable
|
||||||
public IIcon berryBushBerry;
|
public IIcon berryBushBerry;
|
||||||
|
|
||||||
private static final int HEDGETOP = 6;
|
private static final int HEDGETOP = 6;
|
||||||
private static final int ALGAE = 0;
|
private static final int DUCKWEED = 0;
|
||||||
private static final int HEDGEBOTTOM = 3;
|
private static final int HEDGEBOTTOM = 3;
|
||||||
|
|
||||||
public BlockBOPFoliage()
|
public BlockBOPFoliage()
|
||||||
|
@ -162,7 +162,7 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable
|
||||||
case HEDGETOP:
|
case HEDGETOP:
|
||||||
return block == this;
|
return block == this;
|
||||||
|
|
||||||
case ALGAE: // Algae
|
case DUCKWEED: // Algae
|
||||||
return block == Blocks.water;
|
return block == Blocks.water;
|
||||||
|
|
||||||
case 14: // Leaf Pile
|
case 14: // Leaf Pile
|
||||||
|
@ -355,7 +355,7 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable
|
||||||
|
|
||||||
switch (meta)
|
switch (meta)
|
||||||
{
|
{
|
||||||
case ALGAE:
|
case DUCKWEED:
|
||||||
return AxisAlignedBB.getBoundingBox(x, y, z, x + 1.0D, y + 0.015625D, z + 1.0D);
|
return AxisAlignedBB.getBoundingBox(x, y, z, x + 1.0D, y + 0.015625D, z + 1.0D);
|
||||||
|
|
||||||
case 1: // Short Grass
|
case 1: // Short Grass
|
||||||
|
@ -393,7 +393,7 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable
|
||||||
|
|
||||||
switch (meta)
|
switch (meta)
|
||||||
{
|
{
|
||||||
case ALGAE:
|
case DUCKWEED:
|
||||||
minX = minY = minZ = 0F;
|
minX = minY = minZ = 0F;
|
||||||
maxX = maxZ = 1.0F;
|
maxX = maxZ = 1.0F;
|
||||||
maxY = 0.015625F;
|
maxY = 0.015625F;
|
||||||
|
|
|
@ -13,6 +13,7 @@ import net.minecraft.world.ColorizerFoliage;
|
||||||
import net.minecraft.world.IBlockAccess;
|
import net.minecraft.world.IBlockAccess;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import biomesoplenty.BiomesOPlenty;
|
import biomesoplenty.BiomesOPlenty;
|
||||||
|
import biomesoplenty.api.BOPBlockHelper;
|
||||||
|
|
||||||
public class BlockMoss extends BlockVine
|
public class BlockMoss extends BlockVine
|
||||||
{
|
{
|
||||||
|
@ -38,4 +39,25 @@ public class BlockMoss extends BlockVine
|
||||||
//TODO: blockIcon
|
//TODO: blockIcon
|
||||||
this.blockIcon = iconRegister.registerIcon("biomesoplenty:moss");
|
this.blockIcon = iconRegister.registerIcon("biomesoplenty:moss");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// JAVADOC METHOD $$ func_149707_d
|
||||||
|
@Override
|
||||||
|
public boolean canPlaceBlockOnSide(World world, int x, int y, int z, int side)
|
||||||
|
{
|
||||||
|
switch (side)
|
||||||
|
{
|
||||||
|
case 1:
|
||||||
|
return (world.getBlock(x, y + 1, z) == Blocks.stone);
|
||||||
|
case 2:
|
||||||
|
return (world.getBlock(x, y, z + 1) == Blocks.stone);
|
||||||
|
case 3:
|
||||||
|
return (world.getBlock(x, y, z - 1) == Blocks.stone);
|
||||||
|
case 4:
|
||||||
|
return (world.getBlock(x + 1, y, z) == Blocks.stone);
|
||||||
|
case 5:
|
||||||
|
return (world.getBlock(x - 1, y, z) == Blocks.stone);
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
public class ItemBlockCoral extends ItemBlock
|
public class ItemBlockCoral extends ItemBlock
|
||||||
{
|
{
|
||||||
private static final String[] coral = new String[] {"kelpbottom", "kelpmiddle", "kelptop", "kelpsingle", "pinkcoral", "orangecoral", "bluecoral", "glowcoral", "seaweed"};
|
private static final String[] coral = new String[] {"kelpbottom", "kelpmiddle", "kelptop", "kelpsingle", "pinkcoral", "orangecoral", "bluecoral", "glowcoral", "algae"};
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
private IIcon[] textures;
|
private IIcon[] textures;
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ import net.minecraft.world.World;
|
||||||
|
|
||||||
public class ItemBlockFoliage extends ItemColored
|
public class ItemBlockFoliage extends ItemColored
|
||||||
{
|
{
|
||||||
private static final String[] foliageTypes = new String[] {"algae", "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", "hedgebottom", "bush", "sprout", "hedgetop", "poisonivy", "berrybush", "shrub", "wheatgrass", "dampgrass", "koru", "cloverpatch", "leafpile", "deadleafpile"};
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
private IIcon[] textures;
|
private IIcon[] textures;
|
||||||
private static final int HEDGETOP = 6;
|
private static final int HEDGETOP = 6;
|
||||||
|
|
|
@ -16,6 +16,7 @@ public class SwampForcedDecorator extends ForcedDecorator
|
||||||
this.bopWorldFeatures.setFeature("seaweedPerChunk", 10);
|
this.bopWorldFeatures.setFeature("seaweedPerChunk", 10);
|
||||||
this.bopWorldFeatures.setFeature("cattailsPerChunk", 10);
|
this.bopWorldFeatures.setFeature("cattailsPerChunk", 10);
|
||||||
this.bopWorldFeatures.setFeature("highCattailsPerChunk", 5);
|
this.bopWorldFeatures.setFeature("highCattailsPerChunk", 5);
|
||||||
|
this.bopWorldFeatures.setFeature("algaePerChunk", 3);
|
||||||
this.bopWorldFeatures.setFeature("koruPerChunk", 25);
|
this.bopWorldFeatures.setFeature("koruPerChunk", 25);
|
||||||
this.bopWorldFeatures.setFeature("waterReedsPerChunk", 5);
|
this.bopWorldFeatures.setFeature("waterReedsPerChunk", 5);
|
||||||
this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 1);
|
this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 1);
|
||||||
|
|
|
@ -50,7 +50,7 @@ public class WorldGenFieldAssociation
|
||||||
associateFeature("desertSproutsPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("plants"), 2));
|
associateFeature("desertSproutsPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("plants"), 2));
|
||||||
associateFeature("bromeliadsPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 12));
|
associateFeature("bromeliadsPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 12));
|
||||||
associateFeature("waterReedsPerChunk", new WorldGenWaterReeds());
|
associateFeature("waterReedsPerChunk", new WorldGenWaterReeds());
|
||||||
associateFeature("seaweedPerChunk", new WorldGenBOPCoral(BOPBlockHelper.get("coral"), 8));
|
associateFeature("seaweedPerChunk", new WorldGenBOPCoral(BOPBlockHelper.get("coral"), 8, 256));
|
||||||
associateFeature("wildCarrotsPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("plants"), 11));
|
associateFeature("wildCarrotsPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("plants"), 11));
|
||||||
associateFeature("poisonIvyPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("foliage"), 7));
|
associateFeature("poisonIvyPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("foliage"), 7));
|
||||||
associateFeature("berryBushesPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("foliage"), 8));
|
associateFeature("berryBushesPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("foliage"), 8));
|
||||||
|
@ -60,7 +60,7 @@ public class WorldGenFieldAssociation
|
||||||
associateFeature("blueMilksPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("mushrooms"), 2));
|
associateFeature("blueMilksPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("mushrooms"), 2));
|
||||||
associateFeature("cattailsPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("plants"), 7));
|
associateFeature("cattailsPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("plants"), 7));
|
||||||
associateFeature("highCattailsPerChunk", new WorldGenBOPDoubleFlora(BOPBlockHelper.get("plants"), BOPBlockHelper.get("plants"), 10, 9));
|
associateFeature("highCattailsPerChunk", new WorldGenBOPDoubleFlora(BOPBlockHelper.get("plants"), BOPBlockHelper.get("plants"), 10, 9));
|
||||||
associateFeature("algaePerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("foliage"), 0));
|
associateFeature("algaePerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("foliage"), 0, 256));
|
||||||
associateFeature("sproutsPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("foliage"), 5));
|
associateFeature("sproutsPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("foliage"), 5));
|
||||||
associateFeature("tinyCactiPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("plants"), 12));
|
associateFeature("tinyCactiPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("plants"), 12));
|
||||||
associateFeature("oasesPerChunk", new WorldGenWaterside(Blocks.grass, 7, Blocks.sand, Blocks.hardened_clay));
|
associateFeature("oasesPerChunk", new WorldGenWaterside(Blocks.grass, 7, Blocks.sand, Blocks.hardened_clay));
|
||||||
|
|
|
@ -64,7 +64,7 @@ tile.flowers2.rose.name=Rose
|
||||||
tile.stoneFormations.stalagmite.name=Stalagmite
|
tile.stoneFormations.stalagmite.name=Stalagmite
|
||||||
tile.stoneFormations.stalactite.name=Stalactite
|
tile.stoneFormations.stalactite.name=Stalactite
|
||||||
|
|
||||||
tile.foliage.algae.name=Algae
|
tile.foliage.duckweed.name=Duckweed
|
||||||
tile.foliage.shortgrass.name=Short Grass
|
tile.foliage.shortgrass.name=Short Grass
|
||||||
tile.foliage.mediumgrass.name=Medium Grass
|
tile.foliage.mediumgrass.name=Medium Grass
|
||||||
tile.foliage.hedgebottom.name=Hedge
|
tile.foliage.hedgebottom.name=Hedge
|
||||||
|
@ -130,7 +130,7 @@ tile.coral.pinkcoral.name=Pink Coral
|
||||||
tile.coral.orangecoral.name=Orange Coral
|
tile.coral.orangecoral.name=Orange Coral
|
||||||
tile.coral.bluecoral.name=Blue Coral
|
tile.coral.bluecoral.name=Blue Coral
|
||||||
tile.coral.glowcoral.name=Glowing Coral
|
tile.coral.glowcoral.name=Glowing Coral
|
||||||
tile.coral.seaweed.name=Seaweed
|
tile.coral.algae.name=Algae
|
||||||
|
|
||||||
tile.redCobbleStairs.name=Red Rock Cobblestone Stairs
|
tile.redCobbleStairs.name=Red Rock Cobblestone Stairs
|
||||||
tile.redBricksStairs.name=Red Rock Bricks Stairs
|
tile.redBricksStairs.name=Red Rock Bricks Stairs
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 844 B After Width: | Height: | Size: 705 B |
Binary file not shown.
After Width: | Height: | Size: 620 B |
Binary file not shown.
Before Width: | Height: | Size: 684 B After Width: | Height: | Size: 765 B |
Binary file not shown.
Before Width: | Height: | Size: 705 B |
Loading…
Reference in a new issue