From 5d1829a00e8ad8e704c0c33d87b002647a956b1d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Apr 2016 18:44:32 -0500 Subject: [PATCH] Camo block now respects directional blocks. Closes #110 --- build.properties | 8 ++-- .../botania/common/block/BlockCamo.java | 41 +++++++------------ version/1.9.txt | 2 +- web/versions.ini | 3 +- 4 files changed, 21 insertions(+), 33 deletions(-) diff --git a/build.properties b/build.properties index 909aa18bd..c1aa7139e 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Wed Apr 13 10:09:00 CDT 2016 +#Sat Apr 23 16:25:06 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.16.0.1865-1.9 -mc_version=1.9 dir_repo=./ -build_number=302 +mc_version=1.9 +forge_version=12.16.0.1865-1.9 +build_number=303 mod_name=Botania diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index d0fa7d677..3d3b0b3f3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockDirectional; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -25,6 +26,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.block.tile.TileCamo; +import java.util.ArrayList; +import java.util.List; + public abstract class BlockCamo extends BlockMod { protected BlockCamo(Material par2Material, String name) { @@ -36,37 +40,20 @@ public abstract class BlockCamo extends BlockMod { } @Override - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack currentStack, EnumFacing par6, float par7, float par8, float par9) { + @SuppressWarnings("unchecked") + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack currentStack, EnumFacing side, float hitX, float hitY, float hitZ) { TileEntity tile = par1World.getTileEntity(pos); - if(tile instanceof TileCamo) { + if(par1World.isRemote) + return true; + + if(currentStack != null + && Block.getBlockFromItem(currentStack.getItem()) != null + && tile instanceof TileCamo) { TileCamo camo = (TileCamo) tile; + IBlockState changeState = Block.getBlockFromItem(currentStack.getItem()).onBlockPlaced(par1World, pos, side, hitX, hitY, hitZ, currentStack.getItemDamage(), par5EntityPlayer); - if(currentStack == null) - currentStack = new ItemStack(Block.getBlockFromName("air"), 1, 0); - - boolean doChange = true; - IBlockState testState = null; - checkChange : { - if(currentStack.getItem() != Item.getItemFromBlock(Block.getBlockFromName("air"))) { - if(Item.getIdFromItem(currentStack.getItem()) == 0) { - doChange = false; - break checkChange; - } - - testState = Block.getBlockFromItem(currentStack.getItem()).getStateFromMeta(currentStack.getItemDamage()); - if(testState == null || !isValidBlock(testState) || testState.getBlock() instanceof BlockCamo || testState.getMaterial() == Material.air) - doChange = false; - } - } - - if(doChange && currentStack.getItem() != null) { - IBlockState changeState = Block.getBlockFromItem(currentStack.getItem()).getStateFromMeta(currentStack.getItemDamage()); - if(testState.getBlock() instanceof BlockDirectional) { - if (BlockDirectional.FACING.getAllowedValues().contains(par6.getOpposite())) { - changeState = changeState.withProperty(BlockDirectional.FACING, par6.getOpposite()); - } - } + if(isValidBlock(changeState) && !(changeState.getBlock() instanceof BlockCamo) && changeState.getMaterial() != Material.air) { camo.camoState = changeState; par1World.notifyBlockUpdate(pos, state, state, 8); diff --git a/version/1.9.txt b/version/1.9.txt index 0e6a396d1..91aa6a95e 100644 --- a/version/1.9.txt +++ b/version/1.9.txt @@ -1 +1 @@ -r1.8-301 \ No newline at end of file +r1.8-302 \ No newline at end of file diff --git a/web/versions.ini b/web/versions.ini index 98a9afd3d..ac21559e6 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -250,4 +250,5 @@ r1.8-249=1.7.10 r1.8-299=1.8.9 r1.8-299=1.8.9 r1.8-300=1.9 -r1.8-301=1.9 \ No newline at end of file +r1.8-301=1.9 +r1.8-302=1.9 \ No newline at end of file