diff --git a/src/minecraft/assets/biomesoplenty/lang/en_US.xml b/src/minecraft/assets/biomesoplenty/lang/en_US.xml index c7320e77e..a74b8e8f2 100644 --- a/src/minecraft/assets/biomesoplenty/lang/en_US.xml +++ b/src/minecraft/assets/biomesoplenty/lang/en_US.xml @@ -40,18 +40,18 @@ Swampflower Deathbloom Glowflower - Hydrangea - Daisy - Tulip + Blue Hydrangea + Orange Cosmos + Pink Daffodil Wildflower Violet - Anemone + White Anemone Waterlily Chromaflora Aloe Sunflower Sunflower - Dandelion + White Dandelion Algae Short Grass @@ -153,7 +153,7 @@ Puddle - Grave + Gravestone Red Rock Cobblestone Slab Red Rock Bricks Slab diff --git a/src/minecraft/assets/biomesoplenty/textures/blocks/anemone.png b/src/minecraft/assets/biomesoplenty/textures/blocks/anemone.png index 93c84a077..838ae8fb9 100644 Binary files a/src/minecraft/assets/biomesoplenty/textures/blocks/anemone.png and b/src/minecraft/assets/biomesoplenty/textures/blocks/anemone.png differ diff --git a/src/minecraft/assets/biomesoplenty/textures/blocks/daisy.png b/src/minecraft/assets/biomesoplenty/textures/blocks/cosmos.png similarity index 100% rename from src/minecraft/assets/biomesoplenty/textures/blocks/daisy.png rename to src/minecraft/assets/biomesoplenty/textures/blocks/cosmos.png diff --git a/src/minecraft/assets/biomesoplenty/textures/blocks/daffodil.png b/src/minecraft/assets/biomesoplenty/textures/blocks/daffodil.png new file mode 100644 index 000000000..c249b401d Binary files /dev/null and b/src/minecraft/assets/biomesoplenty/textures/blocks/daffodil.png differ diff --git a/src/minecraft/assets/biomesoplenty/textures/blocks/kelp.png b/src/minecraft/assets/biomesoplenty/textures/blocks/kelp.png deleted file mode 100644 index fa041f6da..000000000 Binary files a/src/minecraft/assets/biomesoplenty/textures/blocks/kelp.png and /dev/null differ diff --git a/src/minecraft/assets/biomesoplenty/textures/blocks/kelpbottom.png b/src/minecraft/assets/biomesoplenty/textures/blocks/kelpbottom.png new file mode 100644 index 000000000..b5b3b7741 Binary files /dev/null and b/src/minecraft/assets/biomesoplenty/textures/blocks/kelpbottom.png differ diff --git a/src/minecraft/assets/biomesoplenty/textures/blocks/kelpmiddle.png b/src/minecraft/assets/biomesoplenty/textures/blocks/kelpmiddle.png new file mode 100644 index 000000000..26614501c Binary files /dev/null and b/src/minecraft/assets/biomesoplenty/textures/blocks/kelpmiddle.png differ diff --git a/src/minecraft/assets/biomesoplenty/textures/blocks/kelptop.png b/src/minecraft/assets/biomesoplenty/textures/blocks/kelptop.png new file mode 100644 index 000000000..2210f8a5d Binary files /dev/null and b/src/minecraft/assets/biomesoplenty/textures/blocks/kelptop.png differ diff --git a/src/minecraft/assets/biomesoplenty/textures/blocks/tulip.png b/src/minecraft/assets/biomesoplenty/textures/blocks/tulip.png deleted file mode 100644 index a4a996464..000000000 Binary files a/src/minecraft/assets/biomesoplenty/textures/blocks/tulip.png and /dev/null differ diff --git a/src/minecraft/biomesoplenty/api/BlockReferences.java b/src/minecraft/biomesoplenty/api/BlockReferences.java index c9461c982..cf9b7c830 100644 --- a/src/minecraft/biomesoplenty/api/BlockReferences.java +++ b/src/minecraft/biomesoplenty/api/BlockReferences.java @@ -167,8 +167,8 @@ public class BlockReferences { deathbloom (Blocks.flowers, 2), glowFlower (Blocks.flowers, 3), hydrangea (Blocks.flowers, 4), - daisy (Blocks.flowers, 5), - tulip (Blocks.flowers, 6), + cosmos (Blocks.flowers, 5), + daffodil (Blocks.flowers, 6), wildFlower (Blocks.flowers, 7), violet (Blocks.flowers, 8), anenome (Blocks.flowers, 9), diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenDunes.java b/src/minecraft/biomesoplenty/biomes/BiomeGenDunes.java index d742437d3..81d853e4b 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenDunes.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenDunes.java @@ -20,10 +20,10 @@ public class BiomeGenDunes extends BiomeGenBase theBiomeDecorator = new BiomeDecoratorBOP(this); customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; customBiomeDecorator.treesPerChunk = -999; - customBiomeDecorator.deadBushPerChunk = -999; - customBiomeDecorator.duneGrassPerChunk = 10; - customBiomeDecorator.desertSproutsPerChunk = 5; - customBiomeDecorator.aloePerChunk = 1; + customBiomeDecorator.deadBushPerChunk = 5; + customBiomeDecorator.duneGrassPerChunk = 75; + customBiomeDecorator.desertSproutsPerChunk = 25; + customBiomeDecorator.aloePerChunk = 5; customBiomeDecorator.reedsPerChunk = -999; customBiomeDecorator.generateLakes = false; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPCoral.java b/src/minecraft/biomesoplenty/blocks/BlockBOPCoral.java index c4407e7f6..86c3b3910 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPCoral.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPCoral.java @@ -12,12 +12,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.World; import biomesoplenty.BiomesOPlenty; +import biomesoplenty.api.Blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class BlockBOPCoral extends BlockFlower { - private static final String[] coral = new String[] {"kelp"}; + private static final String[] coral = new String[] {"kelpbottom", "kelpmiddle", "kelptop", "pinkcoral", "orangecoral", "bluecoral", "glowcoral"}; private Icon[] textures; protected BlockBOPCoral(int blockID, Material material) @@ -76,12 +77,17 @@ public class BlockBOPCoral extends BlockFlower @Override protected boolean canThisPlantGrowOnThisBlockID(int id) { - return id == Block.dirt.blockID || id == Block.sand.blockID; + return id == Block.dirt.blockID || id == Block.sand.blockID || id == blockID; } protected boolean canThisPlantGrowOnThisBlockID(int id, int metadata) { - return id == Block.dirt.blockID || id == Block.sand.blockID; + if (metadata == 1) + return id == blockID; + if (metadata == 2) + return id == blockID || id == Block.dirt.blockID || id == Block.sand.blockID; + else + return id == Block.dirt.blockID || id == Block.sand.blockID; } @Override @@ -91,9 +97,19 @@ public class BlockBOPCoral extends BlockFlower int meta = itemStack.getItemDamage(); //boolean sky = world.getFullBlockLightValue(x, y, z) >= 8 || world.canBlockSeeTheSky(x, y, z); - if (itemStack.itemID == blockID) - return id == Block.dirt.blockID || id == Block.sand.blockID; - else + if (itemStack.itemID == blockID) { + switch (meta) + { + case 1: // Kelp Middle + return id == blockID; + + case 2: // Kelp Bottom + return id == blockID; + + default: + return id == Block.dirt.blockID || id == Block.sand.blockID; + } + } else return this.canPlaceBlockOnSide(world, x, y, z, side); } @@ -127,11 +143,9 @@ public class BlockBOPCoral extends BlockFlower public boolean canBlockStay(World world, int x, int y, int z) { if (world.getBlockId(x, y, z) != blockID) - return (world.getFullBlockLightValue(x, y, z) >= 8 || world.canBlockSeeTheSky(x, y, z)) - && this.canThisPlantGrowOnThisBlockID(world.getBlockId(x, y - 1, z)); + return this.canThisPlantGrowOnThisBlockID(world.getBlockId(x, y - 1, z)); else - return (world.getFullBlockLightValue(x, y, z) >= 8 || world.canBlockSeeTheSky(x, y, z)) - && this.canThisPlantGrowOnThisBlockID(world.getBlockId(x, y - 1, z), world.getBlockMetadata(x, y, z)); + return this.canThisPlantGrowOnThisBlockID(world.getBlockId(x, y - 1, z), world.getBlockMetadata(x, y, z)); } @Override diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java b/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java index 555039d5a..189c79999 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java @@ -24,7 +24,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockBOPFlower extends BlockFlower { - private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "daisy", "tulip", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "aloe", "sunflowerbottom", "sunflowertop", "dandelion"}; + private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "aloe", "sunflowerbottom", "sunflowertop", "dandelion"}; private Icon[] textures; private static final int SUNFLOWERTOP = 14; diff --git a/src/minecraft/biomesoplenty/itemblocks/ItemBlockCoral.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockCoral.java index 0814e4b9f..8869dbca1 100644 --- a/src/minecraft/biomesoplenty/itemblocks/ItemBlockCoral.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockCoral.java @@ -12,7 +12,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemBlockCoral extends ItemBlock { - private static final String[] coral = new String[] {"kelp"}; + private static final String[] coral = new String[] {"kelpbottom", "kelpmiddle", "kelptop", "pinkcoral", "orangecoral", "bluecoral", "glowcoral"}; @SideOnly(Side.CLIENT) private Icon[] textures; diff --git a/src/minecraft/biomesoplenty/itemblocks/ItemBlockFlower.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockFlower.java index fc04e01a9..8aafd9cf6 100644 --- a/src/minecraft/biomesoplenty/itemblocks/ItemBlockFlower.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockFlower.java @@ -18,7 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemBlockFlower extends ItemBlock { - private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "daisy", "tulip", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "aloe", "sunflowerbottom", "sunflowertop", "dandelion"}; + private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "aloe", "sunflowerbottom", "sunflowertop", "dandelion"}; @SideOnly(Side.CLIENT) private Icon[] textures; private static final int SUNFLOWERTOP = 14; diff --git a/src/minecraft/biomesoplenty/world/layer/BiomeLayerCreate.java b/src/minecraft/biomesoplenty/world/layer/BiomeLayerCreate.java index 78cdb4938..3b9894746 100644 --- a/src/minecraft/biomesoplenty/world/layer/BiomeLayerCreate.java +++ b/src/minecraft/biomesoplenty/world/layer/BiomeLayerCreate.java @@ -2,6 +2,7 @@ package biomesoplenty.world.layer; import net.minecraft.world.gen.layer.IntCache; import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.api.Biomes; public class BiomeLayerCreate extends BiomeLayer { @@ -16,8 +17,8 @@ public class BiomeLayerCreate extends BiomeLayer int[] var5 = IntCache.getIntCache(par3 * par4); boolean ocean = BOPConfiguration.BiomeGen.oceanGen; - //boolean coral = Biomes.oceanCoral.isPresent(); - //boolean kelp = Biomes.oceanKelp.isPresent(); + boolean coral = Biomes.oceanCoral.isPresent(); + boolean kelp = Biomes.oceanKelp.isPresent(); for (int var6 = 0; var6 < par4; ++var6) { @@ -26,9 +27,9 @@ public class BiomeLayerCreate extends BiomeLayer this.initChunkSeed(par1 + var7, par2 + var6); if(ocean) { - /*if(coral) { var5[var7 + var6 * par3] = this.nextInt(10) == 0 ? 1 : Biomes.oceanCoral.get().biomeID; } + if(coral) { var5[var7 + var6 * par3] = this.nextInt(10) == 0 ? 1 : Biomes.oceanCoral.get().biomeID; } else if(kelp) { var5[var7 + var6 * par3] = this.nextInt(10) == 0 ? 1 : Biomes.oceanKelp.get().biomeID; } - else {*/ var5[var7 + var6 * par3] = this.nextInt(10) == 0 ? 1 : 0; //} + else { var5[var7 + var6 * par3] = this.nextInt(10) == 0 ? 1 : 0;} } else { diff --git a/src/minecraft/biomesoplenty/world/layer/BiomeLayerSub.java b/src/minecraft/biomesoplenty/world/layer/BiomeLayerSub.java index 4dd5a8efe..245a74190 100644 --- a/src/minecraft/biomesoplenty/world/layer/BiomeLayerSub.java +++ b/src/minecraft/biomesoplenty/world/layer/BiomeLayerSub.java @@ -44,10 +44,6 @@ public class BiomeLayerSub extends BiomeLayer if (k1 == Biomes.forestNew.get().biomeID && nextInt(3) == 0) { l1 = Biomes.forestHillsNew.get().biomeID; } if (k1 == Biomes.taigaNew.get().biomeID && nextInt(3) == 0) { l1 = Biomes.taigaHillsNew.get().biomeID; } if (k1 == Biomes.jungleNew.get().biomeID && nextInt(3) == 0) { l1 = Biomes.jungleHillsNew.get().biomeID; } - - //if (k1 == BiomeGenBase.ocean.biomeID && nextInt(2) == 0) { l1 = Biomes.tropics.get().biomeID; } - //if (k1 == BiomeGenBase.ocean.biomeID && nextInt(3) == 0) { l1 = Biomes.volcano.get().biomeID; } - //if (k1 == BiomeGenBase.ocean.biomeID && nextInt(3) == 0) { l1 = Biomes.polar.get().biomeID; } if (l1 == k1) {