diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenBog.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenBog.java index adfa2c824..ecf6bcd47 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenBog.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenBog.java @@ -74,7 +74,7 @@ public class BiomeGenBog extends BOPBiome if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 6, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 10, 2); } } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenMysticGrove.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenMysticGrove.java index 37109e5a9..eee0eb4fa 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenMysticGrove.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenMysticGrove.java @@ -49,6 +49,8 @@ public class BiomeGenMysticGrove extends BOPBiome this.bopWorldFeatures.cloverPatchesPerChunk = 10; this.bopWorldFeatures.shrubsPerChunk = 4; + this.bopWorldFeatures.leafPilesPerChunk = 10; + this.bopWorldFeatures.seaweedPerChunk = 5; } @@ -59,7 +61,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 diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPLeaves.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPLeaves.java index cfb5a6da5..defbaf48b 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPLeaves.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPLeaves.java @@ -164,19 +164,6 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable double d2 = z + random.nextFloat(); world.spawnParticle("dripWater", d0, d1, d2, 0.0D, 0.0D, 0.0D); } - - //TODO: getBlock() - if (world.getBlock(x, y, z) == BOPBlockHelper.get("leaves1") && isType(world.getBlockMetadata(x, y, z), 2)) - { - //TODO: getBlock() - if (!(world.getBlock(x, y - 1, z) == BOPBlockHelper.get("leaves1") && isType(world.getBlockMetadata(x, y - 1, z), 2))) - { - if (random.nextInt(5) == 0) - { - BiomesOPlenty.proxy.spawnParticle("magictree", x + random.nextFloat(), y + 0.9F, z + random.nextFloat()); - } - } - } //TODO: randomDisplayTick() super.randomDisplayTick(world, x, y, z, random); diff --git a/src/main/java/biomesoplenty/common/blocks/BlockFlowerVine.java b/src/main/java/biomesoplenty/common/blocks/BlockFlowerVine.java new file mode 100644 index 000000000..449331d39 --- /dev/null +++ b/src/main/java/biomesoplenty/common/blocks/BlockFlowerVine.java @@ -0,0 +1,60 @@ +package biomesoplenty.common.blocks; + +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 +{ + public BlockFlowerVine() + { + //TODO: this.setHardness + this.setHardness(0.2F); + + //TODO setStepSound(Block.soundGrassFootstep) + this.setStepSound(Block.soundTypeGrass); + + //TODO: setTickRandomly() + this.setTickRandomly(true); + + //TODO: this.setCreativeTab() + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); + } + + @Override + //TODO: registerIcons() + public void registerBlockIcons(IIconRegister iconRegister) + { + //TODO: blockIcon + this.blockIcon = iconRegister.registerIcon("biomesoplenty:flowervine"); + } + + @Override + @SideOnly(Side.CLIENT) + public int getBlockColor() + { + return 16777215; + } + + // JAVADOC METHOD $$ func_149741_i + @Override + @SideOnly(Side.CLIENT) + public int getRenderColor(int p_149741_1_) + { + return 16777215; + } + + // JAVADOC METHOD $$ func_149720_d + @Override + @SideOnly(Side.CLIENT) + public int colorMultiplier(IBlockAccess p_149720_1_, int p_149720_2_, int p_149720_3_, int p_149720_4_) + { + return 16777215; + } +} diff --git a/src/main/java/biomesoplenty/common/blocks/BlockTreeMoss.java b/src/main/java/biomesoplenty/common/blocks/BlockTreeMoss.java index 8edda7cc5..eb5512ff9 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockTreeMoss.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockTreeMoss.java @@ -1,9 +1,12 @@ package biomesoplenty.common.blocks; +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 @@ -30,4 +33,27 @@ public class BlockTreeMoss extends BlockVine //TODO: blockIcon this.blockIcon = iconRegister.registerIcon("biomesoplenty:treemoss"); } + + @Override + @SideOnly(Side.CLIENT) + public int getBlockColor() + { + return 16777215; + } + + // JAVADOC METHOD $$ func_149741_i + @Override + @SideOnly(Side.CLIENT) + public int getRenderColor(int p_149741_1_) + { + return 16777215; + } + + // JAVADOC METHOD $$ func_149720_d + @Override + @SideOnly(Side.CLIENT) + public int colorMultiplier(IBlockAccess p_149720_1_, int p_149720_2_, int p_149720_3_, int p_149720_4_) + { + return 16777215; + } } diff --git a/src/main/java/biomesoplenty/common/core/BOPBlocks.java b/src/main/java/biomesoplenty/common/core/BOPBlocks.java index 21b36c601..9154b7c10 100644 --- a/src/main/java/biomesoplenty/common/core/BOPBlocks.java +++ b/src/main/java/biomesoplenty/common/core/BOPBlocks.java @@ -1,19 +1,87 @@ 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 { @@ -63,6 +131,7 @@ public class BOPBlocks registerBlock(new BlockBOPGrass().setBlockName("grass")); registerBlock(new BlockTreeMoss().setBlockName("treeMoss")); + registerBlock(new BlockFlowerVine().setBlockName("flowerVine")); registerBlock(new BlockBOPLog(LogCategory.CAT1).setBlockName("logs1"), ItemBlockLog.class); registerBlock(new BlockBOPLog(LogCategory.CAT2).setBlockName("logs2"), ItemBlockLog.class); diff --git a/src/main/resources/assets/biomesoplenty/lang/en_US.lang b/src/main/resources/assets/biomesoplenty/lang/en_US.lang index a2da14c13..91167ed05 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_US.lang +++ b/src/main/resources/assets/biomesoplenty/lang/en_US.lang @@ -123,6 +123,7 @@ tile.originGrass.name=Origin Grass Block tile.longGrass.name=Long Grass Block tile.overgrownNetherrack.name=Overgrown Netherrack tile.treeMoss.name=Tree Moss +tile.flowerVine.name=Flowering Vines tile.coral.kelpsingle.name=Kelp tile.coral.pinkcoral.name=Pink Coral diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/flowervine.png b/src/main/resources/assets/biomesoplenty/textures/blocks/flowervine.png new file mode 100644 index 000000000..e79ed8124 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/blocks/flowervine.png differ