diff --git a/Planned Features.txt b/Planned Features.txt index 337679f42..e322a13f1 100644 --- a/Planned Features.txt +++ b/Planned Features.txt @@ -8,31 +8,27 @@ Coconut: Grows on palm trees. Drops 2 coconut halves when broken with an ax Berry Bush: Drops a berry when broken or right clicked. -Glowshroom: Appears in the Mystic Grove and Fungi Forest, both above and below ground. - --- ITEMS: -Coconut Halves: Coconuts drop 2 when broken with an axe. Restores 2 hunger points each. +Coconut Halves: Coconuts drop 2 when broken with an axe. Restores 2 hunger points each. Berry: Dropped from berry bushes. Restores 1/2 a hunger point. -Cherry: Dropped from cherry tree leaves when broken or right clicked. - --- NETHER BIOMES: -Undergarden: Bramble, nether wart, giant/small mushrooms, hellstem plant, glowpines. +Undergarden: Bramble, nether wart, giant/small mushrooms, hellstem plant, glowpines. -Corrupted Sands: Soulsand, thorns, dead bushes. +Corrupted Sands: Soulsand, thorns, dead bushes. -Phantasmagoric Inferno: Lots of lavafalls and lava ponds. +Phantasmagoric Inferno: Lots of lavafalls and lava ponds. -Aphotic Abyss: Large, empty pits that go into the void. Lots of mobs will spawn here. +Aphotic Abyss: Large, empty pits that go into the void. Lots of mobs will spawn here. -Parasitic Heap: A living, breathing biome where a parasitic block slowly engulfs netherrack. +Parasitic Heap: A living, breathing biome where a parasitic block slowly engulfs netherrack. --- @@ -40,14 +36,14 @@ OCEAN BIOMES: Coral Reef: Different types of coral, with reef stone on the ocean floor. -Kelp Forest: Lots and lots of kelp with varying heights. +Kelp Forest: Lots and lots of kelp with varying heights. --- UNDERGROUND BIOMES (If possible): -Crystal Caverns: Purple, translucent crystals growing around the cavern. +Crystal Caverns: Purple, translucent crystals growing around the cavern. -Flooded Caverns: Lots of water springs and ponds. +Flooded Caverns: Lots of water springs and ponds. -Overgrown Caverns: Vines hanging from the ceiling, small shrubs, and lots of mushrooms. \ No newline at end of file +Overgrown Caverns: Vines hanging from the ceiling, small shrubs, and lots of mushrooms. \ No newline at end of file diff --git a/src/minecraft/biomesoplenty/api/BlockReferences.java b/src/minecraft/biomesoplenty/api/BlockReferences.java index c4981de27..fc5639340 100644 --- a/src/minecraft/biomesoplenty/api/BlockReferences.java +++ b/src/minecraft/biomesoplenty/api/BlockReferences.java @@ -139,8 +139,10 @@ public class BlockReferences { wildFlower (Blocks.flowers, 7), violet (Blocks.flowers, 8), anenome (Blocks.flowers, 9), + lilyflower (Blocks.flowers, 10), tinyCactus (Blocks.flowers, 11), aloe (Blocks.flowers, 12), + sunflower (Blocks.flowers, 13), dandelion (Blocks.flowers, 15), ; diff --git a/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java b/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java index 5a665dc30..8eb6aa8f1 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java @@ -1115,19 +1115,6 @@ public class BiomeDecoratorBOP extends BiomeDecorator var5 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8; this.highCattailGen.generate(this.currentWorld, this.randomGenerator, var3, var4, var5); } - - for (var2 = 0; doGen && var2 < this.algaePerChunk; ++var2) - { - var3 = this.chunk_X + this.randomGenerator.nextInt(16) + 8; - var4 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8; - - for (var5 = this.randomGenerator.nextInt(128); var5 > 0 && this.currentWorld.getBlockId(var3, var5 - 1, var4) == 0; --var5) - { - ; - } - - this.algaeGen.generate(this.currentWorld, this.randomGenerator, var3, var5, var4); - } //Added doGen = TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, DEAD_BUSH); @@ -1139,21 +1126,6 @@ public class BiomeDecoratorBOP extends BiomeDecorator (new WorldGenDeadBush(Block.deadBush.blockID)).generate(this.currentWorld, this.randomGenerator, var3, var4, var5); } - //Added - doGen = TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, LILYPAD); - for (var2 = 0; doGen && var2 < this.waterlilyPerChunk; ++var2) - { - var3 = this.chunk_X + this.randomGenerator.nextInt(16) + 8; - var4 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8; - - for (var5 = this.randomGenerator.nextInt(128); var5 > 0 && this.currentWorld.getBlockId(var3, var5 - 1, var4) == 0; --var5) - { - ; - } - - this.waterlilyGen.generate(this.currentWorld, this.randomGenerator, var3, var5, var4); - } - //Added doGen = TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, SHROOM); for (var2 = 0; doGen && var2 < this.mushroomsPerChunk; ++var2) @@ -1248,14 +1220,6 @@ public class BiomeDecoratorBOP extends BiomeDecorator var5 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8; this.desertCactusGen.generate(this.currentWorld, this.randomGenerator, var3, var4, var5); } - - for (var2 = 0; var2 < this.lilyflowersPerChunk; ++var2) - { - var3 = this.chunk_X + this.randomGenerator.nextInt(16) + 8; - var4 = this.randomGenerator.nextInt(128); - var5 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8; - this.lilyflowerGen.generate(this.currentWorld, this.randomGenerator, var3, var4, var5); - } if (this.generateLakes) { @@ -1276,6 +1240,42 @@ public class BiomeDecoratorBOP extends BiomeDecorator } } + for (var2 = 0; var2 < this.lilyflowersPerChunk; ++var2) + { + var3 = this.chunk_X + this.randomGenerator.nextInt(16) + 8; + var4 = this.randomGenerator.nextInt(128); + var5 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8; + this.lilyflowerGen.generate(this.currentWorld, this.randomGenerator, var3, var4, var5); + } + + for (var2 = 0; doGen && var2 < this.algaePerChunk; ++var2) + { + var3 = this.chunk_X + this.randomGenerator.nextInt(16) + 8; + var4 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8; + + for (var5 = this.randomGenerator.nextInt(128); var5 > 0 && this.currentWorld.getBlockId(var3, var5 - 1, var4) == 0; --var5) + { + ; + } + + this.algaeGen.generate(this.currentWorld, this.randomGenerator, var3, var5, var4); + } + + //Added + doGen = TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, LILYPAD); + for (var2 = 0; doGen && var2 < this.waterlilyPerChunk; ++var2) + { + var3 = this.chunk_X + this.randomGenerator.nextInt(16) + 8; + var4 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8; + + for (var5 = this.randomGenerator.nextInt(128); var5 > 0 && this.currentWorld.getBlockId(var3, var5 - 1, var4) == 0; --var5) + { + ; + } + + this.waterlilyGen.generate(this.currentWorld, this.randomGenerator, var3, var5, var4); + } + MinecraftForge.EVENT_BUS.post(new DecorateBiomeEvent.Post(currentWorld, randomGenerator, chunk_X, chunk_Z)); } diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenCherryBlossomGrove.java b/src/minecraft/biomesoplenty/biomes/BiomeGenCherryBlossomGrove.java index ca69ac631..e3482609b 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenCherryBlossomGrove.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenCherryBlossomGrove.java @@ -17,7 +17,7 @@ public class BiomeGenCherryBlossomGrove extends BiomeGenBase super(par1); this.theBiomeDecorator = new BiomeDecoratorBOP(this); this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; - this.customBiomeDecorator.treesPerChunk = 5; + this.customBiomeDecorator.treesPerChunk = 3; this.customBiomeDecorator.flowersPerChunk = -999; this.customBiomeDecorator.pinkFlowersPerChunk = 15; this.customBiomeDecorator.whiteFlowersPerChunk = 30; diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenGrove.java b/src/minecraft/biomesoplenty/biomes/BiomeGenGrove.java index 63d694fa4..5e9387f9d 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenGrove.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenGrove.java @@ -15,7 +15,7 @@ public class BiomeGenGrove extends BiomeGenBase super(par1); this.theBiomeDecorator = new BiomeDecoratorBOP(this); this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; - this.customBiomeDecorator.treesPerChunk = 6; + this.customBiomeDecorator.treesPerChunk = 3; this.customBiomeDecorator.flowersPerChunk = 5; this.customBiomeDecorator.grassPerChunk = 10; this.customBiomeDecorator.sproutsPerChunk = 2; diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPFoliage.java b/src/minecraft/biomesoplenty/blocks/BlockBOPFoliage.java index 219ebc886..cd9e1730d 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPFoliage.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPFoliage.java @@ -31,7 +31,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockBOPFoliage extends BlockFlower implements IShearable { - private static final String[] foliageTypes = new String[] {"algae", "shortgrass", "mediumgrass", "highgrassbottom", "bush", "sprout", "highgrasstop", "poisonivy"}; + private static final String[] foliageTypes = new String[] {"algae", "shortgrass", "mediumgrass", "highgrassbottom", "bush", "sprout", "highgrasstop", "poisonivy", "berrybush"}; private Icon[] textures; diff --git a/src/minecraft/biomesoplenty/helpers/AchievementHelper.java b/src/minecraft/biomesoplenty/helpers/AchievementHelper.java index 3b4ada0c5..14416003f 100644 --- a/src/minecraft/biomesoplenty/helpers/AchievementHelper.java +++ b/src/minecraft/biomesoplenty/helpers/AchievementHelper.java @@ -47,10 +47,10 @@ public class AchievementHelper achOrigin = (new Achievement(3061, "achOrigin", 0, 5, Blocks.originGrass.get(), achFlower)).setSpecial().registerAchievement(); achPromised = (new Achievement(3062, "achPromised", 0, -5, Blocks.holyGrass.get(), achFlower)).setSpecial().registerAchievement(); achMud = (new Achievement(3063, "achMud", -2, -1, Items.mudball.get(), achFlower)).registerAchievement(); - achShroom = (new Achievement(3064, "achShroom", 1, -2, new ItemStack(Blocks.flowers.get(),1,10), achFlower)).registerAchievement(); + achShroom = (new Achievement(3064, "achShroom", 1, -2, new ItemStack(Blocks.mushrooms.get(),1,0), achFlower)).registerAchievement(); achBarley = (new Achievement(3065, "achBarley", -2, 4, new ItemStack(Blocks.plants.get(),1,6), achFlower)).registerAchievement(); achMoss = (new Achievement(3066, "achMoss", -1, -3, Blocks.moss.get(), achFlower)).registerAchievement(); - achFlowerP = (new Achievement(3067, "achFlowerP", 2, -1, new ItemStack(Items.flowerBand.get(), 1, 3), achFlower)).registerAchievement(); + achFlowerP = (new Achievement(3067, "achFlowerP", 2, -3, new ItemStack(Items.flowerBand.get(), 1, 3), achFlower)).registerAchievement(); pageBOP = new AchievementPage("Biomes O\' Plenty", new Achievement[] {achFlower, achRedRock, achThorn, achAsh, achOrigin, achPromised, achMud, achShroom, achBarley, achMoss, achFlowerP}); AchievementPage.registerAchievementPage(pageBOP); @@ -59,14 +59,14 @@ public class AchievementHelper addAchievementDesc("achFlower", "Flower Child", "Pick some flowers!"); addAchievementDesc("achRedRock", "Red Rocky Mountain High", "Dig out some red rocks."); addAchievementDesc("achThorn", "Rather Thorny...", "Don\'t get cut!"); - addAchievementDesc("achAsh", "Ash-ievement", "Get it? \'Cause it\'s ash."); - addAchievementDesc("achOrigin", "Alpha...", "Get some grass from the Origin Valley."); + addAchievementDesc("achAsh", "Ashes, Ashes...", "Man, this song is creepy."); + addAchievementDesc("achOrigin", "Alpha...", "Where it all began."); addAchievementDesc("achPromised", "...Omega", "Welcome to the Promised Land!"); addAchievementDesc("achMud", "Sticky Situation", "I just had these boots cleaned!"); addAchievementDesc("achShroom", "Trippin\'", "Don\'t try this at home, kids!"); addAchievementDesc("achBarley", "Fields Of Gold", "Upon the fields of barley."); - addAchievementDesc("achMoss", "Mossman", "Mothman's long-lost cousin."); - addAchievementDesc("achFlowerP", "Flower Power", "Stop the corporations dude."); + addAchievementDesc("achMoss", "A Rolling Stone Gathers No Moss", "Wait, cubes can't roll..."); + addAchievementDesc("achFlowerP", "Flower Power!", "Groovy, man."); } // Achievement checker diff --git a/src/minecraft/biomesoplenty/items/ItemBOPFoliage.java b/src/minecraft/biomesoplenty/items/ItemBOPFoliage.java index c51a31333..356b44553 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPFoliage.java +++ b/src/minecraft/biomesoplenty/items/ItemBOPFoliage.java @@ -17,7 +17,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemBOPFoliage extends ItemColored { - private static final String[] foliageTypes = new String[] {"algae", "shortgrass", "mediumgrass", "highgrassbottom", "bush", "sprout", "highgrasstop", "poisonivy"}; + private static final String[] foliageTypes = new String[] {"algae", "shortgrass", "mediumgrass", "highgrassbottom", "bush", "sprout", "highgrasstop", "poisonivy", "berrybush"}; @SideOnly(Side.CLIENT) private Icon[] textures; private static final int GRASSTOP = 6; diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/item_moss.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/item_moss.png index a373c4f2f..6384ae421 100644 Binary files a/src/minecraft/mods/BiomesOPlenty/textures/blocks/item_moss.png and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/item_moss.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/item_sunflower.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/item_sunflower.png index 24cfa7d29..4e2a98e36 100644 Binary files a/src/minecraft/mods/BiomesOPlenty/textures/blocks/item_sunflower.png and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/item_sunflower.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/sunflowertop.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/sunflowertop.png index 04ce44a2a..4ca81799b 100644 Binary files a/src/minecraft/mods/BiomesOPlenty/textures/blocks/sunflowertop.png and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/sunflowertop.png differ