From 4736be9d6160e853c5c8a1cf1c973d9b5a697dee Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 29 Nov 2015 15:59:17 -0600 Subject: [PATCH] Corporea done --- .../block/corporea/BlockCorporeaFunnel.java | 37 ++++++++++--------- .../corporea/BlockCorporeaInterceptor.java | 26 +++++++------ .../block/corporea/BlockCorporeaRetainer.java | 29 ++++++++++++--- .../corporea/TileCorporeaInterceptor.java | 5 ++- 4 files changed, 59 insertions(+), 38 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java index c0ba7d3c3..93b10c703 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -12,15 +12,15 @@ package vazkii.botania.common.block.corporea; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; import vazkii.botania.common.block.tile.corporea.TileCorporeaFunnel; @@ -29,37 +29,38 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconable { - IIcon[] icons; - public BlockCorporeaFunnel() { super(Material.iron, LibBlockNames.CORPOREA_FUNNEL); setHardness(5.5F); setStepSound(soundTypeMetal); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[2]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.POWERED); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 8 : 0; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 8); } @Override public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; - int meta = world.getBlockMetadata(x, y, z); - boolean powered = (meta & 8) != 0; + boolean powered = ((Boolean) state.getValue(BotaniaStateProps.POWERED)); if(power && !powered) { - ((TileCorporeaFunnel) world.getTileEntity(x, y, z)).doRequest(); - world.setBlockMetadataWithNotify(x, y, z, meta | 8, 4); + ((TileCorporeaFunnel) world.getTileEntity(pos)).doRequest(); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, true), 4); } else if(!power && powered) - world.setBlockMetadataWithNotify(x, y, z, meta & -9, 4); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return icons[par1 > 1 ? 1 : 0]; + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false), 4); } @Override diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java index 168d35660..b4c5aa6d0 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -13,17 +13,17 @@ package vazkii.botania.common.block.corporea; import java.util.Random; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; import vazkii.botania.common.block.tile.corporea.TileCorporeaInterceptor; @@ -32,29 +32,31 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexiconable { - IIcon[] icons; - public BlockCorporeaInterceptor() { super(Material.iron, LibBlockNames.CORPOREA_INTERCEPTOR); setHardness(5.5F); setStepSound(soundTypeMetal); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[2]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.POWERED); } @Override - public IIcon getIcon(int par1, int par2) { - return icons[par1 > 1 ? 1 : 0]; + public int getMetaFromState(IBlockState state) { + return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 1 : 0; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 1); } @Override public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { - world.setBlockMetadataWithNotify(x, y, z, 0, 1 | 2); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false), 1 | 2); } @Override @@ -64,7 +66,7 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi @Override public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { - return world.getBlockMetadata(x, y, z) != 0 ? 15 : 0; + return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 15 : 0; } @Override diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java index ef4fd5f10..324cae185 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.corporea; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -22,6 +23,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockModContainer; @@ -36,19 +38,34 @@ public class BlockCorporeaRetainer extends BlockModContainer implements ILexicon setHardness(5.5F); setStepSound(soundTypeMetal); setUnlocalizedName(LibBlockNames.CORPOREA_RETAINER); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.POWERED); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 8 : 0; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 8); } @Override public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { - boolean power = world.isBlockIndirectlyGettingPowered(x, y, z) || world.isBlockIndirectlyGettingPowered(x, y + 1, z); - int meta = world.getBlockMetadata(x, y, z); - boolean powered = (meta & 8) != 0; + boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; + boolean powered = ((Boolean) state.getValue(BotaniaStateProps.POWERED)); if(power && !powered) { - ((TileCorporeaRetainer) world.getTileEntity(x, y, z)).fulfilRequest(); - world.setBlockMetadataWithNotify(x, y, z, meta | 8, 4); + ((TileCorporeaRetainer) world.getTileEntity(pos)).fulfilRequest(); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, true), 4); } else if(!power && powered) - world.setBlockMetadataWithNotify(x, y, z, meta & -9, 4); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false), 4); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index 0b6b1b711..f873137d4 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -22,6 +22,7 @@ import net.minecraft.util.EnumFacing; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaInterceptor; import vazkii.botania.api.corporea.ICorporeaSpark; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; @@ -56,8 +57,8 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor for(ItemStack stack_ : stacks) missing -= stack_.stackSize; - if(missing > 0 && getBlockMetadata() == 0) { - worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, 1, 1 | 2); + if(missing > 0 && !((Boolean) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED))) { + worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, true), 1 | 2); worldObj.scheduleUpdate(getPos(), getBlockType(), 2); TileEntity requestor = (TileEntity) source.getSparkInventory();