diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 3cf783c26..42074c307 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -38,6 +38,9 @@ public class BotaniaStateProps { // BlockDreamWood, BlockLivingWood public static final PropertyEnum LIVINGWOOD_VARIANT = PropertyEnum.create("variant", LivingWoodVariant.class); + // BlockForestDrum + public static final PropertyEnum DRUM_VARIANT = PropertyEnum.create("variant", DrumVariant.class); + // BlockLivingRock public static final PropertyEnum LIVINGROCK_VARIANT = PropertyEnum.create("variant", LivingRockVariant.class); @@ -47,8 +50,17 @@ public class BotaniaStateProps { // BlockPlatform public static final PropertyEnum PLATFORM_VARIANT = PropertyEnum.create("variant", PlatformVariant.class); + // BlockPrism + public static final PropertyBool HAS_LENS = PropertyBool.create("has_lens"); + // BlockPylon public static final PropertyEnum PYLON_VARIANT = PropertyEnum.create("variant", PylonVariant.class); + // BlockSpreader + public static final PropertyEnum SPREADER_VARIANT = PropertyEnum.create("variant", SpreaderVariant.class); + + // BlockStorage + public static final PropertyEnum STORAGE_VARIANT = PropertyEnum.create("variant", StorageVariant.class); + private BotaniaStateProps() {} } diff --git a/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java b/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java new file mode 100644 index 000000000..abf23d24e --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java @@ -0,0 +1,16 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum DrumVariant implements IStringSerializable { + WILD, + GATHERING, + CANOPY; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java b/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java new file mode 100644 index 000000000..333c62ae2 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java @@ -0,0 +1,17 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum SpreaderVariant implements IStringSerializable { + MANA, + REDSTONE, + ELVEN, + GAIA; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java b/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java new file mode 100644 index 000000000..e1376be3a --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java @@ -0,0 +1,18 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum StorageVariant implements IStringSerializable { + MANASTEEL, + TERRASTEEL, + ELEMENTIUM, + MANA_DIAMOND, + DRAGONSTONE; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java index 4310b77fc..7ef470d00 100644 --- a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java +++ b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java @@ -34,7 +34,7 @@ public class BlockManaBomb extends BlockMod implements IManaTrigger, ILexiconabl super(Material.wood); setHardness(12.0F); setStepSound(soundTypeWood); - setBlockName(LibBlockNames.MANA_BOMB); + setUnlocalizedName(LibBlockNames.MANA_BOMB); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index dbf76bfbf..761affae7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -49,14 +49,11 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab private static final int COUNT = 8; - IIcon[] doublePlantTopIcons, doublePlantBottomIcons; - IIcon[] doublePlantTopIconsAlt, doublePlantBottomIconsAlt; - final int offset; public BlockModDoubleFlower(boolean second) { offset = second ? 8 : 0; - setBlockName(LibBlockNames.DOUBLE_FLOWER + (second ? 2 : 1)); + setUnlocalizedName(LibBlockNames.DOUBLE_FLOWER + (second ? 2 : 1)); setHardness(0F); setStepSound(soundTypeGrass); setTickRandomly(false); @@ -152,55 +149,24 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab } @Override - public boolean isShearable(ItemStack item, IBlockAccess world, int x, int y, int z) { + public boolean isShearable(ItemStack item, IBlockAccess world, BlockPos pos) { return true; } @Override - public ArrayList onSheared(ItemStack item, IBlockAccess world, int x, int y, int z, int fortune) { + public List onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) { ArrayList ret = new ArrayList(); ret.add(new ItemStack(this, 1, world.getBlockMetadata(x, y, z) & 7)); return ret; } @Override - public ArrayList getDrops(World world, int x, int y, int z, int meta, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { return new ArrayList(); } @Override - public IIcon getIcon(int p_149691_1_, int p_149691_2_) { - boolean top = func_149887_c(p_149691_2_); - return (ConfigHandler.altFlowerTextures ? top ? doublePlantTopIconsAlt : doublePlantBottomIconsAlt : top ? doublePlantTopIcons : doublePlantBottomIcons)[p_149691_2_ & 7]; - } - - @Override - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { - int meta = world.getBlockMetadata(x, y, z); - boolean top = func_149887_c(meta); - if(top) - meta = world.getBlockMetadata(x, y - 1, z); - - return (ConfigHandler.altFlowerTextures ? top ? doublePlantBottomIconsAlt : doublePlantTopIconsAlt : top ? doublePlantBottomIcons : doublePlantTopIcons)[meta & 7]; - } - - @Override - public void registerBlockIcons(IIconRegister register) { - doublePlantTopIcons = new IIcon[COUNT]; - doublePlantBottomIcons = new IIcon[COUNT]; - doublePlantTopIconsAlt = new IIcon[COUNT]; - doublePlantBottomIconsAlt = new IIcon[COUNT]; - for(int i = 0; i < COUNT; i++) { - int off = offset(i); - doublePlantTopIcons[i] = IconHelper.forName(register, "flower" + off + "Tall0"); - doublePlantBottomIcons[i] = IconHelper.forName(register, "flower" + off + "Tall1"); - doublePlantTopIconsAlt[i] = IconHelper.forName(register, "flower" + off + "Tall0", BlockModFlower.ALT_DIR); - doublePlantBottomIconsAlt[i] = IconHelper.forName(register, "flower" + off + "Tall1", BlockModFlower.ALT_DIR); - } - } - - @Override - public int colorMultiplier(IBlockAccess blockAccess, int x, int y, int z) { + public int colorMultiplier(IBlockAccess blockAccess, BlockPos pos, int pass) { return 16777215; } @@ -216,7 +182,7 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab } @Override - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { + public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { int meta = par1World.getBlockMetadata(par2, par3, par4); float[] color = EntitySheep.fleeceColorTable[offset(meta & 7)]; diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 30e5a57e0..8a0f6c0af 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -135,7 +135,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl playerPositions.put(player.getCommandSenderName(), getCoordsAsString(world.provider.getDimensionId(), pos)); world.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:ding", 0.5F, 1F); } else { - dropBlockAsItem(world, x, y, z, new ItemStack(this)); + spawnAsEntity(world, pos, new ItemStack(this)); world.setBlockToAir(pos); if(!world.isRemote) world.playAuxSFX(2001, pos, Block.getIdFromBlock(this)); diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index b269dc79c..059aa7c66 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.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.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -26,6 +27,7 @@ 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.TileSimpleInventory; import vazkii.botania.common.block.tile.TileSparkChanger; @@ -44,10 +46,25 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable setResistance(10.0F); setStepSound(soundTypeStone); setUnlocalizedName(LibBlockNames.SPARK_CHANGER); - + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, true)); random = new Random(); } + @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 boolean isFullCube() { return false; @@ -66,14 +83,13 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable @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) { ((TileSparkChanger) world.getTileEntity(pos)).doSwap(); - 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/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 3058e0e5d..dd99b5f25 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -53,9 +53,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvider, ISpecialFlower, IWandable, ILexiconable, IWandHUD { - public static Map icons = new HashMap(); - public static Map iconsAlt = new HashMap(); - static { BotaniaAPI.subtilesForCreativeMenu.addAll(Arrays.asList(new String[] { // Misc @@ -123,6 +120,19 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid return new BlockState(this, BotaniaStateProps.COLOR); } + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMetadata(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta > 15) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); + } + // @Override todo 1.8 coloredlightscore dep // public int getLightValue(IBlockAccess world, BlockPos pos) { // int currentLight = ((TileSpecialFlower) world.getTileEntity(pos)).getLightValue(); diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 6c1ce0a13..bc7858a70 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -24,6 +24,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.StorageVariant; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.item.block.ItemBlockStorage; import vazkii.botania.common.lexicon.LexiconData; @@ -34,19 +36,18 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockStorage extends BlockMod implements ILexiconable { - private static final int SUBTYPES = 5; - public BlockStorage() { super(Material.iron); setHardness(3F); setResistance(10F); setStepSound(soundTypeMetal); setUnlocalizedName(LibBlockNames.STORAGE); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.MANASTEEL)); } @Override public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { - for(int i = 0; i < SUBTYPES; i++) + for(int i = 0; i < StorageVariant.values().length; i++) par3.add(new ItemStack(par1, 1, i)); } @@ -73,8 +74,8 @@ public class BlockStorage extends BlockMod implements ILexiconable { @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - int meta = world.getBlockMetadata(pos); - return meta == 0 ? LexiconData.pool : LexiconData.terrasteel; + StorageVariant variant = ((StorageVariant) world.getBlockState(pos).getValue(BotaniaStateProps.STORAGE_VARIANT)); + return variant == StorageVariant.MANASTEEL ? LexiconData.pool : LexiconData.terrasteel; } } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java index d224c1597..6b5964580 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -71,16 +71,6 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi return LibRenderIDs.idCorporeaCrystalCybe; } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - - @Override - public IIcon getIcon(int side, int meta) { - return ModBlocks.storage.getIcon(0, 2); - } - @Override public TileCorporeaBase createNewTileEntity(World world, int meta) { return new TileCorporeaCrystalCube(); diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java index 91dfa501e..6161a812e 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -11,11 +11,9 @@ package vazkii.botania.common.block.corporea; import net.minecraft.block.material.Material; -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; @@ -44,16 +42,6 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl return false; } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - - @Override - public IIcon getIcon(int side, int meta) { - return ModBlocks.storage.getIcon(0, 2); - } - @Override public int getRenderType() { return LibRenderIDs.idCorporeaIndex; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java index 01485c500..c0d809590 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java @@ -28,8 +28,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoolOverlayProvider { - IIcon[] icons; - public BlockAlchemyCatalyst() { this(LibBlockNames.ALCHEMY_CATALYST); } @@ -39,19 +37,7 @@ public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoo setHardness(2.0F); setResistance(10.0F); setStepSound(Block.soundTypeStone); - setBlockName(name); - } - - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[4]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(2, par1)]; + setUnlocalizedName(name); } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java index 82672bdf3..d87acfc5b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -11,19 +11,19 @@ package vazkii.botania.common.block.mana; 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.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; 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.lib.LibRenderIDs; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.ModBlocks; @@ -34,8 +34,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockBellows extends BlockModContainer implements ILexiconable { - private static final int[] META_ROTATIONS = new int[] { 3, 4, 2, 5 }; - public BlockBellows() { super(Material.wood); setHardness(2.0F); @@ -44,17 +42,27 @@ public class BlockBellows extends BlockModContainer implements ILexiconable { float f = (1F - 10 / 16F) / 2F; setBlockBounds(f, 0F, f, 1F - f, 10F / 16F, 1F - f); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } @Override - public void onBlockPlacedBy(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - int l = MathHelper.floor_double(p_149689_5_.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - p_149689_1_.setBlockMetadataWithNotify(p_149689_2_, p_149689_3_, p_149689_4_, META_ROTATIONS[l], 2); + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.CARDINALS); } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP + public int getMetaFromState(IBlockState state) { + return ((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS)).getHorizontalIndex(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getHorizontal(meta)); + } + + @Override + public void onBlockPlacedBy(World p_149689_1_, BlockPos pos, IBlockState state, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { + p_149689_1_.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, p_149689_5_.getHorizontalFacing()), 2); } @Override @@ -74,11 +82,6 @@ public class BlockBellows extends BlockModContainer implements ILexiconable { return false; } - @Override - public IIcon getIcon(int par1, int par2) { - return ModBlocks.livingwood.getIcon(par1, 0); - } - @Override public int getRenderType() { return LibRenderIDs.idBellows; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java index 2e9260cb7..5dc2c8114 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -13,10 +13,10 @@ package vazkii.botania.common.block.mana; 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.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -25,10 +25,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -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.api.wand.IWandHUD; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.BlockModContainer; @@ -37,6 +37,8 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.swing.text.html.ObjectView; + public class BlockBrewery extends BlockModContainer implements ILexiconable, IWandHUD { Random random; @@ -51,11 +53,22 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa setStepSound(soundTypeStone); random = new Random(); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @Override - public IIcon getIcon(int side, int meta) { - return Blocks.cobblestone.getIcon(side, meta); + 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 @@ -63,7 +76,7 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa TileBrewery brew = (TileBrewery) par1World.getTileEntity(pos); if(par5EntityPlayer.isSneaking()) { - if(brew.recipe == null && par1World.getBlockMetadata(par2, par3, par4) == 0) + if(brew.recipe == null && !((Boolean) state.getValue(BotaniaStateProps.POWERED))) for(int i = brew.getSizeInventory() - 1; i >= 0; i--) { ItemStack stackAt = brew.getStackInSlot(i); if(stackAt != null) { @@ -71,7 +84,7 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa if(!par5EntityPlayer.inventory.addItemStackToInventory(copy)) par5EntityPlayer.dropPlayerItemWithRandomChoice(copy, false); brew.setInventorySlotContents(i, null); - par1World.func_147453_f(pos, this); + par1World.updateComparatorOutputLevel(pos, this); break; } } @@ -115,7 +128,7 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa } } - par1World.func_147453_f(par2, par3, par4, par5); + par1World.updateComparatorOutputLevel(pos, state.getBlock()); } super.breakBlock(par1World, pos, state); @@ -132,11 +145,6 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa return brew.signal; } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - @Override public int getRenderType() { return LibRenderIDs.idBrewery; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java index b4fbf357a..7b8a74365 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -11,12 +11,10 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; 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.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -29,8 +27,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockDistributor extends BlockModContainer implements ILexiconable { - IIcon iconSide, iconTop; - public BlockDistributor() { super(Material.rock); setHardness(2.0F); @@ -39,17 +35,6 @@ public class BlockDistributor extends BlockModContainer implements ILexiconable setUnlocalizedName(LibBlockNames.DISTRIBUTOR); } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - iconTop = IconHelper.forBlock(par1IconRegister, this, 0); - iconSide = IconHelper.forBlock(par1IconRegister, this, 1); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return par1 == 0 ? ModBlocks.livingrock.getIcon(0, 0) : par1 == 1 ? iconTop : iconSide; - } - @Override public TileEntity createNewTileEntity(World world, int meta) { return new TileDistributor(); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index 4f88d073b..1580b855a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -16,7 +16,6 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -28,7 +27,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -44,7 +42,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockEnchanter extends BlockModContainer implements IWandable, ILexiconable, IWandHUD { Random random; - public static IIcon overlay; public BlockEnchanter() { super(Material.rock); @@ -62,12 +59,6 @@ public class BlockEnchanter extends BlockModContainer implements IWandable, ILex return false; } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - super.registerBlockIcons(par1IconRegister); - overlay = IconHelper.forBlock(par1IconRegister, this, "Overlay"); - } - @Override public TileEntity createNewTileEntity(World world, int meta) { return new TileEnchanter(); @@ -137,7 +128,7 @@ public class BlockEnchanter extends BlockModContainer implements IWandable, ILex } } - par1World.func_147453_f(par2, par3, par4, par5); + par1World.updateComparatorOutputLevel(pos, state.getBlock()); super.breakBlock(par1World, pos, state); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index dc6712c96..3185feca8 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -16,8 +16,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.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.item.EntityItem; @@ -29,13 +29,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import vazkii.botania.api.internal.IManaBurst; 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.state.enums.DrumVariant; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.ItemGrassHorn; @@ -46,10 +47,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexiconable { - IIcon iconBases, iconFaces; - IIcon iconBasesA, iconFacesA; - IIcon iconBasesB, iconFacesB; - public BlockForestDrum() { super(Material.wood); float f = 1F / 16F; @@ -57,7 +54,26 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona setHardness(2.0F); setStepSound(soundTypeWood); - setBlockName(LibBlockNames.FOREST_DRUM); + setUnlocalizedName(LibBlockNames.FOREST_DRUM); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.DRUM_VARIANT, DrumVariant.WILD)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.DRUM_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((DrumVariant) state.getValue(BotaniaStateProps.DRUM_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta > DrumVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.DRUM_VARIANT, DrumVariant.values()[meta]); } @Override @@ -66,9 +82,9 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona } @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 @@ -86,46 +102,29 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona return state.getBlock().getMetaFromState(state); } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - iconBases = IconHelper.forBlock(par1IconRegister, this, 0); - iconFaces = IconHelper.forBlock(par1IconRegister, this, 1); - iconBasesA = IconHelper.forBlock(par1IconRegister, this, 2); - iconFacesA = IconHelper.forBlock(par1IconRegister, this, 3); - iconBasesB = IconHelper.forBlock(par1IconRegister, this, 4); - iconFacesB = IconHelper.forBlock(par1IconRegister, this, 5); - } - @Override public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 3; i++) list.add(new ItemStack(item, 1, i)); } - @Override - public IIcon getIcon(int side, int meta) { - boolean animal = meta == 1; - boolean tree = meta == 2; - return side < 2 ? animal ? iconBasesA : tree ? iconBasesB : iconBases : animal ? iconFacesA : tree ? iconFacesB : iconFaces; - } - @Override public void onBurstCollision(IManaBurst burst, World world, BlockPos pos) { if(burst.isFake()) return; - - if(world.getBlockMetadata(x, y, z) == 0) - ItemGrassHorn.breakGrass(world, null, 0, x, y, z); - else if(world.getBlockMetadata(x, y, z) == 2) - ItemGrassHorn.breakGrass(world, null, 1, x, y, z); + DrumVariant variant = ((DrumVariant) world.getBlockState(pos).getValue(BotaniaStateProps.DRUM_VARIANT)); + if(variant == DrumVariant.WILD) + ItemGrassHorn.breakGrass(world, null, 0, pos); + else if(variant == DrumVariant.CANOPY) + ItemGrassHorn.breakGrass(world, null, 1, pos); else if(!world.isRemote) { int range = 10; - List entities = world.getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(x - range, y - range, z - range, x + range + 1, y + range + 1, z + range + 1)); + List entities = world.getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range + 1, range + 1, range + 1))); List shearables = new ArrayList(); ItemStack stack = new ItemStack(this, 1, 1); for(EntityLiving entity : entities) { - if(entity instanceof IShearable && ((IShearable) entity).isShearable(stack, world, (int) entity.posX, (int) entity.posY, (int) entity.posZ)) { + if(entity instanceof IShearable && ((IShearable) entity).isShearable(stack, world, new BlockPos(entity))) { shearables.add(entity); } else if(entity instanceof EntityCow) { List items = world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(entity.posX, entity.posY, entity.posZ, entity.posX + entity.width, entity.posY + entity.height, entity.posZ + entity.width)); @@ -152,7 +151,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona if(sheared > 4) break; - List stacks = ((IShearable) entity).onSheared(stack, world, (int) entity.posX, (int) entity.posY, (int) entity.posZ, 0); + List stacks = ((IShearable) entity).onSheared(stack, world, new BlockPos(entity), 0); if(stacks != null) for(ItemStack wool : stacks) { EntityItem ent = entity.entityDropItem(wool, 1.0F); @@ -166,20 +165,21 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona if(!world.isRemote) for(int i = 0; i < 10; i++) - world.playSoundEffect(x, y, z, "note.bd", 1F, 1F); - else world.spawnParticle(EnumParticleTypes.NOTE, x + 0.5, y + 1.2, z + 0.5D, 1.0 / 24.0, 0, 0); + world.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "note.bd", 1F, 1F); + else world.spawnParticle(EnumParticleTypes.NOTE, pos.getX() + 0.5, pos.getY() + 1.2, pos.getZ() + 0.5D, 1.0 / 24.0, 0, 0); } @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - int meta = world.getBlockMetadata(x, y, z); + DrumVariant variant = ((DrumVariant) world.getBlockState(pos).getValue(BotaniaStateProps.DRUM_VARIANT)); - switch(meta) { - case 1: + switch(variant) { + case GATHERING: return LexiconData.gatherDrum; - case 2: + case CANOPY: return LexiconData.canopyDrum; + case WILD: default: return LexiconData.forestDrum; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java index 4f5b0b505..715e98217 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -14,8 +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.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -23,12 +23,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; 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.internal.IManaBurst; 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.BlockModContainer; import vazkii.botania.common.block.tile.mana.TileManaDetector; @@ -37,26 +37,28 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockManaDetector extends BlockModContainer implements ILexiconable { - IIcon[] icons; - public BlockManaDetector() { super(Material.rock); setHardness(2.0F); setResistance(10.0F); setStepSound(Block.soundTypeStone); setUnlocalizedName(LibBlockNames.MANA_DETECTOR); + 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[Math.min(icons.length - 1, par2)]; + 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 @@ -66,7 +68,7 @@ public class BlockManaDetector extends BlockModContainer implements ILexiconable @Override public int isProvidingWeakPower(IBlockAccess par1iBlockAccess, BlockPos pos, IBlockState state, EnumFacing side) { - return par1iBlockAccess.getBlockMetadata(par2, par3, par4) != 0 ? 15 : 0; + return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 15 : 0; } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java index 02f25276b..9b9c7584f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -12,12 +12,10 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; 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.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -40,12 +38,6 @@ public class BlockManaVoid extends BlockModContainer implements ILexiconable, IP setUnlocalizedName(LibBlockNames.MANA_VOID); } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - blockIcon = IconHelper.forBlock(par1IconRegister, this, 0); - overlay = IconHelper.forBlock(par1IconRegister, this, 1); - } - @Override public TileEntity createNewTileEntity(World world, int id) { return new TileManaVoid(); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index 7fa2c23e1..b81684d6b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -18,7 +18,6 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -30,10 +29,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; 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 net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -55,8 +52,6 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, boolean lastFragile = false; - public static IIcon manaIcon; - public BlockPool() { super(Material.rock); setHardness(2.0F); @@ -77,11 +72,6 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, return super.setUnlocalizedName(par1Str); } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - manaIcon = IconHelper.forName(par1IconRegister, "manaWater"); - } - @Override public int damageDropped(IBlockState state) { return state.getBlock().getMetaFromState(state); @@ -156,11 +146,6 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, return false; } - @Override - public IIcon getIcon(int par1, int par2) { - return ModBlocks.livingrock.getIcon(par1, 0); - } - @Override public int getRenderType() { return LibRenderIDs.idPool; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index b980fece5..f976c3497 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.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.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; @@ -31,6 +32,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.IManaTrigger; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileSimpleInventory; @@ -41,7 +43,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexiconable { Random random; - IIcon[] icons; public BlockPrism() { super(Material.glass); @@ -51,20 +52,28 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi setUnlocalizedName(LibBlockNames.PRISM); float f = 0.25F; setBlockBounds(f, 0F, f, 1F - f, 1F, 1F - f); - + setDefaultState(blockState.getBaseState() + .withProperty(BotaniaStateProps.POWERED, false) + .withProperty(BotaniaStateProps.HAS_LENS, false) + ); random = new Random(); } @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, BotaniaStateProps.HAS_LENS); } @Override - public IIcon getIcon(int side, int meta) { - return side > 1 ? icons[1] : icons[0]; + public int getMetaFromState(IBlockState state) { + return (((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 8 : 0) + + (((Boolean) state.getValue(BotaniaStateProps.HAS_LENS)) ? 1 : 0); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.POWERED, (meta & 8) > 0) + .withProperty(BotaniaStateProps.HAS_LENS, (meta & 1) > 0); } @Override @@ -97,7 +106,6 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi ItemStack lens = prism.getStackInSlot(0); ItemStack heldItem = par5EntityPlayer.getCurrentEquippedItem(); boolean isHeldItemLens = heldItem != null && heldItem.getItem() instanceof ILens; - int meta = par1World.getBlockMetadata(par2, par3, par4); if(lens == null && isHeldItemLens) { if(!par5EntityPlayer.capabilities.isCreativeMode) @@ -105,30 +113,30 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi prism.setInventorySlotContents(0, heldItem.copy()); prism.markDirty(); - par1World.setBlockMetadataWithNotify(par2, par3, par4, meta | 1, 1 | 2); + par1World.setBlockState(pos, state.withProperty(BotaniaStateProps.HAS_LENS, true), 1 | 2); } else if(lens != null) { ItemStack add = lens.copy(); if(!par5EntityPlayer.inventory.addItemStackToInventory(add)) par5EntityPlayer.dropPlayerItemWithRandomChoice(add, false); prism.setInventorySlotContents(0, null); prism.markDirty(); - par1World.setBlockMetadataWithNotify(par2, par3, par4, meta & 14, 1 | 2); + par1World.setBlockState(pos, state.withProperty(BotaniaStateProps.HAS_LENS, false), 1 | 2); +// par1World.setBlockMetadataWithNotify(par2, par3, par4, meta & 14, 1 | 2); } return true; } @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); - boolean powered = (meta & 8) != 0; + 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(!world.isRemote) { if(power && !powered) - world.setBlockMetadataWithNotify(x, y, z, meta | 8, 1 | 2); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, true), 1 | 2); else if(!power && powered) - world.setBlockMetadataWithNotify(x, y, z, meta & -9, 1 | 2); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false), 1 | 2); } } @@ -168,7 +176,7 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi } } - par1World.func_147453_f(par2, par3, par4, par5); + par1World.updateComparatorOutputLevel(pos, state.getBlock()); } super.breakBlock(par1World, pos, state); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java index da677ff72..9c2667139 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -12,18 +12,14 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.material.Material; 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.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 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.lib.LibRenderIDs; @@ -42,7 +38,7 @@ public class BlockPump extends BlockModContainer implements ILexiconable { setResistance(10.0F); setStepSound(soundTypeStone); setUnlocalizedName(LibBlockNames.PUMP); - setBlockBounds(true); + setBlockBounds(EnumFacing.Axis.X); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } @@ -59,22 +55,12 @@ public class BlockPump extends BlockModContainer implements ILexiconable { public void setBlockBounds(EnumFacing.Axis axis) { if (axis == EnumFacing.Axis.X) { - setBlockBounds(0F, 0F, 0.25F, 1F, 0.5F, 0.75F) + setBlockBounds(0F, 0F, 0.25F, 1F, 0.5F, 0.75F); } else if (axis == EnumFacing.Axis.Z) { setBlockBounds(0.25F, 0F, 0F, 0.75F, 0.5F, 1F); } } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - - @Override - public IIcon getIcon(int par1, int par2) { - return ModBlocks.livingrock.getIcon(0, 0); - } - @Override public int getRenderType() { return LibRenderIDs.idPump; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index 92754b0a8..3cdd85795 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -16,7 +16,6 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -24,7 +23,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -40,7 +38,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockRuneAltar extends BlockModContainer implements IWandable, IWandHUD, ILexiconable { Random random; - IIcon[] icons; public BlockRuneAltar() { super(Material.rock); @@ -63,13 +60,6 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, IWan return false; } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[3]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - } - @Override public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing side, float par7, float par8, float par9) { TileRuneAltar altar = (TileRuneAltar) par1World.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java index 5847c955f..d399104c4 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block.mana; import java.util.List; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -48,11 +47,6 @@ public class BlockSpawnerClaw extends BlockModContainer implements ILexiconable list.add(new ItemStack(Blocks.mob_spawner)); } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - //NO-OP - } - @Override public boolean isOpaqueCube() { return false; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index 5ce794f20..2d6b29c3f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -16,10 +16,10 @@ import java.util.Random; import net.minecraft.block.Block; 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.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -32,11 +32,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -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.mana.ILens; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.SpreaderVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.api.wand.IWireframeAABBProvider; @@ -59,10 +60,28 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand setHardness(2.0F); setStepSound(soundTypeWood); setUnlocalizedName(LibBlockNames.SPREADER); - + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.SPREADER_VARIANT, SpreaderVariant.MANA)); random = new Random(); } + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.SPREADER_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((SpreaderVariant) state.getValue(BotaniaStateProps.SPREADER_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta > SpreaderVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.SPREADER_VARIANT, SpreaderVariant.values()[meta]); + } + @Override protected boolean shouldRegisterInNameSet() { return false; @@ -84,7 +103,7 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand public void onBlockPlacedBy(World par1World, BlockPos pos, IBlockState state, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { EnumFacing orientation = BlockPistonBase.getFacingFromEntity(par1World, pos, par5EntityLivingBase); TileSpreader spreader = (TileSpreader) par1World.getTileEntity(pos); - par1World.setBlockMetadataWithNotify(par2, par3, par4, par6ItemStack.getItemDamage(), 1 | 2); + par1World.setBlockState(pos, getStateFromMeta(par6ItemStack.getItemDamage()), 1 | 2); switch(orientation) { case DOWN: @@ -122,11 +141,6 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand return false; } - @Override - public IIcon getIcon(int par1, int par2) { - return par2 >= 2 ? ModBlocks.dreamwood.getIcon(par1, 0) : ModBlocks.livingwood.getIcon(par1, 0); - } - @Override public int getRenderType() { return LibRenderIDs.idSpreader; @@ -238,8 +252,8 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - int meta = world.getBlockMetadata(pos); - return meta == 0 ? LexiconData.spreader : meta == 1 ? LexiconData.redstoneSpreader : LexiconData.dreamwoodSpreader; + SpreaderVariant variant = ((SpreaderVariant) world.getBlockState(pos).getValue(BotaniaStateProps.SPREADER_VARIANT)); + return variant == SpreaderVariant.MANA ? LexiconData.spreader : variant == SpreaderVariant.REDSTONE ? LexiconData.redstoneSpreader : LexiconData.dreamwoodSpreader; } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java index 2e37b5e11..befe73652 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -11,12 +11,10 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; 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.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -29,9 +27,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockTerraPlate extends BlockModContainer implements ILexiconable { - public static IIcon overlay; - IIcon[] icons; - public BlockTerraPlate() { super(Material.iron); setBlockBounds(0F, 0F, 0F, 1F, 3F / 16F, 1F); @@ -56,19 +51,6 @@ public class BlockTerraPlate extends BlockModContainer implements ILexiconable { return false; } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[3]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - overlay = IconHelper.forBlock(par1IconRegister, this, "Overlay"); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(2, par1)]; - } - @Override public TileEntity createNewTileEntity(World world, int meta) { return new TileTerraPlate(); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java index 312858917..cd6eb5501 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -13,13 +13,11 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.IIconRegister; 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.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -33,8 +31,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockTurntable extends BlockModContainer implements IWandable, IWandHUD, ILexiconable { - IIcon[] icons; - public BlockTurntable() { super(Material.wood); setHardness(2.0F); @@ -42,18 +38,6 @@ public class BlockTurntable extends BlockModContainer implements IWandable, IWan setUnlocalizedName(LibBlockNames.TURNTABLE); } - @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); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return par1 == 1 ? icons[0] : icons[1]; - } - @Override public TileEntity createNewTileEntity(World world, int meta) { return new TileTurntable();