From ddf2a94aa1e3cfc0bdb27dbaadcbba4bec32a46d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 26 Nov 2015 02:18:20 -0600 Subject: [PATCH] Some states in the root package. here we go! --- .../botania/api/state/BotaniaStateProps.java | 20 ++++++++- ...AltGrassType.java => AltGrassVariant.java} | 2 +- .../botania/api/state/enums/CrateVariant.java | 15 +++++++ .../api/state/enums/LivingRockVariant.java | 18 ++++++++ .../api/state/enums/LivingWoodVariant.java | 19 ++++++++ .../api/state/enums/PlatformVariant.java | 16 +++++++ .../botania/api/state/enums/PylonVariant.java | 16 +++++++ .../botania/common/block/BlockAlfPortal.java | 28 ++++++------ .../botania/common/block/BlockAltGrass.java | 18 ++++---- .../common/block/BlockBifrostPerm.java | 2 +- .../common/block/BlockCacophonium.java | 29 +++++++++--- .../botania/common/block/BlockCamo.java | 20 +++++---- .../common/block/BlockEnchantedSoil.java | 25 ++++------- .../botania/common/block/BlockEnderEye.java | 8 ++-- .../botania/common/block/BlockFelPumpkin.java | 2 +- .../botania/common/block/BlockHourglass.java | 22 ++++++++- .../common/block/BlockLightLauncher.java | 2 +- .../botania/common/block/BlockLivingrock.java | 45 +++++++++++++------ .../botania/common/block/BlockLivingwood.java | 44 ++++++++++++------ .../botania/common/block/BlockOpenCrate.java | 44 ++++++++++-------- .../botania/common/block/BlockPlatform.java | 41 ++++++++++++----- .../botania/common/block/BlockPylon.java | 32 +++++++++++-- .../common/block/tile/TileEnderEye.java | 8 ++-- 23 files changed, 347 insertions(+), 129 deletions(-) rename src/main/java/vazkii/botania/api/state/enums/{AltGrassType.java => AltGrassVariant.java} (82%) create mode 100644 src/main/java/vazkii/botania/api/state/enums/CrateVariant.java create mode 100644 src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java create mode 100644 src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java create mode 100644 src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java create mode 100644 src/main/java/vazkii/botania/api/state/enums/PylonVariant.java diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 40517afd5..3cf783c26 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -5,7 +5,7 @@ import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.properties.PropertyInteger; import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; -import vazkii.botania.api.state.enums.AltGrassType; +import vazkii.botania.api.state.enums.*; /** * Holds all Botania block state properties. Use these to set botania blockstates @@ -24,6 +24,7 @@ public class BotaniaStateProps { public static final PropertyEnum FACING = PropertyEnum.create("facing", EnumFacing.class); // Redstone power - boolean + // Also for any other simple boolean "on/off" state public static final PropertyBool POWERED = PropertyBool.create("powered"); // Redstone power - int @@ -32,7 +33,22 @@ public class BotaniaStateProps { /** Properties for individual blocks **/ // BlockAltGrass - public static final PropertyEnum ALTGRASS_VARIANT = PropertyEnum.create("variant", AltGrassType.class); + public static final PropertyEnum ALTGRASS_VARIANT = PropertyEnum.create("variant", AltGrassVariant.class); + + // BlockDreamWood, BlockLivingWood + public static final PropertyEnum LIVINGWOOD_VARIANT = PropertyEnum.create("variant", LivingWoodVariant.class); + + // BlockLivingRock + public static final PropertyEnum LIVINGROCK_VARIANT = PropertyEnum.create("variant", LivingRockVariant.class); + + // BlockOpenCrate + public static final PropertyEnum CRATE_VARIANT = PropertyEnum.create("variant", CrateVariant.class); + + // BlockPlatform + public static final PropertyEnum PLATFORM_VARIANT = PropertyEnum.create("variant", PlatformVariant.class); + + // BlockPylon + public static final PropertyEnum PYLON_VARIANT = PropertyEnum.create("variant", PylonVariant.class); private BotaniaStateProps() {} } diff --git a/src/main/java/vazkii/botania/api/state/enums/AltGrassType.java b/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java similarity index 82% rename from src/main/java/vazkii/botania/api/state/enums/AltGrassType.java rename to src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java index 5bbd19241..f6c547005 100644 --- a/src/main/java/vazkii/botania/api/state/enums/AltGrassType.java +++ b/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java @@ -4,7 +4,7 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; -public enum AltGrassType implements IStringSerializable { +public enum AltGrassVariant implements IStringSerializable { DRY, GOLDEN, VIVID, diff --git a/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java b/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java new file mode 100644 index 000000000..b8e3c1717 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java @@ -0,0 +1,15 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum CrateVariant implements IStringSerializable { + OPEN, + CRAFTY; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java b/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java new file mode 100644 index 000000000..47be762c4 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java @@ -0,0 +1,18 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum LivingRockVariant implements IStringSerializable { + DEFAULT, + BRICK, + MOSSY_BRICK, + CRACKED_BRICK, + CHISELED_BRICK; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java b/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java new file mode 100644 index 000000000..561017457 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java @@ -0,0 +1,19 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum LivingWoodVariant implements IStringSerializable { + DEFAULT, + PLANKS, + MOSSY_PLANKS, + FRAMED, + PATTERN_FRAMED, + GLIMMERING; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java b/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java new file mode 100644 index 000000000..67d7b213b --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java @@ -0,0 +1,16 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum PlatformVariant implements IStringSerializable { + ABSTRUSE, + SPECTRAL, + INFRANGIBLE; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java b/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java new file mode 100644 index 000000000..ce316c222 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java @@ -0,0 +1,16 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum PylonVariant implements IStringSerializable { + MANA, + NATURA, + GAIA; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 8a16618b1..49b3858cf 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -11,17 +11,18 @@ package vazkii.botania.common.block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; 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.api.wand.IWandable; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.achievement.ModAchievements; @@ -31,26 +32,27 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockAlfPortal extends BlockModContainer implements IWandable, ILexiconable { - IIcon iconOff, iconOn; - public static IIcon portalTex; - public BlockAlfPortal() { super(Material.wood); setHardness(10F); setStepSound(soundTypeWood); setUnlocalizedName(LibBlockNames.ALF_PORTAL); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - iconOff = IconHelper.forBlock(par1IconRegister, this, 0); - iconOn = IconHelper.forBlock(par1IconRegister, this, 1); - portalTex = IconHelper.forBlock(par1IconRegister, this, "Inside"); + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.POWERED); } @Override - public IIcon getIcon(int side, int meta) { - return meta == 0 ? iconOff : iconOn; + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 1); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 1 : 0; } @Override @@ -72,8 +74,8 @@ public class BlockAlfPortal extends BlockModContainer implements IWandable, ILex } @Override - public int getLightValue(IBlockAccess world, int x, int y, int z) { - return world.getBlockMetadata(x, y, z) == 0 ? 0 : 15; + public int getLightValue(IBlockAccess world, BlockPos pos) { + return ((Boolean) world.getBlockState(pos).getValue(BotaniaStateProps.POWERED)) ? 0 : 15; } } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 7ca8db558..9449dbfc9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -29,7 +29,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.AltGrassType; +import vazkii.botania.api.state.enums.AltGrassVariant; import vazkii.botania.common.Botania; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; @@ -41,8 +41,8 @@ public class BlockAltGrass extends BlockMod { super(Material.grass); setHardness(0.6F); setStepSound(soundTypeGrass); - setBlockName(LibBlockNames.ALT_GRASS); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassType.DRY)); + setUnlocalizedName(LibBlockNames.ALT_GRASS); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.DRY)); } @Override @@ -52,18 +52,18 @@ public class BlockAltGrass extends BlockMod { @Override public int getMetaFromState(IBlockState state) { - return ((AltGrassType) state.getValue(BotaniaStateProps.ALTGRASS_VARIANT)).ordinal(); + return ((AltGrassVariant) state.getValue(BotaniaStateProps.ALTGRASS_VARIANT)).ordinal(); } @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassType.values()[meta]); + return getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.values()[meta]); } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override @@ -80,7 +80,7 @@ public class BlockAltGrass extends BlockMod { @Override public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { if(!world.isRemote && world.getLight(pos.up()) >= 9) { - AltGrassType variant = ((AltGrassType) state.getValue(BotaniaStateProps.ALTGRASS_VARIANT)); + AltGrassVariant variant = ((AltGrassVariant) state.getValue(BotaniaStateProps.ALTGRASS_VARIANT)); for(int l = 0; l < 4; ++l) { BlockPos pos1 = pos.add(rand.nextInt(3) - 1, rand.nextInt(5) - 3, rand.nextInt(3) - 1); @@ -109,7 +109,7 @@ public class BlockAltGrass extends BlockMod { @Override public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random r) { - AltGrassType variant = ((AltGrassType) state.getValue(BotaniaStateProps.ALTGRASS_VARIANT)); + AltGrassVariant variant = ((AltGrassVariant) state.getValue(BotaniaStateProps.ALTGRASS_VARIANT)); switch(variant) { case DRY: // Dry break; diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index c95b5bff2..6d2062afc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -33,7 +33,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { public BlockBifrostPerm() { super(Material.glass); - setBlockName(LibBlockNames.BIFROST_PERM); + setUnlocalizedName(LibBlockNames.BIFROST_PERM); setLightOpacity(0); setHardness(0.3F); setLightLevel(1F); diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index 74c6547fd..9023358e5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -15,6 +15,7 @@ import java.util.List; 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.init.Blocks; @@ -23,6 +24,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileCacophonium; import vazkii.botania.common.lib.LibBlockNames; @@ -33,6 +35,22 @@ public class BlockCacophonium extends BlockModContainer { super(Material.wood); setUnlocalizedName(LibBlockNames.CACOPHONIUM); setHardness(0.8F); + 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 @@ -47,17 +65,16 @@ public class BlockCacophonium extends BlockModContainer { @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) { - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos); if(tile != null && tile instanceof TileCacophonium) ((TileCacophonium) tile).annoyDirewolf(); - world.setBlockMetadataWithNotify(x, y, z, meta | 8, 4); + 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/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index 81669fd16..46eb57e12 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -16,11 +16,13 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockDirectional; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; 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; @@ -60,8 +62,8 @@ public abstract class BlockCamo extends BlockModContainer { } @Override - public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { - TileEntity tile = par1World.getTileEntity(par2, par3, par4); + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing par6, float par7, float par8, float par9) { + TileEntity tile = par1World.getTileEntity(pos); if(tile instanceof TileCamo) { TileCamo camo = (TileCamo) tile; @@ -89,26 +91,26 @@ public abstract class BlockCamo extends BlockModContainer { int metadata = currentStack.getItemDamage(); if(block instanceof BlockDirectional) { switch (par6) { - case 0: - case 1: + case DOWN: + case UP: break; - case 2: + case NORTH: metadata = metadata & 12 | 2; break; - case 3: + case SOUTH: metadata = metadata & 12; break; - case 4: + case WEST: metadata = metadata & 12 | 1; break; - case 5: + case EAST: metadata = metadata & 12 | 3; break; } } camo.camo = Block.getBlockFromItem(currentStack.getItem()); camo.camoMeta = metadata; - par1World.markBlockForUpdate(par2,par3,par4); + par1World.markBlockForUpdate(pos); return true; } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index 481f150e6..b74754aaa 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -13,21 +13,20 @@ package vazkii.botania.common.block; import java.util.Random; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.render.block.InterpolatedIcon; @@ -39,13 +38,11 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockEnchantedSoil extends BlockMod implements ILexiconable { - IIcon iconSide; - public BlockEnchantedSoil() { super(Material.grass); setHardness(0.6F); setStepSound(soundTypeGrass); - setBlockName(LibBlockNames.ENCHANTED_SOIL); + setUnlocalizedName(LibBlockNames.ENCHANTED_SOIL); MinecraftForge.EVENT_BUS.register(this); } @@ -75,23 +72,17 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable { } @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - return side == 0 ? Blocks.dirt.getIcon(0, 0) : side == 1 ? blockIcon : iconSide; + public Item getItemDropped(IBlockState state, Random p_149650_2_, int p_149650_3_) { + return Blocks.dirt.getItemDropped(state, p_149650_2_, p_149650_3_); } @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { - return Blocks.dirt.getItemDropped(0, p_149650_2_, p_149650_3_); + public boolean canSustainPlant(IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { + return plantable.getPlantType(world, pos.down()) == EnumPlantType.Plains; } @Override - public boolean canSustainPlant(IBlockAccess world, int x, int y, int z, ForgeDirection direction, IPlantable plantable) { - return plantable.getPlantType(world, x, y - 1, z) == EnumPlantType.Plains; - } - - @Override - protected boolean canSilkHarvest() { + public boolean canSilkHarvest(World world, BlockPos pos, IBlockState state, EntityPlayer player) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index 654b087eb..0d2513684 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -35,22 +35,22 @@ public class BlockEnderEye extends BlockModContainer implements ILexiconable { setResistance(10F); setStepSound(soundTypeMetal); setUnlocalizedName(LibBlockNames.ENDER_EYE_BLOCK); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWER, 0)); // todo 1.8 this is probably powered (bool). see the TE + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @Override public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.POWER); + return new BlockState(this, BotaniaStateProps.POWERED); } @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(BotaniaStateProps.POWER, meta); + return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 15); } @Override public int getMetaFromState(IBlockState state) { - return ((Integer) state.getValue(BotaniaStateProps.POWER)); + return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 15 : 0; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 21ecc766a..286560f24 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -38,7 +38,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { public BlockFelPumpkin() { super(Material.gourd); - setBlockName(LibBlockNames.FEL_PUMPKIN); + setUnlocalizedName(LibBlockNames.FEL_PUMPKIN); setHardness(1F); setStepSound(soundTypeWood); MinecraftForge.EVENT_BUS.register(this); diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index e4200c2cc..9549af714 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -14,6 +14,7 @@ import java.util.Random; 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.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -32,6 +33,7 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaTrigger; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.lib.LibRenderIDs; @@ -57,6 +59,22 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I setBlockBounds(d, 0F, d, 1F - d, 1.15F, 1F - d); random = new Random(); + 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)) ? 1 : 0; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 1); } @Override @@ -97,7 +115,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I @Override public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { - return world.getBlockMetadata(x, y, z) == 0 ? 0 : 15; + return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 0 : 15; } @Override @@ -107,7 +125,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I @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 diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index c6ccb1ca7..ccb02bc33 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -40,7 +40,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { super(Material.wood); setHardness(2.0F); setStepSound(soundTypeWood); - setBlockName(LibBlockNames.LIGHT_LAUNCHER); + setUnlocalizedName(LibBlockNames.LIGHT_LAUNCHER); setBlockBounds(0F, 0F, 0F, 1F, 0.25F, 1F); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index 77f28fce3..1a79596f5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -14,6 +14,8 @@ import java.util.List; 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.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -23,7 +25,8 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -31,14 +34,31 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockLivingrock extends BlockMod implements ILexiconable { - private static final int TYPES = 5; - public BlockLivingrock() { super(Material.rock); setHardness(2.0F); setResistance(10.0F); setStepSound(soundTypeStone); - setBlockName(LibBlockNames.LIVING_ROCK); + setUnlocalizedName(LibBlockNames.LIVING_ROCK); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGROCK_VARIANT, LivingRockVariant.DEFAULT)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.LIVINGROCK_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((LivingRockVariant) state.getValue(BotaniaStateProps.LIVINGROCK_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= LivingRockVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.LIVINGROCK_VARIANT, LivingRockVariant.values()[meta]); } @Override @@ -47,32 +67,31 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for(int i = 0; i < TYPES; i++) + for(int i = 0; i < LivingRockVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { - int meta = world.getBlockMetadata(x, y, z); - return new ItemStack(this, 1, meta); + return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - int meta = world.getBlockMetadata(x, y, z); - return meta == 0 ? LexiconData.pureDaisy : LexiconData.decorativeBlocks; + boolean isDefaultVariant = world.getBlockState(pos).getValue(BotaniaStateProps.LIVINGROCK_VARIANT) == LivingRockVariant.DEFAULT; + return isDefaultVariant ? LexiconData.pureDaisy : LexiconData.decorativeBlocks; } } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index c12006eab..a7399e0a6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -14,6 +14,7 @@ import java.util.List; 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.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -25,7 +26,8 @@ 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.client.core.helper.IconHelper; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.LivingWoodVariant; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -33,8 +35,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockLivingwood extends BlockMod implements ILexiconable { - private static final int TYPES = 6; - public BlockLivingwood() { this(LibBlockNames.LIVING_WOOD); } @@ -43,7 +43,26 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { super(Material.wood); setHardness(2.0F); setStepSound(soundTypeWood); - setBlockName(name); + setUnlocalizedName(name); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.DEFAULT)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.LIVINGWOOD_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((LivingWoodVariant) state.getValue(BotaniaStateProps.LIVINGWOOD_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= LivingWoodVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.values()[meta]); } @Override @@ -57,9 +76,9 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { register(par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } void register(String name) { @@ -68,30 +87,29 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { @Override public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for(int i = 0; i < TYPES; i++) + for(int i = 0; i < LivingWoodVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { - int meta = world.getBlockMetadata(x, y, z); - return new ItemStack(this, 1, meta); + return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } @Override public int getLightValue(IBlockAccess world, BlockPos pos) { - return world.getBlockMetadata(x, y, z) == 5 ? 12 : 0; + return world.getBlockState(pos).getValue(BotaniaStateProps.LIVINGWOOD_VARIANT) == LivingWoodVariant.GLIMMERING ? 12 : 0; } @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - int meta = world.getBlockMetadata(x, y, z); - return meta == 0 ? LexiconData.pureDaisy : LexiconData.decorativeBlocks; + boolean defaultVariant = world.getBlockState(pos).getValue(BotaniaStateProps.LIVINGWOOD_VARIANT) == LivingWoodVariant.DEFAULT; + return defaultVariant ? LexiconData.pureDaisy : LexiconData.decorativeBlocks; } @Override public boolean canSustainLeaves(IBlockAccess world, BlockPos pos) { - return world.getBlockMetadata(x, y, z) == 0; + return world.getBlockState(pos).getValue(BotaniaStateProps.LIVINGWOOD_VARIANT) == LivingWoodVariant.DEFAULT; } } diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index aab1160df..caeb11b8a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -13,7 +13,9 @@ package vazkii.botania.common.block; import java.util.List; import java.util.Random; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import org.lwjgl.opengl.GL11; @@ -36,6 +38,8 @@ 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.api.state.enums.CrateVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.core.helper.IconHelper; @@ -51,17 +55,33 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I Random random; - private static final int SUBTYPES = 2; - public BlockOpenCrate() { super(Material.wood); setHardness(2.0F); setStepSound(soundTypeWood); setUnlocalizedName(LibBlockNames.OPEN_CRATE); - + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.OPEN)); random = new Random(); } + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.CRATE_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((CrateVariant) state.getValue(BotaniaStateProps.CRATE_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta > CrateVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.values()[meta]); + } + @Override protected boolean shouldRegisterInNameSet() { return false; @@ -75,7 +95,7 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I @Override public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for(int i = 0; i < SUBTYPES; i++) + for(int i = 0; i < CrateVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } @@ -134,20 +154,6 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I super.breakBlock(par1World, pos, state); } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - iconSide = IconHelper.forBlock(par1IconRegister, this, 0); - iconBottom = IconHelper.forBlock(par1IconRegister, this, 1); - iconSideCraft = IconHelper.forBlock(par1IconRegister, this, 2); - iconBottomCraft = IconHelper.forBlock(par1IconRegister, this, 3); - - sidePatternIcons = new IIcon[TileCraftCrate.PATTERNS.length]; - for(int i = 0; i < sidePatternIcons.length; i++) - sidePatternIcons[i] = IconHelper.forName(par1IconRegister, "ocPattern" + i); - } - - - @Override public TileEntity createNewTileEntity(World world, int meta) { return meta == 0 ? new TileOpenCrate() : new TileCraftCrate(); @@ -155,7 +161,7 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return world.getBlockMetadata(x, y, z) == 0 ? LexiconData.openCrate : LexiconData.craftCrate; + return world.getBlockState(pos).getValue(BotaniaStateProps.CRATE_VARIANT) == CrateVariant.OPEN ? LexiconData.openCrate : LexiconData.craftCrate; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 97212e0b8..0cdfa59b6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -14,6 +14,7 @@ import java.util.List; 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.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -26,6 +27,9 @@ import net.minecraft.util.EnumFacing; 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.api.state.enums.CrateVariant; +import vazkii.botania.api.state.enums.PlatformVariant; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileCamo; @@ -37,14 +41,31 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable { - private static final int SUBTYPES = 3; - public BlockPlatform() { super(Material.wood); setHardness(2.0F); setResistance(5.0F); setStepSound(Block.soundTypeWood); setUnlocalizedName(LibBlockNames.PLATFORM); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.ABSTRUSE)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.PLATFORM_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((PlatformVariant) state.getValue(BotaniaStateProps.PLATFORM_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta > PlatformVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.values()[meta]); } @Override @@ -65,21 +86,21 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable @Override public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for(int i = 0; i < SUBTYPES; i++) + for(int i = 0; i < PlatformVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } @Override public void addCollisionBoxesToList(World par1World, BlockPos pos, IBlockState state, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { - 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); + PlatformVariant variant = ((PlatformVariant) state.getValue(BotaniaStateProps.PLATFORM_VARIANT)); + if(variant == PlatformVariant.INFRANGIBLE || variant == PlatformVariant.ABSTRUSE && par7Entity != null && par7Entity.posY > pos.getY() + (par7Entity instanceof EntityPlayer ? 2 : 0) && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking())) + super.addCollisionBoxesToList(par1World, pos, state, par5AxisAlignedBB, par6List, par7Entity); } @Override public float getBlockHardness(World par1World, BlockPos pos) { - int meta = par1World.getBlockMetadata(par2, par3, par4); - return meta == 2 ? -1F : super.getBlockHardness(par1World, par2, par3, par4); + PlatformVariant variant = ((PlatformVariant) par1World.getBlockState(pos).getValue(BotaniaStateProps.PLATFORM_VARIANT)); + return variant == PlatformVariant.INFRANGIBLE ? -1F : super.getBlockHardness(par1World, pos); } @Override @@ -89,8 +110,8 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - int meta = world.getBlockMetadata(x, y, z); - return meta == 0 ? LexiconData.platform : meta == 2 ? null : LexiconData.spectralPlatform; + PlatformVariant variant = ((PlatformVariant) world.getBlockState(pos).getValue(BotaniaStateProps.PLATFORM_VARIANT)); + return variant == PlatformVariant.ABSTRUSE ? LexiconData.platform : variant == PlatformVariant.INFRANGIBLE ? null : LexiconData.spectralPlatform; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 125abd7c8..65fe7c48d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -14,6 +14,7 @@ import java.util.List; 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.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -26,6 +27,9 @@ import net.minecraft.world.World; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.PlatformVariant; +import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; @@ -46,7 +50,27 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu float f = 1F / 16F * 2F; setBlockBounds(f, 0F, f, 1F - f, 1F / 16F * 21F, 1F - f); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.MANA)); } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.PYLON_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((PylonVariant) state.getValue(BotaniaStateProps.PYLON_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta > PylonVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.values()[meta]); + } + @Override protected boolean shouldRegisterInNameSet() { return false; @@ -65,7 +89,7 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu @Override public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { - for(int i = 0; i < 3; i++) + for(int i = 0; i < PylonVariant.values().length; i++) par3.add(new ItemStack(par1, 1, i)); } @@ -86,7 +110,7 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu @Override public float getEnchantPowerBonus(World world, BlockPos pos) { - return world.getBlockMetadata(x, y, z) == 0 ? 8 : 15; + return world.getBlockState(pos).getValue(BotaniaStateProps.PYLON_VARIANT) == PylonVariant.MANA ? 8 : 15; } @Override @@ -96,8 +120,8 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - int meta = world.getBlockMetadata(x, y, z); - return meta == 0 ? LexiconData.pylon : meta == 1 ? LexiconData.alfhomancyIntro : LexiconData.gaiaRitual; + PylonVariant variant = ((PylonVariant) world.getBlockState(pos).getValue(BotaniaStateProps.PYLON_VARIANT)); + return variant == PylonVariant.MANA ? LexiconData.pylon : variant == PylonVariant.NATURA ? LexiconData.alfhomancyIntro : LexiconData.gaiaRitual; } @Override public boolean canStabaliseInfusion(World world, BlockPos pos) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java index 89997321e..0c4da460f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -19,6 +19,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MovingObjectPosition; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.item.equipment.tool.ToolCommons; public class TileEnderEye extends TileMod implements IUpdatePlayerListBox { @@ -28,7 +29,7 @@ public class TileEnderEye extends TileMod implements IUpdatePlayerListBox { if(worldObj.isRemote) return; - int meta = getBlockMetadata(); + boolean wasLooking = ((Boolean) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED)); int range = 80; List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range, range, range))); @@ -45,9 +46,8 @@ public class TileEnderEye extends TileMod implements IUpdatePlayerListBox { } } - int newMeta = looking ? 15 : 0; - if(newMeta != meta) - worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, newMeta, 1 | 2); + if(looking != wasLooking) + worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, looking), 1 | 2); } }