From f2dd0db4df65fd34f6036eb0c6a4d93666f73b78 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 22 Jul 2014 14:09:49 +0100 Subject: [PATCH] Added the Infrangible Platform. --- .../botania/common/block/BlockPlatform.java | 21 +++++++++++++----- resources/assets/botania/lang/en_US.lang | 1 + .../botania/textures/blocks/platform2.png | Bin 0 -> 3359 bytes 3 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 resources/assets/botania/textures/blocks/platform2.png diff --git a/MODSRC/vazkii/botania/common/block/BlockPlatform.java b/MODSRC/vazkii/botania/common/block/BlockPlatform.java index 82da9c137..89cfcba91 100644 --- a/MODSRC/vazkii/botania/common/block/BlockPlatform.java +++ b/MODSRC/vazkii/botania/common/block/BlockPlatform.java @@ -37,6 +37,7 @@ import cpw.mods.fml.common.registry.GameRegistry; public class BlockPlatform extends BlockCamo implements ILexiconable { IIcon[] icons; + private static final int SUBTYPES = 3; public BlockPlatform() { super(Material.wood); @@ -64,27 +65,34 @@ public class BlockPlatform extends BlockCamo implements ILexiconable { @Override public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for(int i = 0; i < 2; i++) + for(int i = 0; i < SUBTYPES; i++) par3List.add(new ItemStack(par1, 1, i)); } @Override public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[2]; - for(int i = 0; i < 2; i++) + icons = new IIcon[SUBTYPES]; + for(int i = 0; i < SUBTYPES; i++) icons[i] = IconHelper.forBlock(par1IconRegister, this, i); } @Override public IIcon getIcon(int par1, int par2) { - return icons[Math.min(2 - 1, par2)]; + return icons[Math.min(SUBTYPES - 1, par2)]; } @Override public void addCollisionBoxesToList(World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { - if(par1World.getBlockMetadata(par2, par3, par4) == 0 && par7Entity != null && par7Entity.posY > par3 + (par7Entity instanceof EntityPlayer ? 2 : 0) && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking())) + int meta = par1World.getBlockMetadata(par2, par3, par4); + if(meta == 2 || (meta == 0 && par7Entity != null && par7Entity.posY > par3 + (par7Entity instanceof EntityPlayer ? 2 : 0) && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking()))) super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); } + + @Override + public float getBlockHardness(World par1World, int par2, int par3, int par4) { + int meta = par1World.getBlockMetadata(par2, par3, par4); + return meta == 2 ? -1 : super.getBlockHardness(par1World, par2, par3, par4); + } @Override public TileCamo createNewTileEntity(World world, int meta) { @@ -93,7 +101,8 @@ public class BlockPlatform extends BlockCamo implements ILexiconable { @Override public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { - return world.getBlockMetadata(x, y, z) == 0 ? LexiconData.platform : LexiconData.spectralPlatform; + int meta = world.getBlockMetadata(x, y, z); + return meta == 0 ? LexiconData.platform : meta == 2 ? null : LexiconData.spectralPlatform; } } \ No newline at end of file diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index aa3bfe207..8466e9486 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -274,6 +274,7 @@ tile.botania:shinyFlower14.name=Glimmering Red Flower tile.botania:shinyFlower15.name=Glimmering Black Flower tile.botania:platform0.name=Abstruse Platform tile.botania:platform1.name=Spectral Platform +tile.botania:platform2.name=Infrangible Platform tile.botania:alfheimPortal.name=Elven Gateway Core tile.botania:blockDarkQuartz.name=Block of Smokey Quartz tile.botania:chiseledDarkQuartz.name=Chiseled Smokey Quartz Block diff --git a/resources/assets/botania/textures/blocks/platform2.png b/resources/assets/botania/textures/blocks/platform2.png new file mode 100644 index 0000000000000000000000000000000000000000..f61ef3e761940cc0dfbb4437db98b863e40cb2e3 GIT binary patch literal 3359 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