From d1e265039fe4e6f5545a1079cf0d0e5b85964648 Mon Sep 17 00:00:00 2001 From: Amnet Date: Thu, 18 Apr 2013 00:35:17 +0200 Subject: [PATCH] Finished up stairs and rocks. --- src/minecraft/biomesoplenty/api/Blocks.java | 3 + .../biomesoplenty/blocks/BlockBOPRedRock.java | 105 ++++++++++++++++++ .../biomesoplenty/blocks/BlockBOPSlab.java | 10 +- .../biomesoplenty/blocks/BlockBOPStairs.java | 20 ++-- .../blocks/BlockMudBrickStairs.java | 1 + .../biomesoplenty/blocks/BlockRedRock.java | 1 + .../blocks/BlockRedRockBrick.java | 1 + .../blocks/BlockRedRockBrickStairs.java | 1 + .../blocks/BlockRedRockCobble.java | 1 + .../blocks/BlockRedRockCobbleStairs.java | 1 + .../configuration/BOPBlocks.java | 68 +++++++----- .../biomesoplenty/items/ItemBOPRedRock.java | 19 ++++ .../biomesoplenty/mod_BiomesOPlenty.java | 2 +- src/minecraft/mcmod.info | 2 +- 14 files changed, 195 insertions(+), 40 deletions(-) create mode 100644 src/minecraft/biomesoplenty/blocks/BlockBOPRedRock.java create mode 100644 src/minecraft/biomesoplenty/items/ItemBOPRedRock.java diff --git a/src/minecraft/biomesoplenty/api/Blocks.java b/src/minecraft/biomesoplenty/api/Blocks.java index 53b161f8b..92b4a9c62 100644 --- a/src/minecraft/biomesoplenty/api/Blocks.java +++ b/src/minecraft/biomesoplenty/api/Blocks.java @@ -38,6 +38,9 @@ public class Blocks public static Optional palmStairs = Optional.absent(); public static Optional redwoodStairs = Optional.absent(); public static Optional willowStairs = Optional.absent(); + public static Optional redCobbleStairs = Optional.absent(); + public static Optional redBricksStairs = Optional.absent(); + public static Optional mudBricksStairs = Optional.absent(); // Slabs public static Optional woodenSingleSlab1 = Optional.absent(); diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPRedRock.java b/src/minecraft/biomesoplenty/blocks/BlockBOPRedRock.java new file mode 100644 index 000000000..99c64adcb --- /dev/null +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPRedRock.java @@ -0,0 +1,105 @@ +package biomesoplenty.blocks; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import biomesoplenty.mod_BiomesOPlenty; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class BlockBOPRedRock extends Block +{ + private static final String[] types = new String[] {"redrock", "redcobble", "redbrick"}; + @SideOnly(Side.CLIENT) + private Icon[] textures = {null, null, null}; + + public BlockBOPRedRock(int par1) + { + super(par1, Material.rock); + this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); + setStepSound(Block.soundStoneFootstep); + } + + @Override + public void registerIcons(IconRegister iconRegister) + { + textures = new Icon[types.length]; + + for (int i = 0; i < types.length; ++i) + textures[i] = iconRegister.registerIcon("BiomesOPlenty:"+types[i]); + } + + @Override + @SideOnly(Side.CLIENT) + public Icon getIcon(int side, int meta) + { + if (meta < 0 || meta >= textures.length) + meta = 0; + + return textures[meta]; + } + + @SideOnly(Side.CLIENT) + @Override + public int getDamageValue(World world, int x, int y, int z) { + return world.getBlockMetadata(x, y, z); + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) { + for (int i = 0; i < types.length; ++i) + list.add(new ItemStack(blockID, 1, i)); + } + + @Override + public float getBlockHardness(World world, int x, int y, int z) + { + int meta = world.getBlockMetadata(x, y, z); + float hardness = this.blockHardness; + + switch (meta) + { + case 0: + hardness = 1.0F; + break; + + case 1: + hardness = 1.6F; + break; + + case 2: + hardness = 1.1F; + break; + } + + return hardness; + } + + @Override + public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) + { + int meta = world.getBlockMetadata(x, y, z); + float resistance = this.blockResistance; + + switch (meta) + { + case 1: + resistance = 7.5F; + break; + + case 2: + resistance = 7.0F; + break; + } + + return resistance / 5.0F; + } +} diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPSlab.java b/src/minecraft/biomesoplenty/blocks/BlockBOPSlab.java index ae7e6d984..8d62565a4 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPSlab.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPSlab.java @@ -23,7 +23,7 @@ public class BlockBOPSlab extends BlockHalfSlab WOOD1, WOOD2, STONE; } private static final String[] woodTypes = new String[] {"acacia", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow"}; - private static final String[] rockTypes = new String[] {"redbrick", "redcobble", "mudbrick"}; + private static final String[] rockTypes = new String[] {"redcobble", "redbrick", "mudbrick"}; @SideOnly(Side.CLIENT) private Icon[] textures; @@ -119,11 +119,11 @@ public class BlockBOPSlab extends BlockHalfSlab switch (getTypeFromMeta(meta)) { case 0: - hardness = 1.1F; + hardness = 1.6F; break; case 1: - hardness = 1.6F; + hardness = 1.1F; break; case 2: @@ -146,11 +146,11 @@ public class BlockBOPSlab extends BlockHalfSlab switch (getTypeFromMeta(meta)) { case 0: - resistance = 7.5F; + resistance = 7.0F; break; case 1: - resistance = 7.0F; + resistance = 7.5F; break; case 2: diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPStairs.java b/src/minecraft/biomesoplenty/blocks/BlockBOPStairs.java index 0a6188e0e..eacfc7f8c 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPStairs.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPStairs.java @@ -11,17 +11,17 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockBOPStairs extends BlockStairs { - public static enum WoodCategory + public static enum Category { - ACACIA, CHERRY, DARK, FIR, HOLY, MAGIC, MANGROVE, PALM, REDWOOD, WILLOW; + ACACIA, CHERRY, DARK, FIR, HOLY, MAGIC, MANGROVE, PALM, REDWOOD, WILLOW, RED_COBBLE, RED_BRICKS, MUD_BRICKS; } - private static final String[] woodTypes = new String[] {"acacia", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow"}; + private static final String[] types = new String[] {"acacia", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow", "redcobble", "redbrick", "mudbrick"}; @SideOnly(Side.CLIENT) private Icon[] textures; - private final WoodCategory category; + private final Category category; - public BlockBOPStairs(int blockID, Block model, WoodCategory cat) + public BlockBOPStairs(int blockID, Block model, Category cat) { super(blockID, model, 0); category = cat; @@ -34,10 +34,14 @@ public class BlockBOPStairs extends BlockStairs @SideOnly(Side.CLIENT) public void registerIcons(IconRegister iconRegister) { - textures = new Icon[woodTypes.length]; + textures = new Icon[types.length]; + + for (int i = 0; i < types.length; ++i) + if (i < types.length - 3) + textures[i] = iconRegister.registerIcon("BiomesOPlenty:"+types[i]+"plank"); + else + textures[i] = iconRegister.registerIcon("BiomesOPlenty:"+types[i]); - for (int i = 0; i < woodTypes.length; ++i) - textures[i] = iconRegister.registerIcon("BiomesOPlenty:"+woodTypes[i]+"plank"); } @Override diff --git a/src/minecraft/biomesoplenty/blocks/BlockMudBrickStairs.java b/src/minecraft/biomesoplenty/blocks/BlockMudBrickStairs.java index b4d083cd6..b10a026bf 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockMudBrickStairs.java +++ b/src/minecraft/biomesoplenty/blocks/BlockMudBrickStairs.java @@ -6,6 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; import net.minecraft.client.renderer.texture.IconRegister; +@Deprecated public class BlockMudBrickStairs extends BlockStairs { /** The block that is used as model for the stair. */ diff --git a/src/minecraft/biomesoplenty/blocks/BlockRedRock.java b/src/minecraft/biomesoplenty/blocks/BlockRedRock.java index 6637ec2a5..b64c30dbe 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockRedRock.java +++ b/src/minecraft/biomesoplenty/blocks/BlockRedRock.java @@ -9,6 +9,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; +@Deprecated public class BlockRedRock extends Block { public BlockRedRock(int par1) diff --git a/src/minecraft/biomesoplenty/blocks/BlockRedRockBrick.java b/src/minecraft/biomesoplenty/blocks/BlockRedRockBrick.java index 6c04d6e61..d6059e6ef 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockRedRockBrick.java +++ b/src/minecraft/biomesoplenty/blocks/BlockRedRockBrick.java @@ -6,6 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; +@Deprecated public class BlockRedRockBrick extends Block { public BlockRedRockBrick(int par1) diff --git a/src/minecraft/biomesoplenty/blocks/BlockRedRockBrickStairs.java b/src/minecraft/biomesoplenty/blocks/BlockRedRockBrickStairs.java index 74539d8d8..154e08d9a 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockRedRockBrickStairs.java +++ b/src/minecraft/biomesoplenty/blocks/BlockRedRockBrickStairs.java @@ -6,6 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; import net.minecraft.client.renderer.texture.IconRegister; +@Deprecated public class BlockRedRockBrickStairs extends BlockStairs { /** The block that is used as model for the stair. */ diff --git a/src/minecraft/biomesoplenty/blocks/BlockRedRockCobble.java b/src/minecraft/biomesoplenty/blocks/BlockRedRockCobble.java index b518b8837..e9a4b7954 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockRedRockCobble.java +++ b/src/minecraft/biomesoplenty/blocks/BlockRedRockCobble.java @@ -6,6 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; +@Deprecated public class BlockRedRockCobble extends Block { public BlockRedRockCobble(int par1) diff --git a/src/minecraft/biomesoplenty/blocks/BlockRedRockCobbleStairs.java b/src/minecraft/biomesoplenty/blocks/BlockRedRockCobbleStairs.java index c58863c66..0ded3b509 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockRedRockCobbleStairs.java +++ b/src/minecraft/biomesoplenty/blocks/BlockRedRockCobbleStairs.java @@ -6,6 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; import net.minecraft.client.renderer.texture.IconRegister; +@Deprecated public class BlockRedRockCobbleStairs extends BlockStairs { /** The block that is used as model for the stair. */ diff --git a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java index d82d9a3f3..a24c67b51 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java +++ b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java @@ -4,7 +4,7 @@ import biomesoplenty.api.Blocks; import biomesoplenty.blocks.*; import biomesoplenty.blocks.BlockBOPLog.LogCategory; import biomesoplenty.blocks.BlockBOPSlab.SlabCategory; -import biomesoplenty.blocks.BlockBOPStairs.WoodCategory; +import biomesoplenty.blocks.BlockBOPStairs.Category; import biomesoplenty.items.ItemBOPColorizedLeaves; import biomesoplenty.items.ItemBOPColorizedSapling; import biomesoplenty.items.ItemBOPFlower; @@ -14,6 +14,7 @@ import biomesoplenty.items.ItemBOPLog; import biomesoplenty.items.ItemBOPPetals; import biomesoplenty.items.ItemBOPPlank; import biomesoplenty.items.ItemBOPPlant; +import biomesoplenty.items.ItemBOPRedRock; import biomesoplenty.items.ItemBOPSlab; import biomesoplenty.items.ItemBOPSapling; @@ -34,7 +35,7 @@ public class BOPBlocks { // Block declaration public static Block mud; // Worldgen public static Block driedDirt; // Worldgen - public static Block redRock; // Worldgen + public static Block redRock; // DONE (Worldgen) public static Block ash; // Worldgen public static Block deadGrass; // DONE public static Block desertGrass; // DONE @@ -68,7 +69,7 @@ public class BOPBlocks { public static Block mudBrickBlock; public static BlockHalfSlab mudBrickDoubleSlab; // DONE public static BlockHalfSlab mudBrickSingleSlab; // DONE - public static Block mudBrickStairs; + public static Block mudBrickStairs; // DONE public static Block originGrass; // Worldgen public static Block originLeaves; // DONE public static Block pinkFlower; // DONE @@ -95,14 +96,14 @@ public class BOPBlocks { public static Block darkSapling; // DONE public static Block magicSapling; // DONE public static Block deathbloom; // DONE - public static Block redRockCobble; + public static Block redRockCobble; // DONE public static BlockHalfSlab redRockCobbleDoubleSlab; // DONE public static BlockHalfSlab redRockCobbleSingleSlab; // DONE - public static Block redRockCobbleStairs; - public static Block redRockBrick; + public static Block redRockCobbleStairs; // DONE + public static Block redRockBrick; // DONE public static BlockHalfSlab redRockBrickDoubleSlab; // DONE public static BlockHalfSlab redRockBrickSingleSlab; // DONE - public static Block redRockBrickStairs; + public static Block redRockBrickStairs; // DONE public static Block hydrangea; // DONE public static Block violet; // DONE public static BlockMediumGrass mediumGrass; // DONE @@ -380,7 +381,7 @@ public class BOPBlocks { holyDoubleSlab = (BlockHalfSlab)(new BlockHolySlab(BOPConfiguration.holyDoubleSlabID, true)).setHardness(2.0F).setResistance(5.0F).setStepSound(Block.soundWoodFootstep).setUnlocalizedName("holySlab"); holySingleSlab = (BlockHalfSlab)(new BlockHolySlab(BOPConfiguration.holySingleSlabID, false)).setHardness(2.0F).setResistance(5.0F).setStepSound(Block.soundWoodFootstep).setUnlocalizedName("holySlab"); holyStairs = (new BlockHolyStairs(BOPConfiguration.holyStairsID, holyPlank)).setUnlocalizedName("holyStairs"); - + /* // Planks - WORKING! Blocks.planks = Optional.of((new BlockBOPPlank(1989)).setResistance(5.0F).setStepSound(Block.soundWoodFootstep).setUnlocalizedName("planks")); @@ -396,18 +397,29 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.planks.get(), 1, 7), "Palm Wood Planks"); LanguageRegistry.addName(new ItemStack(Blocks.planks.get(), 1, 8), "Redwood Wood Planks"); LanguageRegistry.addName(new ItemStack(Blocks.planks.get(), 1, 9), "Willow Wood Planks"); + + // Red Rock + Blocks.redRock = Optional.of((new BlockBOPRedRock(1983)).setUnlocalizedName("redRocks")); + GameRegistry.registerBlock(Blocks.redRock.get(), ItemBOPRedRock.class, "redRocks"); + LanguageRegistry.addName(new ItemStack(Blocks.redRock.get(),1,0), "Red Rock"); + LanguageRegistry.addName(new ItemStack(Blocks.redRock.get(),1,1), "Red Rock Cobblestone"); + LanguageRegistry.addName(new ItemStack(Blocks.redRock.get(),1,2), "Red Rock Bricks"); + // Stairs - WORKING! - Blocks.acaciaStairs = Optional.of((new BlockBOPStairs(1990, Blocks.planks.get(), WoodCategory.ACACIA)).setUnlocalizedName("acaciaStairs")); - Blocks.cherryStairs = Optional.of((new BlockBOPStairs(1991, Blocks.planks.get(), WoodCategory.CHERRY)).setUnlocalizedName("cherryStairs")); - Blocks.darkStairs = Optional.of((new BlockBOPStairs(1992, Blocks.planks.get(), WoodCategory.DARK)).setUnlocalizedName("darkStairs")); - Blocks.firStairs = Optional.of((new BlockBOPStairs(1993, Blocks.planks.get(), WoodCategory.FIR)).setUnlocalizedName("firStairs")); - Blocks.holyStairs = Optional.of((new BlockBOPStairs(1994, Blocks.planks.get(), WoodCategory.HOLY)).setUnlocalizedName("holyStairs")); - Blocks.magicStairs = Optional.of((new BlockBOPStairs(1995, Blocks.planks.get(), WoodCategory.MAGIC)).setUnlocalizedName("magicStairs")); - Blocks.mangroveStairs = Optional.of((new BlockBOPStairs(1996, Blocks.planks.get(), WoodCategory.MANGROVE)).setUnlocalizedName("mangroveStairs")); - Blocks.palmStairs = Optional.of((new BlockBOPStairs(1997, Blocks.planks.get(), WoodCategory.PALM)).setUnlocalizedName("palmStairs")); - Blocks.redwoodStairs = Optional.of((new BlockBOPStairs(1998, Blocks.planks.get(), WoodCategory.REDWOOD)).setUnlocalizedName("redwoodStairs")); - Blocks.willowStairs = Optional.of((new BlockBOPStairs(1999, Blocks.planks.get(), WoodCategory.WILLOW)).setUnlocalizedName("willowStairs")); + Blocks.acaciaStairs = Optional.of((new BlockBOPStairs(1990, Blocks.planks.get(), Category.ACACIA)).setUnlocalizedName("acaciaStairs")); + Blocks.cherryStairs = Optional.of((new BlockBOPStairs(1991, Blocks.planks.get(), Category.CHERRY)).setUnlocalizedName("cherryStairs")); + Blocks.darkStairs = Optional.of((new BlockBOPStairs(1992, Blocks.planks.get(), Category.DARK)).setUnlocalizedName("darkStairs")); + Blocks.firStairs = Optional.of((new BlockBOPStairs(1993, Blocks.planks.get(), Category.FIR)).setUnlocalizedName("firStairs")); + Blocks.holyStairs = Optional.of((new BlockBOPStairs(1994, Blocks.planks.get(), Category.HOLY)).setUnlocalizedName("holyStairs")); + Blocks.magicStairs = Optional.of((new BlockBOPStairs(1995, Blocks.planks.get(), Category.MAGIC)).setUnlocalizedName("magicStairs")); + Blocks.mangroveStairs = Optional.of((new BlockBOPStairs(1996, Blocks.planks.get(), Category.MANGROVE)).setUnlocalizedName("mangroveStairs")); + Blocks.palmStairs = Optional.of((new BlockBOPStairs(1997, Blocks.planks.get(), Category.PALM)).setUnlocalizedName("palmStairs")); + Blocks.redwoodStairs = Optional.of((new BlockBOPStairs(1998, Blocks.planks.get(), Category.REDWOOD)).setUnlocalizedName("redwoodStairs")); + Blocks.willowStairs = Optional.of((new BlockBOPStairs(1999, Blocks.planks.get(), Category.WILLOW)).setUnlocalizedName("willowStairs")); + Blocks.redCobbleStairs = Optional.of((new BlockBOPStairs(2000, Blocks.redRock.get(), Category.RED_COBBLE)).setUnlocalizedName("redCobbleStairs")); + Blocks.redBricksStairs = Optional.of((new BlockBOPStairs(2001, Blocks.redRock.get(), Category.RED_BRICKS)).setUnlocalizedName("redBricksStairs")); + Blocks.mudBricksStairs = Optional.of((new BlockBOPStairs(2002, Blocks.redRock.get(), Category.MUD_BRICKS)).setUnlocalizedName("mudBricksStairs")); GameRegistry.registerBlock(Blocks.acaciaStairs.get(), "acaciaStairs1"); GameRegistry.registerBlock(Blocks.cherryStairs.get(), "cherryStairs1"); @@ -418,7 +430,10 @@ public class BOPBlocks { GameRegistry.registerBlock(Blocks.mangroveStairs.get(), "mangroveStairs1"); GameRegistry.registerBlock(Blocks.palmStairs.get(), "palmStairs1"); GameRegistry.registerBlock(Blocks.redwoodStairs.get(), "redwoodStairs1"); - GameRegistry.registerBlock(Blocks.willowStairs.get(), "stairs1"); + GameRegistry.registerBlock(Blocks.willowStairs.get(), "willowStairs1"); + GameRegistry.registerBlock(Blocks.redCobbleStairs.get(), "redCobbleStairs1"); + GameRegistry.registerBlock(Blocks.redBricksStairs.get(), "redBricksStairs1"); + GameRegistry.registerBlock(Blocks.mudBricksStairs.get(), "mudBricksStairs1"); LanguageRegistry.addName(Blocks.acaciaStairs.get(), "Acacia Wood Stairs"); LanguageRegistry.addName(Blocks.cherryStairs.get(), "Cherry Wood Stairs"); @@ -430,6 +445,9 @@ public class BOPBlocks { LanguageRegistry.addName(Blocks.palmStairs.get(), "Palm Wood Stairs"); LanguageRegistry.addName(Blocks.redwoodStairs.get(), "Redwood Wood Stairs"); LanguageRegistry.addName(Blocks.willowStairs.get(), "Willow Wood Stairs"); + LanguageRegistry.addName(Blocks.redCobbleStairs.get(), "Red Rock Cobblestone Stairs"); + LanguageRegistry.addName(Blocks.redBricksStairs.get(), "Red Rock Bricks Stairs"); + LanguageRegistry.addName(Blocks.mudBricksStairs.get(), "Mud Bricks Stairs"); Blocks.woodenDoubleSlab1 = Optional.of((BlockHalfSlab)(new BlockBOPSlab(2007, true, Material.wood, SlabCategory.WOOD1)).setUnlocalizedName("woodenDoubleSlab1")); Blocks.woodenSingleSlab1 = Optional.of((BlockHalfSlab)(new BlockBOPSlab(2006, false, Material.wood, SlabCategory.WOOD1)).setUnlocalizedName("woodenSingleSlab1")); @@ -477,12 +495,12 @@ public class BOPBlocks { GameRegistry.registerBlock(Blocks.stoneDoubleSlab.get(), ItemBOPSlab.class, "stoneDoubleSlab2"); GameRegistry.registerBlock(Blocks.stoneSingleSlab.get(), ItemBOPSlab.class, "stoneSingleSlab"); - LanguageRegistry.addName(new ItemStack(Blocks.stoneDoubleSlab.get(),1,0), "Red Rock Bricks Slab"); - LanguageRegistry.addName(new ItemStack(Blocks.stoneDoubleSlab.get(),1,1), "Red Rock Cobblestone Slab"); + LanguageRegistry.addName(new ItemStack(Blocks.stoneDoubleSlab.get(),1,0), "Red Rock Cobblestone Slab"); + LanguageRegistry.addName(new ItemStack(Blocks.stoneDoubleSlab.get(),1,1), "Red Rock Bricks Slab"); LanguageRegistry.addName(new ItemStack(Blocks.stoneDoubleSlab.get(),1,2), "Mud Bricks Slab"); - LanguageRegistry.addName(new ItemStack(Blocks.stoneSingleSlab.get(),1,0), "Red Rock Bricks Slab"); - LanguageRegistry.addName(new ItemStack(Blocks.stoneSingleSlab.get(),1,1), "Red Rock Cobblestone Slab"); + LanguageRegistry.addName(new ItemStack(Blocks.stoneSingleSlab.get(),1,0), "Red Rock Cobblestone Slab"); + LanguageRegistry.addName(new ItemStack(Blocks.stoneSingleSlab.get(),1,1), "Red Rock Bricks Slab"); LanguageRegistry.addName(new ItemStack(Blocks.stoneSingleSlab.get(),1,2), "Mud Bricks Slab"); // Flowers - WORKING! - need a fix for tiny cactus @@ -600,13 +618,13 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.colorizedSaplings.get(),1,3), "Redwood Sapling"); LanguageRegistry.addName(new ItemStack(Blocks.colorizedSaplings.get(),1,4), "Willow Sapling"); - Blocks.petals = Optional.of((new BlockBOPPetals(2084)).setUnlocalizedName("petals")); + Blocks.petals = Optional.of((new BlockBOPPetals(1984)).setUnlocalizedName("petals")); GameRegistry.registerBlock(Blocks.petals.get(), ItemBOPPetals.class, "petals"); LanguageRegistry.addName(new ItemStack(Blocks.petals.get(),1,0), "Giant Red Flower"); LanguageRegistry.addName(new ItemStack(Blocks.petals.get(),1,1), "Giant Yellow Flower"); */ - + // Add block registration GameRegistry.registerBlock(mud, "mud"); GameRegistry.registerBlock(driedDirt, "driedDirt"); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPRedRock.java b/src/minecraft/biomesoplenty/items/ItemBOPRedRock.java new file mode 100644 index 000000000..d0106c919 --- /dev/null +++ b/src/minecraft/biomesoplenty/items/ItemBOPRedRock.java @@ -0,0 +1,19 @@ +package biomesoplenty.items; + +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; + +public class ItemBOPRedRock extends ItemBlock +{ + private static final String[] types = new String[] {"redrock", "redcobble", "redbrick"}; + + public ItemBOPRedRock(int par1) + { + super(par1); + } + + @Override + public String getUnlocalizedName(ItemStack itemstack) { + return types[itemstack.getItemDamage() & 15]; + } +} diff --git a/src/minecraft/biomesoplenty/mod_BiomesOPlenty.java b/src/minecraft/biomesoplenty/mod_BiomesOPlenty.java index 72e0b8196..7e4a18ae7 100644 --- a/src/minecraft/biomesoplenty/mod_BiomesOPlenty.java +++ b/src/minecraft/biomesoplenty/mod_BiomesOPlenty.java @@ -51,7 +51,7 @@ import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; -@Mod(modid="BiomesOPlenty", name="Biomes O' Plenty", version="0.5.0") +@Mod(modid="BiomesOPlenty", name="Biomes O' Plenty", version="0.5.1") @NetworkMod(clientSideRequired=true, serverSideRequired=false) public class mod_BiomesOPlenty { diff --git a/src/minecraft/mcmod.info b/src/minecraft/mcmod.info index 9955fa458..4c8e06d75 100644 --- a/src/minecraft/mcmod.info +++ b/src/minecraft/mcmod.info @@ -2,7 +2,7 @@ "modid": "BiomesOPlenty", "name": "Biomes O' Plenty", "description": "Adds 72 new, unique biomes!", - "version": "0.5.0", + "version": "0.5.1", "mcversion": "1.5.1", "url": "www.minecraftforum.net/topic/1495041-", "updateUrl": "",