diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index e84661f1c..3bbd42dc8 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -20,6 +20,7 @@ import java.util.Set; import net.minecraft.block.*; import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; @@ -308,12 +309,11 @@ public final class BotaniaAPI { /** * Registers a Pure Daisy Recipe. * @param input The block that works as an input for the recipe. Can be a Block or an oredict String. - * @param output The block to be placed upon recipe completion. - * @param outputMeta The metadata to be placed upon recipe completion. + * @param outputState The blockstate to be placed upon recipe completion. * @return The recipe created. */ - public static RecipePureDaisy registerPureDaisyRecipe(Object input, Block output, int outputMeta) { - RecipePureDaisy recipe = new RecipePureDaisy(input, output, outputMeta); + public static RecipePureDaisy registerPureDaisyRecipe(Object input, IBlockState outputState) { + RecipePureDaisy recipe = new RecipePureDaisy(input, outputState); pureDaisyRecipes.add(recipe); return recipe; } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java index 8b8daaa58..fae7d3c6f 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -14,16 +14,12 @@ import net.minecraft.block.BlockPistonBase; 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.EntityLivingBase; 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.World; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.common.util.RotationHelper; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; @@ -36,16 +32,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockRedString extends BlockModContainer implements ILexiconable { - IIcon senderIcon; - IIcon sideIcon; - public BlockRedString(String name) { super(Material.rock); setHardness(2.0F); setResistance(10.0F); setStepSound(soundTypeStone); setUnlocalizedName(name); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.SOUTH)); } @Override @@ -53,29 +45,22 @@ public abstract class BlockRedString extends BlockModContainer im return new BlockState(this, BotaniaStateProps.FACING); } + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumFacing) state.getValue(BotaniaStateProps.FACING)).getIndex(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.FACING, EnumFacing.getFront(meta)); + } + @Override public void onBlockPlacedBy(World par1World, BlockPos pos, IBlockState state, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { EnumFacing orientation = BlockPistonBase.getFacingFromEntity(par1World, pos, par5EntityLivingBase); par1World.setBlockState(pos, state.withProperty(BotaniaStateProps.FACING, orientation), 1 | 2); } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - senderIcon = IconHelper.forName(par1IconRegister, "redStringSender"); - sideIcon = registerSideIcon(par1IconRegister); - } - - @SideOnly(Side.CLIENT) - public IIcon registerSideIcon(IIconRegister register) { - return IconHelper.forBlock(register, this); - } - - @Override - public IIcon getIcon(int side, int meta) { - return side == meta ? senderIcon : sideIcon; - } - @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.redString; diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java index 80b03a401..52454f072 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java @@ -11,7 +11,9 @@ package vazkii.botania.common.block.string; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringComparator; import vazkii.botania.common.lib.LibBlockNames; @@ -20,6 +22,7 @@ public class BlockRedStringComparator extends BlockRedString { public BlockRedStringComparator() { super(LibBlockNames.RED_STRING_COMPARATOR); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java index 3fc3f6cd0..c4c1e5672 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java @@ -10,7 +10,9 @@ */ package vazkii.botania.common.block.string; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringContainer; import vazkii.botania.common.lib.LibBlockNames; @@ -19,6 +21,7 @@ public class BlockRedStringContainer extends BlockRedString { public BlockRedStringContainer() { super(LibBlockNames.RED_STRING_CONTAINER); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java index 9ef22db23..6ad032eee 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java @@ -11,7 +11,12 @@ package vazkii.botania.common.block.string; import net.minecraft.block.Block; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringDispenser; import vazkii.botania.common.lib.LibBlockNames; @@ -20,19 +25,43 @@ public class BlockRedStringDispenser extends BlockRedString { public BlockRedStringDispenser() { super(LibBlockNames.RED_STRING_DISPENSER); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN).withProperty(BotaniaStateProps.POWERED, false)); } @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { - boolean power = world.isBlockIndirectlyGettingPowered(x, y, z) || world.isBlockIndirectlyGettingPowered(x, y + 1, z); - int meta = world.getBlockMetadata(x, y, z); + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.FACING, BotaniaStateProps.POWERED); + } + + @Override + public int getMetaFromState(IBlockState state) { + int meta = ((EnumFacing) state.getValue(BotaniaStateProps.FACING)).getIndex(); + if (((Boolean) state.getValue(BotaniaStateProps.POWERED))) { + meta |= 8; + } else { + meta &= -9; + } + return meta; + } + + @Override + public IBlockState getStateFromMeta(int meta) { boolean powered = (meta & 8) != 0; + meta &= -9; + EnumFacing facing = EnumFacing.getFront(meta); + return getDefaultState().withProperty(BotaniaStateProps.FACING, facing).withProperty(BotaniaStateProps.POWERED, powered); + } + + @Override + public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { + boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; + boolean powered = ((Boolean) state.getValue(BotaniaStateProps.POWERED)); if(power && !powered) { - ((TileRedStringDispenser) world.getTileEntity(x, y, z)).tickDispenser(); - world.setBlockMetadataWithNotify(x, y, z, meta | 8, 4); + ((TileRedStringDispenser) world.getTileEntity(pos)).tickDispenser(); + 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/string/BlockRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java index f57b49cec..d5987da7a 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java @@ -15,7 +15,9 @@ import java.util.Random; import net.minecraft.block.IGrowable; import net.minecraft.block.state.IBlockState; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringFertilizer; import vazkii.botania.common.lib.LibBlockNames; @@ -24,6 +26,7 @@ public class BlockRedStringFertilizer extends BlockRedString implements IGrowabl public BlockRedStringFertilizer() { super(LibBlockNames.RED_STRING_FERTILIZER); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 7367522d7..d281d6d1e 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.string; import java.util.Random; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; @@ -20,6 +21,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringInterceptor; import vazkii.botania.common.lib.LibBlockNames; @@ -30,7 +32,31 @@ public class BlockRedStringInterceptor extends BlockRedString { public BlockRedStringInterceptor() { super(LibBlockNames.RED_STRING_INTERCEPTOR); MinecraftForge.EVENT_BUS.register(this); - // todo 1.8 completely override states from super + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN).withProperty(BotaniaStateProps.POWERED, false)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.FACING, BotaniaStateProps.POWERED); + } + + @Override + public int getMetaFromState(IBlockState state) { + int meta = ((EnumFacing) state.getValue(BotaniaStateProps.FACING)).getIndex(); + if (((Boolean) state.getValue(BotaniaStateProps.POWERED))) { + meta |= 8; + } else { + meta &= -9; + } + return meta; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + boolean powered = (meta & 8) != 0; + meta &= -9; + EnumFacing facing = EnumFacing.getFront(meta); + return getDefaultState().withProperty(BotaniaStateProps.FACING, facing).withProperty(BotaniaStateProps.POWERED, powered); } @SubscribeEvent @@ -46,12 +72,12 @@ public class BlockRedStringInterceptor extends BlockRedString { @Override public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { - return (world.getBlockMetadata(x, y, z) & 8) == 0 ? 0 : 15; + return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 15 : 0; } @Override public void updateTick(World world, BlockPos pos, IBlockState state, Random update) { - world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z) & -9, 1 | 2); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false), 1 | 2); } @Override diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java index 0a291ff0e..5a284f116 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java @@ -10,7 +10,9 @@ */ package vazkii.botania.common.block.string; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringRelay; import vazkii.botania.common.lib.LibBlockNames; @@ -19,6 +21,7 @@ public class BlockRedStringRelay extends BlockRedString { public BlockRedStringRelay() { super(LibBlockNames.RED_STRING_RELAY); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java index 4da1bf098..61e54503c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java @@ -17,6 +17,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.ITileBound; import vazkii.botania.common.block.tile.TileMod; @@ -75,7 +76,7 @@ public abstract class TileRedString extends TileMod implements ITileBound, IUpda } public EnumFacing getOrientation() { - return EnumFacing.getFront(getBlockMetadata()); // todo 1.8 states? + return ((EnumFacing) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.FACING)); } public TileEntity getTileAtBinding() { diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java index 509367d0f..60a005e85 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java @@ -18,6 +18,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.util.BlockPos; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; public class TileRedStringInterceptor extends TileRedString implements IUpdatePlayerListBox { @@ -53,8 +54,7 @@ public class TileRedStringInterceptor extends TileRedString implements IUpdatePl if(coords != null && coords.equals(pos)) { if(!world.isRemote) { Block block = inter.getBlockType(); - int meta = inter.getBlockMetadata(); - world.setBlockMetadataWithNotify(inter.xCoord, inter.yCoord, inter.zCoord, meta | 8, 1 | 2); + world.setBlockState(inter.getPos(), world.getBlockState(inter.getPos()).withProperty(BotaniaStateProps.POWERED, true), 1 | 2); world.scheduleUpdate(inter.getPos(), block, block.tickRate(world)); }