diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 483aeaee5..a7b109732 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -27,6 +27,7 @@ import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.block.decor.BlockManaBeacon; import vazkii.botania.common.block.decor.BlockManaFlame; import vazkii.botania.common.block.decor.BlockManaGlass; +import vazkii.botania.common.block.decor.BlockPetalBlock; import vazkii.botania.common.block.decor.BlockPrismarine; import vazkii.botania.common.block.decor.BlockReeds; import vazkii.botania.common.block.decor.BlockSeaLamp; @@ -192,6 +193,7 @@ public final class ModBlocks { public static Block prism; public static Block dirtPath; public static Block enchantedSoil; + public static Block petalBlock; public static void init() { flower = new BlockModFlower(); @@ -250,7 +252,8 @@ public final class ModBlocks { prism = new BlockPrism(); dirtPath = new BlockDirtPath(); enchantedSoil = new BlockEnchantedSoil(); - + petalBlock = new BlockPetalBlock(); + ModFluffBlocks.init(); for(int i = 0; i < 16; i++) diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java new file mode 100644 index 000000000..0593fecb7 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -0,0 +1,70 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Feb 9, 2015, 5:17:17 PM (GMT)] + */ +package vazkii.botania.common.block.decor; + +import java.awt.Color; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.passive.EntitySheep; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.IBlockAccess; +import vazkii.botania.common.block.BlockMod; +import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; +import vazkii.botania.common.lib.LibBlockNames; +import cpw.mods.fml.common.registry.GameRegistry; + +public class BlockPetalBlock extends BlockMod { + + public BlockPetalBlock() { + super(Material.plants); + setHardness(0.4F); + setStepSound(soundTypeGrass); + setBlockName(LibBlockNames.PETAL_BLOCK); + } + + @Override + public void getSubBlocks(Item item, CreativeTabs tab, List list) { + for(int i = 0; i < 16; i++) + list.add(new ItemStack(item, 1, i)); + } + + @Override + protected boolean shouldRegisterInNameSet() { + return false; + } + + @Override + public Block setBlockName(String par1Str) { + GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + return super.setBlockName(par1Str); + } + + @Override + public int getRenderColor(int meta) { + return new Color(EntitySheep.fleeceColorTable[meta][0], EntitySheep.fleeceColorTable[meta][1], EntitySheep.fleeceColorTable[meta][2]).getRGB(); + } + + @Override + public int colorMultiplier(IBlockAccess world, int x, int y, int z) { + return getRenderColor(world.getBlockMetadata(x, y, z)); + } + + @Override + public int damageDropped(int meta) { + return meta; + } + + +} diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 95fa320f4..aacad8d0e 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -129,6 +129,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.shinyFlower); addBlock(ModBlocks.floatingFlower); addBlock(ModBlocks.floatingSpecialFlower); + addBlock(ModBlocks.petalBlock); addBlock(ModBlocks.tinyPotato); addBlock(ModBlocks.starfield); addBlock(ModBlocks.unstableBlock); diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index 58875fae6..bf6d013bd 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -71,6 +71,7 @@ public final class LibBlockNames { public static final String ENCHANTED_SOIL = "enchantedSoil"; public static final String BIOME_STONE_A = "biomeStoneA"; public static final String BIOME_STONE_B = "biomeStoneB"; + public static final String PETAL_BLOCK = "petalBlock"; public static final String SUBTILE_PUREDAISY = "puredaisy"; public static final String SUBTILE_MANASTAR = "manastar"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index e2e59f2c6..18b7b62bb 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -664,6 +664,22 @@ tile.botania:biomeStoneB4Slab.name=Metamorphic Swamp Stone Brick Slab tile.botania:biomeStoneB5Slab.name=Metamorphic Desert Stone Brick Slab tile.botania:biomeStoneB6Slab.name=Metamorphic Taiga Stone Brick Slab tile.botania:biomeStoneB7Slab.name=Metamorphic Mesa Stone Bricks Slab +tile.botania:petalBlock0.name=White Petal Block +tile.botania:petalBlock1.name=Orange Petal Block +tile.botania:petalBlock2.name=Magenta Petal Block +tile.botania:petalBlock3.name=Light Blue Petal Block +tile.botania:petalBlock4.name=Yellow Petal Block +tile.botania:petalBlock5.name=Lime Petal Block +tile.botania:petalBlock6.name=Pink Petal Block +tile.botania:petalBlock7.name=Gray Petal Block +tile.botania:petalBlock8.name=Light Gray Petal Block +tile.botania:petalBlock9.name=Cyan Petal Block +tile.botania:petalBlock10.name=Purple Petal Block +tile.botania:petalBlock11.name=Blue Petal Block +tile.botania:petalBlock12.name=Brown Petal Block +tile.botania:petalBlock13.name=Green Petal Block +tile.botania:petalBlock14.name=Red Petal Block +tile.botania:petalBlock15.name=Black Petal Block # FLOWER NAMES tile.botania:flower..name=Botania Flower diff --git a/src/main/resources/assets/botania/textures/blocks/unused/petalBlock3.png b/src/main/resources/assets/botania/textures/blocks/petalBlock.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/petalBlock3.png rename to src/main/resources/assets/botania/textures/blocks/petalBlock.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/petalBlock.png b/src/main/resources/assets/botania/textures/blocks/unused/petalBlock.png deleted file mode 100644 index 6ed0eeef4..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/unused/petalBlock.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/unused/petalBlock2.png b/src/main/resources/assets/botania/textures/blocks/unused/petalBlock2.png deleted file mode 100644 index 19a913a55..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/unused/petalBlock2.png and /dev/null differ