diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index 040f3c63e..d15e5fbe4 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -21,6 +21,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -126,7 +127,7 @@ public class SubTileEntity { /** * Called when a player right clicks this sub tile. */ - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { return false; } + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float hitX, float hitY, float hitZ) { return false; } /** * Called when this sub tile is added to the world. diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 388f985e3..853c7ee2e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -35,7 +36,7 @@ public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable public BlockAlfPortal() { super(Material.wood); setHardness(10F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.ALF_PORTAL); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ALFPORTAL_STATE, AlfPortalState.OFF)); } @@ -82,8 +83,8 @@ public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable } @Override - public int getLightValue(IBlockAccess world, BlockPos pos) { - return world.getBlockState(pos).getBlock() == this && world.getBlockState(pos).getValue(BotaniaStateProps.ALFPORTAL_STATE) != AlfPortalState.OFF ? 15 : 0; + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + return state.getValue(BotaniaStateProps.ALFPORTAL_STATE) != AlfPortalState.OFF ? 15 : 0; } } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 04604f0dd..ec648f938 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -15,6 +15,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -45,7 +46,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { public BlockAltGrass() { super(Material.grass); setHardness(0.6F); - setStepSound(soundTypeGrass); + setSoundType(SoundType.PLANT); setUnlocalizedName(LibBlockNames.ALT_GRASS); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.DRY)); setTickRandomly(true); @@ -109,37 +110,37 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } @Override - public boolean canSustainPlant(IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { + public boolean canSustainPlant(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { EnumPlantType type = plantable.getPlantType(world, pos.down()); return type == EnumPlantType.Plains || type == EnumPlantType.Beach; } @Override - public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random r) { + public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random r) { if (state.getBlock() != this) return; AltGrassVariant variant = state.getValue(BotaniaStateProps.ALTGRASS_VARIANT); switch(variant) { - case DRY: // Dry + case DRY: break; - case GOLDEN: // Golden + case GOLDEN: break; - case VIVID: // Vivid + case VIVID: break; - case SCORCHED: // Scorched + case SCORCHED: if(r.nextInt(80) == 0) world.spawnParticle(EnumParticleTypes.FLAME, pos.getX() + r.nextFloat(), pos.getY() + 1.1, pos.getZ() + r.nextFloat(), 0, 0, 0); break; - case INFUSED: // Infused + case INFUSED: if(r.nextInt(100) == 0) Botania.proxy.sparkleFX(world, pos.getX() + r.nextFloat(), pos.getY() + 1.05, pos.getZ() + r.nextFloat(), 0F, 1F, 1F, r.nextFloat() * 0.2F + 1F, 5); break; - case MUTATED: // Mutated + case MUTATED: if(r.nextInt(100) == 0) { if(r.nextInt(100) > 25) Botania.proxy.sparkleFX(world, pos.getX() + r.nextFloat(), pos.getY() + 1.05, pos.getZ() + r.nextFloat(), 1F, 0F, 1F, r.nextFloat() * 0.2F + 1F, 5); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index d7b2a30ed..a7f813a7a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -14,6 +14,7 @@ import java.util.List; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -26,6 +27,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.BlockRenderLayer; @@ -53,24 +56,26 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockAltar extends BlockMod implements ILexiconable { - Random random; + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.125, 0.125, 0.125, 0.875, 20.0/16, 0.875); + + private final Random random = new Random(); protected BlockAltar() { super(Material.rock); setHardness(3.5F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.ALTAR); - float f = 1F / 16F * 2F; - setBlockBounds(f, f, f, 1F - f, 1F / 16F * 20F, 1F - f); - - random = new Random(); - setDefaultState(blockState.getBaseState() .withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.DEFAULT) ); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.ALTAR_VARIANT); @@ -134,14 +139,13 @@ public class BlockAltar extends BlockMod implements ILexiconable { } @Override - public int getLightValue(IBlockAccess world, BlockPos pos) { + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { TileAltar tile = (TileAltar) world.getTileEntity(pos); return (tile != null && tile.hasLava) ? 15 : 0; } @Override - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing par6, float par7, float par8, float par9) { - ItemStack stack = par5EntityPlayer.getCurrentEquippedItem(); + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9) { TileAltar tile = (TileAltar) par1World.getTileEntity(pos); if(par5EntityPlayer.isSneaking()) { for(int i = tile.getSizeInventory() - 1; i >= 0; i--) { @@ -307,12 +311,12 @@ public class BlockAltar extends BlockMod implements ILexiconable { } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World par1World, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World par1World, BlockPos pos) { TileAltar altar = (TileAltar) par1World.getTileEntity(pos); return altar.hasWater ? 15 : 0; } diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 000d3c793..1a66c6cad 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block; import java.util.Random; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -21,6 +22,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; @@ -41,13 +45,25 @@ public class BlockAvatar extends BlockMod implements ILexiconable { protected BlockAvatar() { super(Material.wood); setHardness(2.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.AVATAR); - setBlockBounds(EnumFacing.Axis.Z); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.NORTH)); random = new Random(); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + float f = 1F / 16F; + float w = f * 9; + float l = f * 6; + float ws = (1F - w) / 2; + float ls = (1F - l) / 2; + + if(state.getValue(BotaniaStateProps.CARDINALS).getAxis() == EnumFacing.Axis.Z) + setBlockBounds(ws, 0F, ls, 1F - ws, 1F + f, 1F - ls); + else setBlockBounds(ls, 0F, ws, 1F - ls, 1F + f, 1F - ws); + } + @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.CARDINALS); @@ -67,10 +83,9 @@ public class BlockAvatar extends BlockMod implements ILexiconable { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stackOnPlayer, EnumFacing s, float xs, float ys, float zs) { TileAvatar avatar = (TileAvatar) world.getTileEntity(pos); ItemStack stackOnAvatar = avatar.getItemHandler().getStackInSlot(0); - ItemStack stackOnPlayer = player.getCurrentEquippedItem(); if(stackOnAvatar != null) { ItemStack copyStack = stackOnAvatar.copy(); avatar.getItemHandler().setStackInSlot(0, null); @@ -87,23 +102,6 @@ public class BlockAvatar extends BlockMod implements ILexiconable { return false; } - @Override - public void setBlockBoundsBasedOnState(IBlockAccess w, BlockPos pos) { - setBlockBounds(w.getBlockState(pos).getValue(BotaniaStateProps.CARDINALS).getAxis()); - } - - public void setBlockBounds(EnumFacing.Axis horiz) { - float f = 1F / 16F; - float w = f * 9; - float l = f * 6; - float ws = (1F - w) / 2; - float ls = (1F - l) / 2; - - if(horiz == EnumFacing.Axis.Z) - setBlockBounds(ws, 0F, ls, 1F - ws, 1F + f, 1F - ls); - else setBlockBounds(ls, 0F, ws, 1F - ls, 1F + f, 1F - ws); - } - @Override public void breakBlock(World par1World, BlockPos pos, IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); @@ -158,8 +156,8 @@ public class BlockAvatar extends BlockMod implements ILexiconable { } @Override - public int getRenderType() { - return 2; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index d65c60037..2619b42ec 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -40,7 +41,7 @@ public class BlockBifrost extends BlockMod implements ILexiconable { setLightOpacity(0); setLightLevel(1F); setBlockUnbreakable(); - setStepSound(soundTypeGlass); + setSoundType(SoundType.GLASS); MinecraftForge.EVENT_BUS.register(this); } @@ -55,19 +56,14 @@ public class BlockBifrost extends BlockMod implements ILexiconable { } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(ModItems.rainbowRod); } - public boolean shouldSideBeRendered1(IBlockAccess p_149646_1_, BlockPos pos, EnumFacing side) { - Block block = p_149646_1_.getBlockState(pos).getBlock(); - - return block == this ? false : super.shouldSideBeRendered(p_149646_1_, pos, side); - } - @Override - public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, BlockPos pos, EnumFacing side) { - return shouldSideBeRendered1(p_149646_1_, pos, side.getOpposite()); + public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + Block block = world.getBlockState(pos).getBlock(); + return block != this && super.shouldSideBeRendered(state, world, pos, side); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index 010de0893..12488bcda 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -36,7 +37,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { setLightOpacity(0); setHardness(0.3F); setLightLevel(1F); - setStepSound(soundTypeGlass); + setSoundType(SoundType.GLASS); setTickRandomly(true); } @@ -45,19 +46,14 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { return false; } - public boolean shouldSideBeRendered1(IBlockAccess p_149646_1_, BlockPos pos, EnumFacing side) { - Block block = p_149646_1_.getBlockState(pos).getBlock(); - - return block == this ? false : super.shouldSideBeRendered(p_149646_1_, pos, side); + @Override + public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + Block block = world.getBlockState(pos).getBlock(); + return block != this && super.shouldSideBeRendered(state, world, pos, side); } @Override - public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, BlockPos pos, EnumFacing side) { - return shouldSideBeRendered1(p_149646_1_, pos, side.getOpposite()); - } - - @Override - public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random rand) { + public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { if(rand.nextBoolean()) Botania.proxy.sparkleFX(world, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index 0a88ef3ff..4340fbcba 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -18,6 +18,8 @@ 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.EnumBlockRenderType; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; @@ -32,23 +34,22 @@ public abstract class BlockCamo extends BlockMod { super(par2Material); } - public static boolean isValidBlock(Block block) { - return block.isOpaqueCube(IBlockState state) || block.getRenderType() == 3; + public static boolean isValidBlock(IBlockState state) { + return state.isOpaqueCube() || state.getRenderType() == EnumBlockRenderType.MODEL; } @Override - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack currentStack, EnumFacing par6, float par7, float par8, float par9) { TileEntity tile = par1World.getTileEntity(pos); if(tile instanceof TileCamo) { TileCamo camo = (TileCamo) tile; - ItemStack currentStack = par5EntityPlayer.getCurrentEquippedItem(); if(currentStack == null) currentStack = new ItemStack(Block.getBlockFromName("air"), 1, 0); boolean doChange = true; - Block block = null; + IBlockState testState = null; checkChange : { if(currentStack.getItem() != Item.getItemFromBlock(Block.getBlockFromName("air"))) { if(Item.getIdFromItem(currentStack.getItem()) == 0) { @@ -56,21 +57,21 @@ public abstract class BlockCamo extends BlockMod { break checkChange; } - block = Block.getBlockFromItem(currentStack.getItem()); - if(block == null || !isValidBlock(block) || block instanceof BlockCamo || block.getMaterial() == Material.air) + testState = Block.getBlockFromItem(currentStack.getItem()).getStateFromMeta(currentStack.getItemDamage()); + if(testState == null || !isValidBlock(testState) || testState.getBlock() instanceof BlockCamo || testState.getMaterial() == Material.air) doChange = false; } } if(doChange && currentStack.getItem() != null) { IBlockState changeState = Block.getBlockFromItem(currentStack.getItem()).getStateFromMeta(currentStack.getItemDamage()); - if(block instanceof BlockDirectional) { + if(testState.getBlock() instanceof BlockDirectional) { if (BlockDirectional.FACING.getAllowedValues().contains(par6.getOpposite())) { changeState = changeState.withProperty(BlockDirectional.FACING, par6.getOpposite()); } } camo.camoState = changeState; - par1World.markBlockForUpdate(pos); + par1World.notifyBlockUpdate(pos, state, state, 8); return true; } diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index c10e620fb..63d378f47 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import java.util.ArrayList; import java.util.List; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -32,7 +33,7 @@ public class BlockCell extends BlockMod implements ILexiconable { public BlockCell() { super(Material.gourd); setUnlocalizedName(LibBlockNames.CELL_BLOCK); - setStepSound(soundTypeCloth); + setSoundType(SoundType.CLOTH); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index 82c788822..2ff704596 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -13,12 +13,16 @@ package vazkii.botania.common.block; import java.util.ArrayList; import java.util.List; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; @@ -31,15 +35,19 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockCocoon extends BlockMod implements ILexiconable { + private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 0, 3.0/16, 0.125, 0.875, 0.125); + protected BlockCocoon() { super(Material.cloth); setHardness(3.0F); setResistance(50.0F); - setStepSound(soundTypeCloth); + setSoundType(SoundType.CLOTH); setUnlocalizedName(LibBlockNames.COCOON); - float f = 3F / 16F; - float f1 = 14F / 16F; - setBlockBounds(f, 0F, f, 1F - f, f1, 1F - f); + } + + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; } @Override @@ -53,14 +61,13 @@ public class BlockCocoon extends BlockMod implements ILexiconable { } @Override - public int getRenderType() { - return 2; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack item, EnumFacing s, float xs, float ys, float zs) { TileCocoon cocoon = (TileCocoon) world.getTileEntity(pos); - ItemStack item = player.getCurrentEquippedItem(); if(cocoon.emeraldsGiven < TileCocoon.MAX_EMERALDS && item != null && item.getItem() == Items.emerald) { if(!player.capabilities.isCreativeMode) item.stackSize--; diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index 2f851babe..fbf629b1c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block; import java.util.Random; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -34,7 +35,7 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable { public BlockEnchantedSoil() { super(Material.grass); setHardness(0.6F); - setStepSound(soundTypeGrass); + setSoundType(SoundType.PLANT); setUnlocalizedName(LibBlockNames.ENCHANTED_SOIL); } @@ -49,7 +50,7 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable { } @Override - public boolean canSustainPlant(IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { + public boolean canSustainPlant(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { return plantable.getPlantType(world, pos.down()) == EnumPlantType.Plains; } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index 7df77efa4..b106619cf 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -33,7 +34,7 @@ public class BlockEnderEye extends BlockMod implements ILexiconable { super(Material.iron); setHardness(3F); setResistance(10F); - setStepSound(soundTypeMetal); + setSoundType(SoundType.METAL); setUnlocalizedName(LibBlockNames.ENDER_EYE_BLOCK); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @@ -54,12 +55,12 @@ public class BlockEnderEye extends BlockMod implements ILexiconable { } @Override - public boolean canProvidePower() { + public boolean canProvidePower(IBlockState state) { return true; } @Override - public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { return state.getValue(BotaniaStateProps.POWERED) ? 15 : 0; } diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index ddad5a95b..089db2146 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -21,6 +21,7 @@ import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; @@ -32,16 +33,22 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockFakeAir extends BlockMod { + private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 0, 0, 0); + public BlockFakeAir() { super(Material.air); setUnlocalizedName(LibBlockNames.FAKE_AIR); - setBlockBounds(0, 0, 0, 0, 0, 0); setTickRandomly(true); } @Override - public int getRenderType() { - return -1; + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + + @Override + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.INVISIBLE; } @Override @@ -82,7 +89,7 @@ public class BlockFakeAir extends BlockMod { } @Override - public boolean isBlockNormalCube() { + public boolean isBlockNormalCube(IBlockState state) { return false; } @@ -92,7 +99,7 @@ public class BlockFakeAir extends BlockMod { } @Override - public boolean canEntityDestroy(IBlockAccess world, BlockPos pos, Entity e) { + public boolean canEntityDestroy(IBlockState state, IBlockAccess world, BlockPos pos, Entity e) { return false; } @@ -102,7 +109,7 @@ public class BlockFakeAir extends BlockMod { } @Override - public boolean canBeReplacedByLeaves(IBlockAccess world, BlockPos pos) { + public boolean canBeReplacedByLeaves(IBlockState state, IBlockAccess world, BlockPos pos) { return true; } @@ -117,12 +124,12 @@ public class BlockFakeAir extends BlockMod { } @Override - public AxisAlignedBB getCollisionBoundingBox(World par1World, BlockPos pos, IBlockState state) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World par1World, BlockPos pos) { return null; } @Override - public boolean isAir(IBlockAccess world, BlockPos pos) { + public boolean isAir(IBlockState state, IBlockAccess world, BlockPos pos) { return true; } diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 9c515defc..19238fb77 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -40,7 +41,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { super(Material.gourd); setUnlocalizedName(LibBlockNames.FEL_PUMPKIN); setHardness(1F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); MinecraftForge.EVENT_BUS.register(this); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index e82713dd6..af6140032 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -26,6 +26,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.RayTraceResult; @@ -83,7 +84,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public int getLightValue(IBlockAccess world, BlockPos pos) { + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { TileEntity tile = world.getTileEntity(pos); int currentLight = tile instanceof TileSpecialFlower ? ((TileSpecialFlower) tile).getLightValue() : -1; if(currentLight == -1) @@ -92,32 +93,32 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World world, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { return ((TileSpecialFlower) world.getTileEntity(pos)).getComparatorInputOverride(); } @Override - public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { return ((TileSpecialFlower) world.getTileEntity(pos)).getPowerLevel(side); } @Override - public int getStrongPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { - return getWeakPower(world, pos, state, side); + public int getStrongPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + return getWeakPower(state, world, pos, side); } @Override - public boolean canProvidePower() { + public boolean canProvidePower(IBlockState state) { return true; } @Override - public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { + public void randomDisplayTick(IBlockState state, World par1World, BlockPos pos, Random par5Random) { // NO-OP } @@ -131,9 +132,8 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { String name = ((TileSpecialFlower) world.getTileEntity(pos)).subTileName; - IBlockState state = world.getBlockState(pos); return ItemBlockSpecialFlower.ofType(new ItemStack(state.getBlock()), name); } @@ -177,8 +177,8 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { - return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, side, hitX, hitY, hitZ) || super.onBlockActivated(world, pos, state, player, side, hitX, hitY, hitZ); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float hitX, float hitY, float hitZ) { + return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, stack, side, hitX, hitY, hitZ) || super.onBlockActivated(world, pos, state, player, hand, stack, side, hitX, hitY, hitZ); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index 71fc50581..6346bf141 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -10,12 +10,15 @@ */ package vazkii.botania.common.block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; 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.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -25,15 +28,21 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockForestEye extends BlockMod implements ILexiconable { + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0.25, 0.25, 0.75, 0.75, 0.75); + public BlockForestEye() { super(Material.iron); setHardness(5.0F); setResistance(10.0F); - setStepSound(soundTypeMetal); - setBlockBounds(0.25F, 0.25F, 0.25F, 0.75F, 0.75F, 0.75F); + setSoundType(SoundType.METAL); setUnlocalizedName(LibBlockNames.FOREST_EYE); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public boolean isFullCube(IBlockState state) { return false; @@ -45,12 +54,12 @@ public class BlockForestEye extends BlockMod implements ILexiconable { } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World par1World, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World par1World, BlockPos pos) { TileForestEye eye = (TileForestEye) par1World.getTileEntity(pos); return Math.min(15, Math.max(0, eye.entities - 1)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index a453786a2..8c4e228f4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -17,11 +17,13 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockSkull; 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.math.BlockPos; import net.minecraft.tileentity.TileEntitySkull; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.common.block.tile.TileGaiaHead; @@ -45,9 +47,8 @@ public class BlockGaiaHead extends BlockSkull { } @Override - @SideOnly(Side.CLIENT) - public Item getItem(World p_149694_1_, BlockPos pos) { - return ModItems.gaiaHead; + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + return new ItemStack(ModItems.gaiaHead); } @Override @@ -71,11 +72,6 @@ public class BlockGaiaHead extends BlockSkull { return ModItems.gaiaHead; } - @Override - public int getDamageValue(World p_149643_1_, BlockPos pos) { - return 0; - } - @Override public int damageDropped(IBlockState state) { return 0; diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index 6f5733f81..e54dbe951 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -68,12 +68,10 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { @SubscribeEvent public void onMinecartUpdate(MinecartUpdateEvent event) { - int x = MathHelper.floor_double(event.entity.posX); - int y = MathHelper.floor_double(event.entity.posY); - int z = MathHelper.floor_double(event.entity.posZ); BlockPos entPos = new BlockPos(event.entity); - Block block = event.entity.worldObj.getBlockState(entPos).getBlock(); - boolean air = block.isAir(event.entity.worldObj, entPos); + IBlockState state = event.entity.worldObj.getBlockState(entPos); + Block block = state.getBlock(); + boolean air = block.isAir(state, event.entity.worldObj, entPos); int floatTicks = event.entity.getEntityData().getInteger(TAG_FLOAT_TICKS); if(block == this) @@ -86,8 +84,9 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { floatTicks = event.entity.getEntityData().getInteger(TAG_FLOAT_TICKS); if(floatTicks > 0) { - Block blockBelow = event.entity.worldObj.getBlockState(entPos.down()).getBlock(); - boolean airBelow = blockBelow.isAir(event.entity.worldObj, entPos.down()); + IBlockState stateBelow = event.entity.worldObj.getBlockState(entPos.down()); + Block blockBelow = stateBelow.getBlock(); + boolean airBelow = blockBelow.isAir(stateBelow, event.entity.worldObj, entPos.down()); if(air && airBelow || !air && !airBelow) event.entity.noClip = true; event.entity.motionY = 0.2; diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index b7548abdb..ca27e1bfb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block; import java.util.Random; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -22,6 +23,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.EnumFacing; @@ -43,23 +47,23 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, IWandHUD, ILexiconable { - Random random; + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0, 0.25, 0.75, 1.15, 0.75); + + private final Random random = new Random(); protected BlockHourglass() { super(Material.iron); setUnlocalizedName(LibBlockNames.HOURGLASS); setHardness(2.0F); - setStepSound(soundTypeMetal); - - float f = 1F / 16F; - float w = 8F * f; - float d = (1F - w) / 2; - setBlockBounds(d, 0F, d, 1F - d, 1.15F, 1F - d); - - random = new Random(); + setSoundType(SoundType.METAL); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); @@ -76,10 +80,9 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float xs, float ys, float zs) { TileHourglass hourglass = (TileHourglass) world.getTileEntity(pos); ItemStack hgStack = hourglass.getItemHandler().getStackInSlot(0); - ItemStack stack = player.getCurrentEquippedItem(); if(stack != null && stack.getItem() == ModItems.twigWand) return false; @@ -107,12 +110,12 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, } @Override - public boolean canProvidePower() { + public boolean canProvidePower(IBlockState state) { return true; } @Override - public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { return state.getValue(BotaniaStateProps.POWERED) ? 15 : 0; } @@ -176,8 +179,8 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, } @Override - public int getRenderType() { - return 2; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 3f4d41579..bb7c76563 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -18,6 +19,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; @@ -36,7 +38,7 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { super(Material.wood); setUnlocalizedName(LibBlockNames.INCENSE_PLATE); setHardness(2.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setBlockBounds(EnumFacing.Axis.Z); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } @@ -60,9 +62,8 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing s, float xs, float ys, float zs) { TileIncensePlate plate = (TileIncensePlate) world.getTileEntity(pos); - ItemStack stack = player.getCurrentEquippedItem(); ItemStack plateStack = plate.getItemHandler().getStackInSlot(0); boolean did = false; @@ -100,20 +101,15 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World world, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { return ((TileIncensePlate) world.getTileEntity(pos)).comparatorOutput; } - @Override - public void setBlockBoundsBasedOnState(IBlockAccess w, BlockPos pos) { - setBlockBounds(w.getBlockState(pos).getValue(BotaniaStateProps.CARDINALS).getAxis()); - } - public void setBlockBounds(EnumFacing.Axis axis) { float f = 1F / 16F; float w = 12 * f; diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index e1238c8f0..df289f973 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -38,15 +39,21 @@ import vazkii.botania.common.lib.LibMisc; public class BlockLightLauncher extends BlockMod implements ILexiconable { + private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.25, 1); + public BlockLightLauncher() { super(Material.wood); setHardness(2.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.LIGHT_LAUNCHER); - setBlockBounds(0F, 0F, 0F, 1F, 0.25F, 1F); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 2cd0b48cb..e649e75ec 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -22,6 +22,8 @@ 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.EnumBlockRenderType; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; @@ -40,14 +42,20 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable { + private static final AxisAlignedBB AABB = new AxisAlignedBB(5.0/16, 5.0/16, 5.0/16, 11.0/16, 11.0/16, 11.0/16); + protected BlockLightRelay() { super(Material.glass); float f = 5F / 16F; - setBlockBounds(f, f, f, 1F - f, 1F - f, 1F - f); setUnlocalizedName(LibBlockNames.LIGHT_RELAY); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LUMINIZER_VARIANT, LuminizerVariant.DEFAULT).withProperty(BotaniaStateProps.POWERED, false)); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.LUMINIZER_VARIANT, BotaniaStateProps.POWERED); @@ -103,13 +111,13 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing s, float xs, float ys, float zs) { ((TileLightRelay) world.getTileEntity(pos)).mountEntity(player); return true; } @Override - public AxisAlignedBB getCollisionBoundingBox(World p_149668_1_, BlockPos pos, IBlockState state) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World p_149668_1_, BlockPos pos) { return null; } @@ -124,12 +132,12 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable } @Override - public boolean canProvidePower() { + public boolean canProvidePower(IBlockState state) { return true; } @Override - public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing s) { + public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing s) { return state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DETECTOR && state.getValue(BotaniaStateProps.POWERED) ? 15 : 0; } @@ -145,8 +153,8 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable } @Override - public int getRenderType() { - return 2; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index 586658368..1a5ab7550 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -38,7 +39,7 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { super(Material.rock); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.LIVING_ROCK); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGROCK_VARIANT, LivingRockVariant.DEFAULT)); } @@ -84,8 +85,8 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + return new ItemStack(this, 1, getMetaFromState(state)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index 6b7e510e8..3474b39c2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -42,7 +43,7 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { public BlockLivingwood(String name) { super(Material.wood); setHardness(2.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(name); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.DEFAULT)); } @@ -92,13 +93,13 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + return new ItemStack(this, 1, getMetaFromState(state)); } @Override - public int getLightValue(IBlockAccess world, BlockPos pos) { - return world.getBlockState(pos).getValue(BotaniaStateProps.LIVINGWOOD_VARIANT) == LivingWoodVariant.GLIMMERING ? 12 : 0; + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + return state.getValue(BotaniaStateProps.LIVINGWOOD_VARIANT) == LivingWoodVariant.GLIMMERING ? 12 : 0; } @Override @@ -108,8 +109,8 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { } @Override - public boolean canSustainLeaves(IBlockAccess world, BlockPos pos) { - return world.getBlockState(pos).getValue(BotaniaStateProps.LIVINGWOOD_VARIANT) == LivingWoodVariant.DEFAULT; + public boolean canSustainLeaves(IBlockState state, IBlockAccess world, BlockPos pos) { + return state.getValue(BotaniaStateProps.LIVINGWOOD_VARIANT) == LivingWoodVariant.DEFAULT; } } diff --git a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java index c9f59bbbb..d38383186 100644 --- a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java +++ b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -33,7 +34,7 @@ public class BlockManaBomb extends BlockMod implements IManaTrigger, ILexiconabl public BlockManaBomb() { super(Material.wood); setHardness(12.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.MANA_BOMB); } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 616cb97a3..e54bd9ae9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.SoundType; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -55,11 +56,10 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I public BlockModDoubleFlower(boolean second) { this.second = second; this.setHardness(0.0F); - this.setStepSound(soundTypeGrass); + this.setSoundType(SoundType.PLANT); offset = second ? 8 : 0; setUnlocalizedName(LibBlockNames.DOUBLE_FLOWER + (second ? 2 : 1)); setHardness(0F); - setStepSound(soundTypeGrass); setTickRandomly(false); setCreativeTab(BotaniaCreativeTab.INSTANCE); } @@ -101,8 +101,8 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I } @Override - public void harvestBlock(World p_149636_1_, EntityPlayer p_149636_2_, BlockPos pos, IBlockState state, TileEntity te) { - if(p_149636_1_.isRemote || p_149636_2_.getCurrentEquippedItem() == null || p_149636_2_.getCurrentEquippedItem().getItem() != Items.shears || state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.LOWER) + public void harvestBlock(World p_149636_1_, EntityPlayer p_149636_2_, BlockPos pos, IBlockState state, TileEntity te, ItemStack stack) { + if(p_149636_1_.isRemote || stack == null || stack.getItem() != Items.shears || state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.LOWER) harvestBlockCopy(p_149636_1_, p_149636_2_, pos, state); } @@ -200,7 +200,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I } @Override - public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { + public void randomDisplayTick(IBlockState state, World par1World, BlockPos pos, Random par5Random) { int hex = state.getValue(second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; @@ -227,12 +227,11 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I } } - return state.withProperty(VARIANT, EnumPlantType.SUNFLOWER).withProperty(field_181084_N, EnumFacing.SOUTH); + return state.withProperty(VARIANT, EnumPlantType.SUNFLOWER).withProperty(FACING, EnumFacing.SOUTH); } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - IBlockState state = world.getBlockState(pos); + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { state = state.getBlock().getActualState(state, world, pos); PropertyEnum prop = second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1; return new ItemStack(Item.getItemFromBlock(state.getBlock()), 1, state.getValue(prop).ordinal() - (second ? 8 : 0)); diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java index 8650f2058..2b4b94d2b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java @@ -12,7 +12,7 @@ public class BlockModDoubleFlower1 extends BlockModDoubleFlower { public BlockModDoubleFlower1() { super(false); setDefaultState(blockState.getBaseState() - .withProperty(field_181084_N, EnumFacing.SOUTH) + .withProperty(FACING, EnumFacing.SOUTH) .withProperty(VARIANT, EnumPlantType.SUNFLOWER) .withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER) .withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.WHITE)); @@ -20,7 +20,7 @@ public class BlockModDoubleFlower1 extends BlockModDoubleFlower { @Override public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, field_181084_N, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_1); + return new BlockStateContainer(this, FACING, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_1); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java index d5e8865f2..c824224e6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java @@ -13,7 +13,7 @@ public class BlockModDoubleFlower2 extends BlockModDoubleFlower { public BlockModDoubleFlower2() { super(true); setDefaultState(blockState.getBaseState() - .withProperty(field_181084_N, EnumFacing.SOUTH) + .withProperty(FACING, EnumFacing.SOUTH) .withProperty(VARIANT, EnumPlantType.SUNFLOWER) .withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER) .withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.SILVER)); @@ -21,7 +21,7 @@ public class BlockModDoubleFlower2 extends BlockModDoubleFlower { @Override public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, field_181084_N, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_2); + return new BlockStateContainer(this, FACING, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_2); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index d578cc5c7..704251eb1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -17,6 +17,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; import net.minecraft.block.IGrowable; +import net.minecraft.block.SoundType; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -26,6 +27,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -44,9 +46,9 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockModFlower extends BlockFlower implements ILexiconable, IPickupAchievement, IGrowable { - public int originalLight; + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); - public static final String ALT_DIR = "alt"; + public int originalLight; protected BlockModFlower() { this(LibBlockNames.FLOWER); @@ -56,13 +58,17 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup super(); setUnlocalizedName(name); setHardness(0F); - setStepSound(soundTypeGrass); - setBlockBounds(0.3F, 0.0F, 0.3F, 0.8F, 1, 0.8F); + setSoundType(SoundType.PLANT); setTickRandomly(false); setCreativeTab(registerInCreative() ? BotaniaCreativeTab.INSTANCE : null); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY)); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, getTypeProperty(), BotaniaStateProps.COLOR); @@ -119,7 +125,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup } @Override - public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { + public void randomDisplayTick(IBlockState state, World par1World, BlockPos pos, Random par5Random) { int hex = state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index a1a2d1787..e4fe6011d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import java.util.List; import java.util.Random; +import net.minecraft.block.SoundType; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.GlStateManager; @@ -56,7 +57,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, public BlockOpenCrate() { super(Material.wood); setHardness(2.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.OPEN_CRATE); setDefaultState(blockState.getBaseState() .withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.OPEN) @@ -118,12 +119,12 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World par1World, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World par1World, BlockPos pos) { TileOpenCrate crate = (TileOpenCrate) par1World.getTileEntity(pos); return crate.getSignal(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 096a4414e..43481c00f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -21,6 +21,8 @@ import gnu.trove.map.hash.TObjectIntHashMap; import net.minecraft.block.Block; import net.minecraft.block.BlockPistonExtension; import net.minecraft.block.BlockPistonMoving; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.EnumPushReaction; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; @@ -32,14 +34,17 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagString; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraft.world.WorldSavedData; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.WorldEvent; +import net.minecraftforge.fml.common.FMLCommonHandler; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -62,7 +67,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl setUnlocalizedName(LibBlockNames.PISTON_RELAY); setHardness(2F); setResistance(10F); - setStepSound(soundTypeMetal); + setSoundType(SoundType.METAL); MinecraftForge.EVENT_BUS.register(this); } @@ -104,7 +109,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } static IBlockState getStateAt(DimWithPos key) { - MinecraftServer server = MinecraftServer.getServer(); + MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); if(server == null) return null; return server.worldServerForDimension(key.dim).getBlockState(key.blockPos); @@ -117,7 +122,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl if(!player.isSneaking()) { playerPositions.put(player.getName(), new DimWithPos(world.provider.getDimension(), pos)); - world.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:ding", 0.5F, 1F); + world.playSound(null, pos, BotaniaSoundEvents.ding, SoundCategory.BLOCKS, 0.5F, 1F); } else { spawnAsEntity(world, pos, new ItemStack(this)); world.setBlockToAir(pos); @@ -196,7 +201,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl boolean sticky = BlockPistonExtension.EnumPistonType.STICKY == state.getValue(BlockPistonMoving.TYPE); EnumFacing dir = state.getValue(BlockPistonMoving.FACING); - MinecraftServer server = MinecraftServer.getServer(); + MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); if(server != null && getTimeInCoords(s) == 0) { DimWithPos newPos; @@ -223,10 +228,10 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl IBlockState srcState = world.getBlockState(pos2); TileEntity tile = world.getTileEntity(pos2); - Material mat = srcState.getBlock().getMaterial(); + Material mat = srcState.getMaterial(); - if(!sticky && tile == null && mat.getMaterialMobility() == 0 && srcState.getBlock().getBlockHardness(world, pos2) != -1 && !srcState.getBlock().isAir(world, pos2)) { - Material destMat = world.getBlockState(pos2.offset(dir)).getBlock().getMaterial(); + if(!sticky && tile == null && mat.getMobilityFlag() == EnumPushReaction.NORMAL && srcState.getBlockHardness(world, pos2) != -1 && !srcState.getBlock().isAir(srcState, world, pos2)) { + Material destMat = world.getBlockState(pos2.offset(dir)).getMaterial(); if(world.isAirBlock(pos2.offset(dir)) || destMat.isReplaceable()) { world.setBlockState(pos2, Blocks.air.getDefaultState()); world.setBlockState(pos2.offset(dir), srcState, 1 | 2); diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 6d2582d01..9d4f18502 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; @@ -50,7 +51,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable super(Material.wood); setHardness(2.0F); setResistance(5.0F); - setStepSound(Block.soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.PLATFORM); setDefaultState(((IExtendedBlockState) blockState.getBaseState()) .withProperty(BotaniaStateProps.HELD_STATE, null) @@ -119,16 +120,16 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable } @Override - public void addCollisionBoxesToList(World par1World, BlockPos pos, IBlockState state, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { + public void addCollisionBoxToList(IBlockState state, World par1World, BlockPos pos, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { PlatformVariant variant = state.getValue(BotaniaStateProps.PLATFORM_VARIANT); if(variant == PlatformVariant.INFRANGIBLE || variant == PlatformVariant.ABSTRUSE && par7Entity != null && par7Entity.posY > pos.getY() + 0.9 && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking())) - super.addCollisionBoxesToList(par1World, pos, state, par5AxisAlignedBB, par6List, par7Entity); + super.addCollisionBoxToList(state, par1World, pos, par5AxisAlignedBB, par6List, par7Entity); } @Override - public float getBlockHardness(World par1World, BlockPos pos) { + public float getBlockHardness(IBlockState state, World par1World, BlockPos pos) { PlatformVariant variant = par1World.getBlockState(pos).getValue(BotaniaStateProps.PLATFORM_VARIANT); - return variant == PlatformVariant.INFRANGIBLE ? -1F : super.getBlockHardness(par1World, pos); + return variant == PlatformVariant.INFRANGIBLE ? -1F : super.getBlockHardness(state, par1World, pos); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index cac93375f..e9b1a2f76 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -21,7 +22,10 @@ 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.EnumBlockRenderType; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.lexicon.ILexiconable; @@ -39,18 +43,23 @@ import net.minecraftforge.fml.common.registry.GameRegistry; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabiliser { + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.125, 0, 0.125, 0.875, 21.0/16, 0.875); + public BlockPylon() { super(Material.iron); setHardness(5.5F); - setStepSound(soundTypeMetal); + setSoundType(SoundType.METAL); setUnlocalizedName(LibBlockNames.PYLON); setLightLevel(0.5F); - 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 AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.PYLON_VARIANT); @@ -102,8 +111,8 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi } @Override - public int getRenderType() { - return 2; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockRoot.java b/src/main/java/vazkii/botania/common/block/BlockRoot.java index b231986ac..e504ad123 100644 --- a/src/main/java/vazkii/botania/common/block/BlockRoot.java +++ b/src/main/java/vazkii/botania/common/block/BlockRoot.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block; import java.util.Random; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -30,7 +31,7 @@ public class BlockRoot extends BlockMod implements ILexiconable { public BlockRoot() { super(Material.plants); setHardness(1.2F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.ROOT); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index 630e0e9a0..7b7471878 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -14,6 +14,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockVine; +import net.minecraft.block.SoundType; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -34,7 +35,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { public BlockSolidVines() { setUnlocalizedName(LibBlockNames.SOLID_VINE); setHardness(0.5F); - setStepSound(soundTypeGrass); + setSoundType(SoundType.PLANT); setCreativeTab(null); } @@ -70,7 +71,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(Blocks.vine); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index e6a66da51..e4cc332b0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -21,6 +22,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; @@ -36,17 +39,22 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockSparkChanger extends BlockMod implements ILexiconable { - Random random; + private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 3.0/16, 1); + + private final Random random = new Random(); public BlockSparkChanger() { super(Material.rock); - setBlockBounds(0F, 0F, 0F, 1F, 3F / 16F, 1F); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.SPARK_CHANGER); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, true)); - random = new Random(); + } + + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; } @Override @@ -92,10 +100,9 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack pstack, EnumFacing s, float xs, float ys, float zs) { TileSparkChanger changer = (TileSparkChanger) world.getTileEntity(pos); ItemStack cstack = changer.getItemHandler().getStackInSlot(0); - ItemStack pstack = player.getCurrentEquippedItem(); if(cstack != null) { changer.getItemHandler().setStackInSlot(0, null); world.updateComparatorOutputLevel(pos, this); @@ -157,12 +164,12 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World world, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { TileSparkChanger changer = (TileSparkChanger) world.getTileEntity(pos); ItemStack stack = changer.getItemHandler().getStackInSlot(0); if(stack == null) diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 87ef5f93b..860cf3458 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -17,6 +17,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.ITileEntityProvider; +import net.minecraft.block.SoundType; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -32,6 +33,8 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; @@ -64,7 +67,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD { static { - BotaniaAPI.subtilesForCreativeMenu.addAll(Arrays.asList(new String[] { + BotaniaAPI.subtilesForCreativeMenu.addAll(Arrays.asList( // Misc LibBlockNames.SUBTILE_PUREDAISY, LibBlockNames.SUBTILE_MANASTAR, @@ -110,24 +113,29 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I LibBlockNames.SUBTILE_VINCULOTUS, LibBlockNames.SUBTILE_SPECTRANTHEMUM, LibBlockNames.SUBTILE_BUBBELL, - LibBlockNames.SUBTILE_SOLEGNOLIA - })); + LibBlockNames.SUBTILE_SOLEGNOLIA)); } + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); + protected BlockSpecialFlower() { super(); setUnlocalizedName(LibBlockNames.SPECIAL_FLOWER); setHardness(0.1F); - setStepSound(soundTypeGrass); + setSoundType(SoundType.PLANT); setTickRandomly(false); setCreativeTab(BotaniaCreativeTab.INSTANCE); - setBlockBounds(0.3F, 0.0F, 0.3F, 0.8F, 1, 0.8F); setDefaultState(((IExtendedBlockState) blockState.getBaseState()) .withProperty(BotaniaStateProps.SUBTILE_ID, "daybloom") .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY) ); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public BlockStateContainer createBlockState() { return new ExtendedBlockState(this, new IProperty[] { getTypeProperty(), BotaniaStateProps.COLOR }, new IUnlistedProperty[] { BotaniaStateProps.SUBTILE_ID } ); @@ -159,35 +167,35 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } @Override - public int getLightValue(IBlockAccess world, BlockPos pos) { + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { int currentLight = world.getTileEntity(pos) == null ? -1 : ((TileSpecialFlower) world.getTileEntity(pos)).getLightValue(); if(currentLight == -1) currentLight = 0; - return LightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), currentLight); + return LightHelper.getPackedColor(state.getValue(BotaniaStateProps.COLOR), currentLight); } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World world, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { return ((TileSpecialFlower) world.getTileEntity(pos)).getComparatorInputOverride(); } @Override - public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { return ((TileSpecialFlower) world.getTileEntity(pos)).getPowerLevel(side); } @Override - public int getStrongPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { - return getWeakPower(world, pos, state, side); + public int getStrongPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + return getWeakPower(state, world, pos, side); } @Override - public boolean canProvidePower() { + public boolean canProvidePower(IBlockState state) { return true; } @@ -217,14 +225,14 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { String name = ((TileSpecialFlower) world.getTileEntity(pos)).subTileName; return ItemBlockSpecialFlower.ofType(name); } @Override - protected boolean canPlaceBlockOn(Block block) { - return super.canPlaceBlockOn(block) || block == ModBlocks.redStringRelay || block == Blocks.mycelium; + public boolean canPlaceBlockAt(World world, BlockPos pos) { + return super.canPlaceBlockAt(world, pos) || world.getBlockState(pos.down()).getBlock() == ModBlocks.redStringRelay || world.getBlockState(pos.down()).getBlock() == Blocks.mycelium; } @Override @@ -287,8 +295,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { - ItemStack stack = player.getCurrentEquippedItem(); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float hitX, float hitY, float hitZ) { if(stack != null && stack.getItem() == ModItems.dye) { EnumDyeColor newColor = EnumDyeColor.byMetadata(stack.getItemDamage()); EnumDyeColor oldColor = state.getValue(BotaniaStateProps.COLOR); @@ -296,7 +303,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I world.setBlockState(pos, state.withProperty(BotaniaStateProps.COLOR, newColor), 1 | 2); } - return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, side, hitX, hitY, hitZ); + return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, stack, side, hitX, hitY, hitZ); } @Override @@ -305,7 +312,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } @Override - public boolean addLandingEffects(net.minecraft.world.WorldServer worldObj, BlockPos blockPosition, IBlockState iblockstate, EntityLivingBase entity, int numberOfParticles) { + public boolean addLandingEffects(IBlockState state, net.minecraft.world.WorldServer worldObj, BlockPos blockPosition, IBlockState iblockstate, EntityLivingBase entity, int numberOfParticles) { float f = (float) MathHelper.ceiling_float_int(entity.fallDistance - 3.0F); double d0 = (double)Math.min(0.2F + f / 15.0F, 10.0F); if (d0 > 2.5D) { diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index e0b43127d..08a495375 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -38,7 +39,7 @@ public class BlockStorage extends BlockMod implements ILexiconable { super(Material.iron); setHardness(3F); setResistance(10F); - setStepSound(soundTypeMetal); + setSoundType(SoundType.METAL); setUnlocalizedName(LibBlockNames.STORAGE); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.MANASTEEL)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index ba90f25fc..4179dc91a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -19,8 +19,12 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -30,11 +34,17 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0.01, 0.25, 0.75, 0.99, 0.75); + public BlockTeruTeruBozu() { super(Material.cloth); setUnlocalizedName(LibBlockNames.TERU_TERU_BOZU); float f = 0.25F; - setBlockBounds(f, 0.01F, f, 1F - f, 0.99F, 1F - f); + } + + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; } @Override @@ -51,8 +61,7 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { - ItemStack stack = player.getCurrentEquippedItem(); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing s, float xs, float ys, float zs) { if(stack != null && (isSunflower(stack) && removeRain(world) || isBlueOrchid(stack) && startRain(world))) { if(!player.capabilities.isCreativeMode) stack.stackSize--; @@ -87,12 +96,12 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World world, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { return world.isRaining() ? 15 : 0; } @@ -107,8 +116,8 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { } @Override - public int getRenderType() { - return 2; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index 1496e3dcc..a8c2078ea 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -10,12 +10,15 @@ */ package vazkii.botania.common.block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; 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.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -25,16 +28,22 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockTinyPlanet extends BlockMod implements ILexiconable { + private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 3.0/16, 3.0/16, 13.0/16, 13.0/16, 13.0/16); + protected BlockTinyPlanet() { super(Material.rock); setHardness(20F); setResistance(100F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); float size = 3F / 16F; - setBlockBounds(size, size, size, 1F - size, 1F - size, 1F - size); setUnlocalizedName(LibBlockNames.TINY_PLANET); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public boolean isFullCube(IBlockState state) { return false; 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 242d63cad..2c49d1be2 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -10,33 +10,25 @@ */ package vazkii.botania.common.block.corporea; -import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.particle.EntityDiggingFX; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.common.property.Properties; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; 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.common.block.ModBlocks; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.lexicon.LexiconData; @@ -44,12 +36,12 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexiconable { + private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 0, 3.0/16, 13.0/16, 1, 13.0/16); + public BlockCorporeaCrystalCube() { super(Material.iron, LibBlockNames.CORPOREA_CRYSTAL_CUBE); setHardness(5.5F); - setStepSound(soundTypeMetal); - float f = (1F - 10F / 16F) / 2F; - setBlockBounds(f, 0F, f, 1F - f, 1F, 1F - f); + setSoundType(SoundType.METAL); setDefaultState(((IExtendedBlockState) blockState.getBaseState()).withProperty(Properties.AnimationProperty, null).withProperty(Properties.StaticProperty, true)); } @@ -81,6 +73,11 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi } } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing s, float xs, float ys, float zs) { if(stack != null) { diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java index 21b851b4c..fe0507be0 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.corporea; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -31,7 +32,7 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab public BlockCorporeaFunnel() { super(Material.iron, LibBlockNames.CORPOREA_FUNNEL); setHardness(5.5F); - setStepSound(soundTypeMetal); + setSoundType(SoundType.METAL); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } 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 294fe5109..09ea37dea 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.corporea; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.particle.EntityDiggingFX; @@ -39,7 +40,7 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl public BlockCorporeaIndex() { super(Material.iron, LibBlockNames.CORPOREA_INDEX); setHardness(5.5F); - setStepSound(soundTypeMetal); + setSoundType(SoundType.METAL); } @Override diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java index 9fecddb29..1ede7a9b6 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.corporea; import java.util.Random; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -34,7 +35,7 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi public BlockCorporeaInterceptor() { super(Material.iron, LibBlockNames.CORPOREA_INTERCEPTOR); setHardness(5.5F); - setStepSound(soundTypeMetal); + setSoundType(SoundType.METAL); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java index 6469e3680..30d267ab5 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.corporea; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -36,7 +37,7 @@ public class BlockCorporeaRetainer extends BlockMod implements ILexiconable, ICr public BlockCorporeaRetainer() { super(Material.iron); setHardness(5.5F); - setStepSound(soundTypeMetal); + setSoundType(SoundType.METAL); setUnlocalizedName(LibBlockNames.CORPOREA_RETAINER); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java index 521710d4a..fa9dacfc5 100644 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -39,7 +40,7 @@ public class Block18Stone extends BlockMod implements ILexiconable { super(Material.rock); setHardness(1.5F); setResistance(10F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.STONE); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, FutureStoneVariant.ANDESITE)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java b/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java index d3b46d862..ab64386b5 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.decor; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -33,7 +34,7 @@ public class BlockBlaze extends BlockMod implements ILexiconable, IFuelHandler { super(Material.iron); setHardness(3F); setResistance(10F); - setStepSound(soundTypeMetal); + setSoundType(SoundType.METAL); setLightLevel(1F); setUnlocalizedName(LibBlockNames.BLAZE_BLOCK); GameRegistry.registerFuelHandler(this); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index de6820c3f..6597d5401 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -16,6 +16,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -29,12 +30,18 @@ import net.minecraftforge.fml.common.Optional; public class BlockBuriedPetals extends BlockModFlower { + private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.1, 1); + public BlockBuriedPetals() { super(LibBlockNames.BURIED_PETALS); - setBlockBounds(0F, 0F, 0F, 1F, 0.1F, 1F); setLightLevel(0.25F); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override @Optional.Method(modid = "easycoloredlights") public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java index 74aaf4017..4a423b4df 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -39,7 +40,7 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { super(Material.rock); setHardness(2.0F); setResistance(5.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.CUSTOM_BRICK); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, CustomBrickVariant.HELLISH_BRICK)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java index 750a958b6..516a8c18f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -46,10 +47,9 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { public BlockDirtPath() { super(Material.ground); - setBlockBounds(0F, 0F, 0F, 1F, 15F / 16F, 1F); setLightOpacity(255); setHardness(0.6F); - setStepSound(soundTypeGravel); + setSoundType(SoundType.GROUND); setUnlocalizedName(LibBlockNames.DIRT_PATH); useNeighborBrightness = true; MinecraftForge.EVENT_BUS.register(this); @@ -72,11 +72,12 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { } @Override - public void setBlockBoundsBasedOnState(IBlockAccess world, BlockPos pos) { - Block blockAbove = world.getBlockState(pos.up()).getBlock(); - if(!blockAbove.isAir(world, pos.up())) - setBlockBounds(0F, 0F, 0F, 1F, 1, 1F); - else setBlockBounds(0F, 0F, 0F, 1F, 15F / 16F, 1F); + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + IBlockState stateAbove = world.getBlockState(pos.up()); + Block blockAbove = stateAbove.getBlock(); + if(!blockAbove.isAir(stateAbove, world, pos.up())) + return FULL_BLOCK_AABB; + else return new AxisAlignedBB(0F, 0F, 0F, 1F, 15F / 16F, 1F); } @Override @@ -84,11 +85,6 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { return side == EnumFacing.DOWN; } - @Override - public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { - setBlockBoundsBasedOnState(world, pos); - } - @Override public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) { return new AxisAlignedBB(pos, pos.add(1, 1, 1)); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java index 88948cc17..b6c327dc2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -39,7 +40,7 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable { super(Material.rock); setHardness(1.5F); setResistance(10F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.END_STONE_BRICK); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ENDBRICK_VARIANT, EndBrickVariant.END_STONE_BRICKS)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index fb7075aae..7a8416211 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; @@ -28,6 +29,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; @@ -65,6 +67,8 @@ import java.util.Random; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfusionStabiliser { + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.1, 0.1, 0.1, 0.9, 0.9, 0.9); + public BlockFloatingFlower() { this(LibBlockNames.MINI_ISLAND); } @@ -73,16 +77,19 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu super(Material.ground); setUnlocalizedName(name); setHardness(0.5F); - setStepSound(soundTypeGravel); + setSoundType(SoundType.GROUND); setLightLevel(1F); - float f = 0.1F; - setBlockBounds(f, f, f, 1F - f, 1F - f, 1F - f); setDefaultState(((IExtendedBlockState) blockState.getBaseState()) .withProperty(BotaniaStateProps.ISLAND_TYPE, IslandType.GRASS) .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java index d33717f79..0078670c7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -22,6 +23,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -37,13 +39,14 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockManaBeacon extends BlockMod implements ILexiconable { + private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 3.0/16, 3.0/16, 13.0/16, 13.0/16, 13.0/16); + public BlockManaBeacon() { super(Material.iron); setHardness(5.0F); setResistance(10.0F); - setStepSound(soundTypeMetal); + setSoundType(SoundType.METAL); float size = 3F / 16F; - setBlockBounds(size, size, size, 1F - size, 1F - size, 1F - size); setUnlocalizedName(LibBlockNames.MANA_BEACON); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @@ -66,6 +69,11 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java index 5688bbb79..98e87c52b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor; import java.util.List; import com.google.common.collect.ImmutableList; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -39,15 +40,21 @@ import net.minecraftforge.fml.common.Optional; public class BlockManaFlame extends BlockMod implements ILexiconable { + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0.25, 0.25, 0.75, 0.75, 0.75); + public BlockManaFlame() { super(Material.cloth); setUnlocalizedName(LibBlockNames.MANA_FLAME); float f = 0.25F; - setStepSound(soundTypeCloth); - setBlockBounds(f, f, f, 1F - f, 1F - f, 1F - f); + setSoundType(SoundType.CLOTH); setLightLevel(1F); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public boolean registerInCreative() { return false; @@ -55,7 +62,7 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, BlockPos pos) { + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { return ((TileManaFlame) world.getTileEntity(pos)).getLightColor(); } @@ -87,7 +94,7 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing s, float xs, float ys, float zs) { if(WorldTypeSkyblock.isWorldSkyblock(world)) { - if(stack != null && stack.getItem() == Item.getItemFromBlock(Blocks.sapling) && !player.inventory.hasItem(ModItems.lexicon)) { + if(stack != null && stack.getItem() == Item.getItemFromBlock(Blocks.sapling) && !player.inventory.hasItemStack(new ItemStack(ModItems.lexicon))) { if(!world.isRemote) stack.stackSize--; if(!player.inventory.addItemStackToInventory(new ItemStack(ModItems.lexicon))) diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java index d87f70bac..c9b21c715 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -35,7 +36,7 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { public BlockManaGlass(String name) { super(Material.glass); setHardness(0.3F); - setStepSound(soundTypeGlass); + setSoundType(SoundType.GLASS); setLightLevel(1.0F); setUnlocalizedName(name); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index 580509a61..fa4942d29 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -16,6 +16,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; import net.minecraft.block.BlockMushroom; +import net.minecraft.block.SoundType; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -24,6 +25,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; @@ -46,14 +48,14 @@ import net.minecraftforge.fml.common.registry.GameRegistry; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable { + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); public int originalLight; public BlockModMushroom() { setUnlocalizedName(LibBlockNames.MUSHROOM); setLightLevel(0.2F); setHardness(0F); - setStepSound(soundTypeGrass); - setBlockBounds(0.3F, 0.0F, 0.3F, 0.8F, 1, 0.8F); + setSoundType(SoundType.PLANT); setTickRandomly(false); setCreativeTab(BotaniaCreativeTab.INSTANCE); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); @@ -77,6 +79,11 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public void updateTick(World p_149674_1_, BlockPos pos, IBlockState state, Random p_149674_5_) { // NO-OP, to prevent spreading diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java index 73f83127d..79369f89e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -38,7 +39,7 @@ public class BlockPavement extends BlockMod { super(Material.rock); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.PAVEMENT); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PAVEMENT_COLOR, EnumDyeColor.WHITE)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java index a252b6d8e..028787441 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -38,7 +39,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { public BlockPetalBlock() { super(Material.plants); setHardness(0.4F); - setStepSound(soundTypeGrass); + setSoundType(SoundType.PLANT); setUnlocalizedName(LibBlockNames.PETAL_BLOCK); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java index 44c7333a4..ac111c0b3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -41,7 +42,7 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { super(Material.rock); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.PRISMARINE); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, PrismarineVariant.PRISMARINE)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java index 8d9e2969d..eac050269 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.Block; import net.minecraft.block.BlockRotatedPillar; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -35,7 +36,7 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable { public BlockReeds() { super(Material.wood); setHardness(1.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.REED_BLOCK); setCreativeTab(BotaniaCreativeTab.INSTANCE); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.AXIS_FACING, EnumFacing.Axis.Y)); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java index 6476ca833..b10bf9923 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java @@ -10,7 +10,9 @@ */ package vazkii.botania.common.block.decor; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -29,7 +31,7 @@ public class BlockSeaLamp extends BlockMod implements ILexiconable { public BlockSeaLamp() { super(Material.glass); setHardness(0.3F); - setStepSound(soundTypeGlass); + setSoundType(SoundType.GLASS); setLightLevel(1.0F); setUnlocalizedName(LibBlockNames.SEA_LAMP); } @@ -38,7 +40,7 @@ public class BlockSeaLamp extends BlockMod implements ILexiconable { @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, BlockPos pos) { + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { return coloredLight == -1 ? (coloredLight = ColoredLightHelper.makeRGBLightValue(85, 136, 125, originalLight)) : coloredLight; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java index 3ef87d3d3..bc7450207 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.decor; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -27,7 +28,7 @@ public class BlockShimmerrock extends BlockMod implements ILexiconable { super(Material.rock); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.SHIMMERROCK); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java index 38da29c13..955a672ad 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.decor; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -26,7 +27,7 @@ public class BlockShimmerwoodPlanks extends BlockMod implements ILexiconable { public BlockShimmerwoodPlanks() { super(Material.wood); setHardness(2.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.SHIMMERWOOD_PLANKS); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java index 4403372b8..c65e5bee3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -10,14 +10,17 @@ */ package vazkii.botania.common.block.decor; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; 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.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.BlockRenderLayer; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -29,14 +32,20 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockStarfield extends BlockMod implements ILexiconable { + private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.25, 1); + public BlockStarfield() { super(Material.iron); setHardness(5F); setResistance(2000F); - setStepSound(soundTypeMetal); + setSoundType(SoundType.METAL); setUnlocalizedName(LibBlockNames.STARFIELD); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); - setBlockBounds(0F, 0F, 0F, 1F, 0.25F, 1F); + } + + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java b/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java index 7144d1625..41831e680 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.decor; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -26,7 +27,7 @@ public class BlockThatch extends BlockMod implements ILexiconable { public BlockThatch() { super(Material.grass); setHardness(1.0F); - setStepSound(soundTypeGrass); + setSoundType(SoundType.PLANT); setUnlocalizedName(LibBlockNames.THATCH); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index 0c03ea4e4..c7bcd46a8 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -23,6 +23,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; @@ -41,12 +42,13 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockTinyPotato extends BlockMod implements ILexiconable { + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.375, 0, 0.375, 0.625, 0.375, 0.625); + public BlockTinyPotato() { super(Material.cloth); setHardness(0.25F); setUnlocalizedName(LibBlockNames.TINY_POTATO); float f = 1F / 16F * 6F; - setBlockBounds(f, 0, f, 1F - f, f, 1F - f); setDefaultState(blockState.getBaseState() .withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH) ); @@ -83,6 +85,11 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, side); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockTinyPotato.class, par1Str); @@ -100,7 +107,7 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { if(tile instanceof TileTinyPotato) { ((TileTinyPotato) tile).interact(); par5EntityPlayer.addStat(ModAchievements.tinyPotatoPet, 1); - par1World.spawnParticle(EnumParticleTypes.HEART, pos.getX() + minX + Math.random() * (maxX - minX), pos.getY() + maxY, pos.getZ() + minZ + Math.random() * (maxZ - minZ), 0, 0 ,0); + par1World.spawnParticle(EnumParticleTypes.HEART, pos.getX() + AABB.minX + Math.random() * (AABB.maxX - AABB.minX), pos.getY() + AABB.maxY, pos.getZ() + AABB.minZ + Math.random() * (AABB.maxZ - AABB.minZ), 0, 0 ,0); } return true; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java index a78838f75..dcff7bda0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -15,17 +15,22 @@ import java.util.List; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -39,12 +44,13 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockUnstable extends BlockMod implements ILexiconable { + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0.25, 0.25, 0.75, 0.75, 0.75); + public BlockUnstable() { super(Material.iron); setHardness(5.0F); setResistance(10.0F); - setStepSound(soundTypeMetal); - setBlockBounds(0.25F, 0.25F, 0.25F, 0.75F, 0.75F, 0.75F); + setSoundType(SoundType.METAL); setUnlocalizedName(LibBlockNames.UNSTABLE_BLOCK); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @@ -67,6 +73,11 @@ public class BlockUnstable extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) @@ -95,8 +106,9 @@ public class BlockUnstable extends BlockMod implements ILexiconable { } @Override + @SideOnly(Side.CLIENT) public void randomDisplayTick(IBlockState state, World par1World, BlockPos pos, Random par5Random) { - int color = getRenderColor(state); + int color = Minecraft.getMinecraft().getBlockColors().colorMultiplier(state, par1World, pos, 0); int colorBright = new Color(color).brighter().getRGB(); int colorDark = new Color(color).darker().getRGB(); diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java index a7895a6a2..bdb0845fb 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor.biomestone; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -35,7 +36,7 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable { super(Material.rock); setHardness(1.5F); setResistance(10F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(name); } @@ -62,7 +63,7 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable { } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java index 9e28aee39..da331ba99 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor.panes; import net.minecraft.block.Block; import net.minecraft.block.BlockPane; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; @@ -32,7 +33,7 @@ public class BlockModPane extends BlockPane { setUnlocalizedName(source.getUnlocalizedName().replaceAll("tile.", "") + "Pane"); setCreativeTab(BotaniaCreativeTab.INSTANCE); setHardness(0.3F); - setStepSound(soundTypeGlass); + setSoundType(SoundType.GLASS); setLightLevel(1.0F); useNeighborBrightness = true; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java index 9a52fd17f..976fa1633 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; +import net.minecraft.block.SoundType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -26,7 +27,7 @@ public class BlockEndStoneSlab extends BlockLivingSlab { super(full, ModBlocks.endStoneBrick.getDefaultState()); setHardness(1.5F); setResistance(10F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java index a3b1fcb98..eb8c67b32 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; +import net.minecraft.block.SoundType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -28,7 +29,7 @@ public class BlockEnderBrickSlab extends BlockLivingSlab { super(full, ModBlocks.endStoneBrick.getDefaultState().withProperty(BotaniaStateProps.ENDBRICK_VARIANT, EndBrickVariant.ENDER_BRICKS)); setHardness(1.5F); setResistance(10F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java index ffd098970..f731a6b84 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java @@ -8,7 +8,7 @@ public abstract class BlockLivingSlab extends BlockModSlab { public BlockLivingSlab(boolean full, IBlockState state) { super(full, state.getMaterial(), state.getBlock().getUnlocalizedName().replaceAll("tile.", "") + state.getBlock().getMetaFromState(state) + "Slab" + (full ? "Full" : "")); - setStepSound(state.getBlock().stepSound); + setSoundType(state.getBlock().getSoundType()); this.sourceState = state; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java index 321640ed7..a4fefc680 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; +import net.minecraft.block.SoundType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -25,7 +26,7 @@ public class BlockReedSlab extends BlockLivingSlab { public BlockReedSlab(boolean full) { super(full, ModBlocks.reedBlock.getDefaultState()); setHardness(1.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java index c3f0e13e5..08a3ed40b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; +import net.minecraft.block.SoundType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -25,7 +26,7 @@ public class BlockThatchSlab extends BlockLivingSlab { public BlockThatchSlab(boolean full) { super(full, ModBlocks.thatch.getDefaultState()); setHardness(1.0F); - setStepSound(soundTypeGrass); + setSoundType(SoundType.PLANT); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java index f5c266e43..ae85fbdb3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor.slabs.bricks; import net.minecraft.block.BlockSlab; +import net.minecraft.block.SoundType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -33,7 +34,7 @@ public class BlockCustomBrickSlab extends BlockLivingSlab { super(full, ModBlocks.customBrick.getDefaultState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, variant)); setHardness(2.0F); setResistance(5.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockBrickSlab.java index f6dcffa08..0799f944a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockBrickSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockBrickSlab.java @@ -1,6 +1,7 @@ package vazkii.botania.common.block.decor.slabs.living; import net.minecraft.block.BlockSlab; +import net.minecraft.block.SoundType; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.common.block.ModBlocks; @@ -13,7 +14,7 @@ public class BlockLivingrockBrickSlab extends BlockLivingSlab { super(full, ModBlocks.livingrock.getDefaultState().withProperty(BotaniaStateProps.LIVINGROCK_VARIANT, LivingRockVariant.BRICK)); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockSlab.java index 0bc39aa7a..d51909370 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockSlab.java @@ -1,6 +1,7 @@ package vazkii.botania.common.block.decor.slabs.living; import net.minecraft.block.BlockSlab; +import net.minecraft.block.SoundType; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; @@ -11,7 +12,7 @@ public class BlockLivingrockSlab extends BlockLivingSlab { super(full, ModBlocks.livingrock.getDefaultState()); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerrockSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerrockSlab.java index c3530b308..c78dc76dc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerrockSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerrockSlab.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor.slabs.living; import net.minecraft.block.BlockSlab; +import net.minecraft.block.SoundType; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; @@ -21,7 +22,7 @@ public class BlockShimmerrockSlab extends BlockLivingSlab { super(full, ModBlocks.shimmerrock.getDefaultState()); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerwoodPlankSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerwoodPlankSlab.java index 97172da14..1b1816f24 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerwoodPlankSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerwoodPlankSlab.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor.slabs.living; import net.minecraft.block.BlockSlab; +import net.minecraft.block.SoundType; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; @@ -21,7 +22,7 @@ public class BlockShimmerwoodPlankSlab extends BlockLivingSlab { super(full, ModBlocks.shimmerwoodPlanks.getDefaultState()); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java index 2fe270a0e..2cc57b012 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java @@ -1,6 +1,7 @@ package vazkii.botania.common.block.decor.slabs.prismarine; import net.minecraft.block.BlockSlab; +import net.minecraft.block.SoundType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -23,7 +24,7 @@ public class BlockPrismarineSlab extends BlockLivingSlab { super(full, ModBlocks.prismarine.getDefaultState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, variant)); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java index c796bf9a4..7067dc353 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.decor.walls; +import net.minecraft.block.SoundType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -24,7 +25,7 @@ public class BlockPrismarineWall extends BlockModWall { super(ModBlocks.prismarine, 0); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockReedWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockReedWall.java index 508389fd8..3caebc96b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockReedWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockReedWall.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.decor.walls; +import net.minecraft.block.SoundType; import vazkii.botania.common.block.ModBlocks; public class BlockReedWall extends BlockModWall { @@ -17,7 +18,7 @@ public class BlockReedWall extends BlockModWall { public BlockReedWall() { super(ModBlocks.reedBlock, 0); setHardness(1.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockDreamwoodWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockDreamwoodWall.java index 6006e41a3..8555956dc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockDreamwoodWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockDreamwoodWall.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.decor.walls.living; +import net.minecraft.block.SoundType; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.walls.BlockModWall; @@ -18,7 +19,7 @@ public class BlockDreamwoodWall extends BlockModWall { public BlockDreamwoodWall() { super(ModBlocks.dreamwood, 0); setHardness(2.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingrockWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingrockWall.java index 603eebc83..4f44d3db0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingrockWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingrockWall.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.decor.walls.living; +import net.minecraft.block.SoundType; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.walls.BlockModWall; @@ -19,7 +20,7 @@ public class BlockLivingrockWall extends BlockModWall { super(ModBlocks.livingrock, 0); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingwoodWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingwoodWall.java index b958d4ff7..bc2ff754a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingwoodWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingwoodWall.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.decor.walls.living; +import net.minecraft.block.SoundType; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.walls.BlockModWall; @@ -18,7 +19,7 @@ public class BlockLivingwoodWall extends BlockModWall { public BlockLivingwoodWall() { super(ModBlocks.livingwood, 0); setHardness(2.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); } } 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 63c7efe78..8961018ec 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java @@ -10,7 +10,7 @@ */ package vazkii.botania.common.block.mana; -import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; @@ -37,7 +37,7 @@ public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoo super(Material.rock); setHardness(2.0F); setResistance(10.0F); - setStepSound(Block.soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(name); } 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 c5e130030..5884f56d6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.mana; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -17,8 +18,12 @@ 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.EnumBlockRenderType; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -31,14 +36,15 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockBellows extends BlockMod implements ILexiconable { + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.1875, 0, 0.1875, 1-0.1875, 10.0 / 16, 1-0.1875); + public BlockBellows() { super(Material.wood); setHardness(2.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.BELLOWS); float f = (1F - 10 / 16F) / 2F; - setBlockBounds(f, 0F, f, 1F - f, 10F / 16F, 1F - f); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } @@ -60,13 +66,18 @@ public class BlockBellows extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getFront(meta)); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @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 - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing s, float xs, float ys, float zs) { if(EntityDoppleganger.isTruePlayer(player)) ((TileBellows) world.getTileEntity(pos)).interact(); return true; @@ -83,8 +94,8 @@ public class BlockBellows extends BlockMod implements ILexiconable { } @Override - public int getRenderType() { - return 2; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @Override 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 4b7dcf76f..058bedc8a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.mana; import java.util.Random; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -22,8 +23,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -37,18 +42,17 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { - Random random; + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.375, 0.05, 0.375, 0.625, 0.95, 0.625); + + private final Random random = new Random(); public BlockBrewery() { super(Material.rock); float f = 6F / 16F; - setBlockBounds(f, 0.05F, f, 1F - f, 0.95F, 1F - f); setUnlocalizedName(LibBlockNames.BREWERY); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); - - random = new Random(); + setSoundType(SoundType.STONE); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @@ -68,7 +72,12 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { } @Override - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing side, float par7, float par8, float par9) { + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + + @Override + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack stack, EnumFacing side, float par7, float par8, float par9) { TileBrewery brew = (TileBrewery) par1World.getTileEntity(pos); if(par5EntityPlayer.isSneaking()) { @@ -85,7 +94,6 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { } } } else { - ItemStack stack = par5EntityPlayer.getCurrentEquippedItem(); if(stack != null) return brew.addItem(par5EntityPlayer, stack); } @@ -131,19 +139,19 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World par1World, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World par1World, BlockPos pos) { TileBrewery brew = (TileBrewery) par1World.getTileEntity(pos); return brew.signal; } @Override - public int getRenderType() { - return 2; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @Override 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 357a5102d..036c941de 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -30,7 +30,7 @@ public class BlockDistributor extends BlockMod implements ILexiconable { super(Material.rock); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.DISTRIBUTOR); } 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 952bd34d4..323e990aa 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -49,7 +49,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, setHardness(3.0F); setResistance(5.0F); setLightLevel(1.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.ENCHANTER); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, EnumFacing.Axis.X)); random = new Random(); 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 3b436078a..53a02be2c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -52,7 +52,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona setBlockBounds(f * 3, 0F, f * 3, 1F - f * 3, 1F - f * 2, 1F - f * 3); setHardness(2.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.FOREST_DRUM); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.DRUM_VARIANT, DrumVariant.WILD)); } 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 5e202001f..1d80e00cc 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -40,7 +40,7 @@ public class BlockManaDetector extends BlockMod implements ILexiconable { super(Material.rock); setHardness(2.0F); setResistance(10.0F); - setStepSound(Block.soundTypeStone); + setSoundType(Block.SoundType.STONE); setUnlocalizedName(LibBlockNames.MANA_DETECTOR); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } 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 96df44a6b..7ab95499c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -36,7 +36,7 @@ public class BlockManaVoid extends BlockMod implements ILexiconable, IPoolOverla super(Material.rock); setHardness(2.0F); setResistance(2000F); - setStepSound(Block.soundTypeStone); + setSoundType(Block.SoundType.STONE); setUnlocalizedName(LibBlockNames.MANA_VOID); } 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 8cb69cb5f..b988b2b46 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -10,11 +10,11 @@ */ package vazkii.botania.common.block.mana; -import java.awt.*; import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -29,13 +29,12 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; @@ -44,7 +43,6 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockMod; @@ -56,15 +54,16 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexiconable, ICraftAchievement { + private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.5, 1); + boolean lastFragile = false; public BlockPool() { super(Material.rock); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.POOL); - setBlockBounds(0F, 0F, 0F, 1F, 0.5F, 1F); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.DEFAULT)); @@ -89,6 +88,11 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon return getDefaultState().withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.values()[meta]); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override protected boolean shouldRegisterInNameSet() { return false; @@ -166,7 +170,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon } @Override - public boolean isSideSolid(IBlockAccess world, BlockPos pos, EnumFacing side) { + public boolean isSideSolid(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { return side == EnumFacing.DOWN; } @@ -181,17 +185,17 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon } @Override - public int getRenderType() { - return 2; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World par1World, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World par1World, BlockPos pos) { TilePool pool = (TilePool) par1World.getTileEntity(pos); int val = (int) ((double) pool.getCurrentMana() / (double) pool.manaCap * 15.0); if(pool.getCurrentMana() > 0) 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 40c28d027..eddccd1ab 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -47,7 +47,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable { public BlockPrism() { super(Material.glass); setHardness(0.3F); - setStepSound(soundTypeGlass); + setSoundType(SoundType.GLASS); setLightLevel(1.0F); setUnlocalizedName(LibBlockNames.PRISM); float f = 0.25F; 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 21909928b..df0763cc6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -39,7 +39,7 @@ public class BlockPump extends BlockMod implements ILexiconable { super(Material.rock); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.PUMP); setBlockBounds(EnumFacing.Axis.X); setDefaultState(blockState.getBaseState().withProperty(Properties.StaticProperty, true).withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java index 303f32f9d..e7a8a7685 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java @@ -32,7 +32,7 @@ public class BlockRFGenerator extends BlockMod implements ILexiconable { super(Material.rock); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.RF_GENERATOR); } 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 f2f1050d7..233346149 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -41,7 +41,7 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable setBlockBounds(0F, 0F, 0F, 1F, 0.75F, 1F); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.RUNE_ALTAR); BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE); 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 fa76ebccc..ba33dd12c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -10,12 +10,12 @@ */ package vazkii.botania.common.block.mana; -import java.awt.*; import java.util.List; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockPistonBase; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -30,12 +30,12 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ILens; @@ -44,12 +44,10 @@ 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; -import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TileSpreader; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -61,7 +59,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex public BlockSpreader() { super(Material.wood); setHardness(2.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.SPREADER); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.SPREADER_VARIANT, SpreaderVariant.MANA)); random = new Random(); @@ -104,7 +102,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex @Override public void onBlockPlacedBy(World par1World, BlockPos pos, IBlockState state, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { - EnumFacing orientation = BlockPistonBase.getFacingFromEntity(par1World, pos, par5EntityLivingBase); + EnumFacing orientation = BlockPistonBase.getFacingFromEntity(pos, par5EntityLivingBase); TileSpreader spreader = (TileSpreader) par1World.getTileEntity(pos); par1World.setBlockState(pos, getStateFromMeta(par6ItemStack.getItemDamage()), 1 | 2); @@ -145,19 +143,18 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex } @Override - public int getRenderType() { - return 2; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @Override - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack heldItem, EnumFacing par6, float par7, float par8, float par9) { TileEntity tile = par1World.getTileEntity(pos); if(!(tile instanceof TileSpreader)) return false; TileSpreader spreader = (TileSpreader) tile; ItemStack lens = spreader.getItemHandler().getStackInSlot(0); - ItemStack heldItem = par5EntityPlayer.getCurrentEquippedItem(); boolean isHeldItemLens = heldItem != null && heldItem.getItem() instanceof ILens; boolean wool = heldItem != null && heldItem.getItem() == Item.getItemFromBlock(Blocks.wool); 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 e03660b9f..fb879b0ac 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -38,7 +38,7 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { setBlockBounds(0F, 0F, 0F, 1F, 3F / 16F, 1F); setHardness(3F); setResistance(10F); - setStepSound(soundTypeMetal); + setSoundType(SoundType.METAL); setUnlocalizedName(LibBlockNames.TERRA_PLATE); 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 e3ff05982..53ba88a3a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -34,7 +34,7 @@ public class BlockTurntable extends BlockMod implements IWandable, IWandHUD, ILe public BlockTurntable() { super(Material.wood); setHardness(2.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.TURNTABLE); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java index 304a85757..6ecc66a8f 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.string; import net.minecraft.block.BlockPistonBase; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -33,7 +34,7 @@ public abstract class BlockRedString extends BlockMod implements ILexiconable { super(Material.rock); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(name); } @@ -44,7 +45,7 @@ public abstract class BlockRedString extends BlockMod implements ILexiconable { @Override public void onBlockPlacedBy(World par1World, BlockPos pos, IBlockState state, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { - EnumFacing orientation = BlockPistonBase.getFacingFromEntity(par1World, pos, par5EntityLivingBase); + EnumFacing orientation = BlockPistonBase.getFacingFromEntity(pos, par5EntityLivingBase); par1World.setBlockState(pos, state.withProperty(BotaniaStateProps.FACING, orientation), 1 | 2); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java index 77e3caa85..b45d41f08 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java @@ -27,12 +27,12 @@ public class BlockRedStringComparator extends BlockRedString { } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World world, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { return ((TileRedStringComparator) world.getTileEntity(pos)).getComparatorValue(); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 7cc64aee0..d33859781 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -66,12 +66,12 @@ public class BlockRedStringInterceptor extends BlockRedString { } @Override - public boolean canProvidePower() { + public boolean canProvidePower(IBlockState state) { return true; } @Override - public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { return state.getValue(BotaniaStateProps.POWERED) ? 15 : 0; } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java index d35bea205..90541b8c0 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java @@ -16,9 +16,12 @@ import net.minecraft.block.BlockCrops; import net.minecraft.block.BlockSapling; import net.minecraft.block.IGrowable; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.handler.ConfigHandler; @@ -50,7 +53,7 @@ public class SubTileAgricarnation extends SubTileFunctional { supertile.getWorld().scheduleUpdate(pos, block, 1); if(ConfigHandler.blockBreakParticles) supertile.getWorld().playAuxSFX(2005, pos, 6 + supertile.getWorld().rand.nextInt(4)); - supertile.getWorld().playSoundEffect(x, y, z, "botania:agricarnation", 0.01F, 0.5F + (float) Math.random() * 0.5F); + supertile.getWorld().playSound(null, x, y, z, BotaniaSoundEvents.agricarnation, SoundCategory.BLOCKS, 0.01F, 0.5F + (float) Math.random() * 0.5F); break; } @@ -64,11 +67,12 @@ public class SubTileAgricarnation extends SubTileFunctional { } boolean isPlant(BlockPos pos) { - Block block = supertile.getWorld().getBlockState(pos).getBlock(); + IBlockState state = supertile.getWorld().getBlockState(pos); + Block block = state.getBlock(); if(block == Blocks.grass || block == Blocks.leaves || block == Blocks.leaves2 || block instanceof BlockBush && !(block instanceof BlockCrops) && !(block instanceof BlockSapling)) return false; - Material mat = block.getMaterial(); + Material mat = state.getMaterial(); return mat != null && (mat == Material.plants || mat == Material.cactus || mat == Material.grass || mat == Material.leaves || mat == Material.gourd) && block instanceof IGrowable && ((IGrowable) block).canGrow(supertile.getWorld(), pos, supertile.getWorld().getBlockState(pos), supertile.getWorld().isRemote); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java index ed2f4fdfd..f7d0eabe2 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -48,8 +49,8 @@ public class SubTileBubbell extends SubTileFunctional { for(int j = -range; j < range + 1; j++) for(int k = -range; k < range + 1; k++) if(MathHelper.pointDistanceSpace(i, j, k, 0, 0, 0) < range) { - Block block = supertile.getWorld().getBlockState(supertile.getPos().add(i, j, k)).getBlock(); - if(block.getMaterial() == Material.water) { + IBlockState state = supertile.getWorld().getBlockState(supertile.getPos().add(i, j, k)); + if(state.getMaterial() == Material.water) { supertile.getWorld().setBlockState(supertile.getPos().add(i, j, k), ModBlocks.fakeAir.getDefaultState(), 2); TileFakeAir air = (TileFakeAir) supertile.getWorld().getTileEntity(supertile.getPos().add(i, j, k)); air.setFlower(supertile); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java index 303b09ca0..566ceb94f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.subtile.functional; import java.util.List; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.math.AxisAlignedBB; @@ -34,8 +35,8 @@ public class SubTileFallenKanade extends SubTileFunctional { if(!supertile.getWorld().isRemote && supertile.getWorld().provider.getDimension() != 1) { List players = supertile.getWorld().getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityPlayer player : players) { - if(player.getActivePotionEffect(Potion.regeneration) == null && mana >= cost ) { - player.addPotionEffect(new PotionEffect(Potion.regeneration.id, 60, 2)); + if(player.getActivePotionEffect(MobEffects.regeneration) == null && mana >= cost ) { + player.addPotionEffect(new PotionEffect(MobEffects.regeneration, 60, 2)); mana -= cost; } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index 7fe18834f..e52fef7e0 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -17,7 +17,7 @@ import com.google.common.base.Predicates; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.ai.EntityAIAttackOnCollide; +import net.minecraft.entity.ai.EntityAIAttackMelee; import net.minecraft.entity.ai.EntityAINearestAttackableTarget; import net.minecraft.entity.ai.EntityAITasks.EntityAITaskEntry; import net.minecraft.entity.monster.IMob; @@ -70,8 +70,8 @@ public class SubTileHeiseiDream extends SubTileFunctional { if(entry.action instanceof EntityAINearestAttackableTarget) { messWithGetTargetAI((EntityAINearestAttackableTarget) entry.action, (EntityLiving) newTarget); did = true; - } else if(entry.action instanceof EntityAIAttackOnCollide) { - messWithAttackOnCollideAI((EntityAIAttackOnCollide) entry.action); + } else if(entry.action instanceof EntityAIAttackMelee) { + messWithAttackOnCollideAI((EntityAIAttackMelee) entry.action); did = true; } @@ -89,8 +89,8 @@ public class SubTileHeiseiDream extends SubTileFunctional { ReflectionHelper.setPrivateValue(EntityAINearestAttackableTarget.class, aiEntry, target, LibObfuscation.TARGET_ENTITY); } - private static void messWithAttackOnCollideAI(EntityAIAttackOnCollide aiEntry) { - ReflectionHelper.setPrivateValue(EntityAIAttackOnCollide.class, aiEntry, IMob.class, LibObfuscation.CLASS_TARGET); + private static void messWithAttackOnCollideAI(EntityAIAttackMelee aiEntry) { + ReflectionHelper.setPrivateValue(EntityAIAttackMelee.class, aiEntry, IMob.class, LibObfuscation.CLASS_TARGET); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java index d1b597383..141eb95df 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java @@ -15,6 +15,7 @@ import java.util.List; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EnumCreatureAttribute; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.math.AxisAlignedBB; @@ -38,8 +39,8 @@ public class SubTileHyacidus extends SubTileFunctional { List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityLivingBase entity : entities) { - if(!(entity instanceof EntityPlayer) && entity.getActivePotionEffect(Potion.poison) == null && mana >= cost && !entity.worldObj.isRemote && entity.getCreatureAttribute() != EnumCreatureAttribute.UNDEAD) { - entity.addPotionEffect(new PotionEffect(Potion.poison.id, 60, 0)); + if(!(entity instanceof EntityPlayer) && entity.getActivePotionEffect(MobEffects.poison) == null && mana >= cost && !entity.worldObj.isRemote && entity.getCreatureAttribute() != EnumCreatureAttribute.UNDEAD) { + entity.addPotionEffect(new PotionEffect(MobEffects.poison, 60, 0)); mana -= cost; } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java index af439a2f7..251fc8271 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java @@ -43,8 +43,9 @@ public class SubTileJadedAmaranthus extends SubTileFunctional { ); for(int i = 0; i < RANGE * 2; i++) { - Block blockAbove = supertile.getWorld().getBlockState(pos.up()).getBlock(); - if((supertile.getWorld().isAirBlock(pos.up()) || blockAbove.isReplaceable(supertile.getWorld(), pos.up())) && blockAbove.getMaterial() != Material.water && ModBlocks.flower.canPlaceBlockAt(supertile.getWorld(), pos.up())) { + IBlockState stateAbove = supertile.getWorld().getBlockState(pos.up()); + Block blockAbove = stateAbove.getBlock(); + if((supertile.getWorld().isAirBlock(pos.up()) || blockAbove.isReplaceable(supertile.getWorld(), pos.up())) && stateAbove.getMaterial() != Material.water && ModBlocks.flower.canPlaceBlockAt(supertile.getWorld(), pos.up())) { EnumDyeColor color = EnumDyeColor.byMetadata(supertile.getWorld().rand.nextInt(16)); IBlockState state = ModBlocks.flower.getDefaultState().withProperty(BotaniaStateProps.COLOR, color); if(ConfigHandler.blockBreakParticles) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java index 589873b60..823124279 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java @@ -14,7 +14,9 @@ import java.util.Random; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.ChestGenHooks; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.WorldServer; +import net.minecraft.world.storage.loot.LootContext; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -29,12 +31,12 @@ public class SubTileLoonuim extends SubTileFunctional { @Override public void onUpdate() { super.onUpdate(); - if(redstoneSignal == 0 && ticksExisted % 200 == 0 && mana >= COST) { + if(!supertile.getWorld().isRemote && redstoneSignal == 0 && ticksExisted % 200 == 0 && mana >= COST) { Random rand = supertile.getWorld().rand; ItemStack stack; do { - stack = ChestGenHooks.getOneItem(ChestGenHooks.DUNGEON_CHEST, rand); + stack = supertile.getWorld().getLootTableManager().getLootTableFromLocation(new ResourceLocation("minecraft", "chests/simple_dungeon")).generateLootForPools(rand, new LootContext.Builder(((WorldServer) supertile.getWorld())).build()).get(0); } while(stack == null || BotaniaAPI.looniumBlacklist.contains(stack.getItem())); int bound = RANGE * 2 + 1; @@ -43,8 +45,7 @@ public class SubTileLoonuim extends SubTileFunctional { entity.motionY = 0; entity.motionZ = 0; - if(!supertile.getWorld().isRemote) - supertile.getWorld().spawnEntityInWorld(entity); + supertile.getWorld().spawnEntityInWorld(entity); mana -= COST; sync(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java index aae35865b..337005591 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java @@ -15,6 +15,7 @@ import java.util.Arrays; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockStateMatcher; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -98,8 +99,8 @@ public class SubTileMarimorphosis extends SubTileFunctional { for(int j = -rangeY; j < rangeY; j++) for(int k = -range; k < range + 1; k++) { BlockPos pos = supertile.getPos().add(i, j, k); - Block block = supertile.getWorld().getBlockState(pos).getBlock(); - if(block != null && block.isReplaceableOreGen(supertile.getWorld(), pos, BlockStateMatcher.forBlock(Blocks.stone))) + IBlockState state = supertile.getWorld().getBlockState(pos); + if(state.getBlock().isReplaceableOreGen(state, supertile.getWorld(), pos, BlockStateMatcher.forBlock(Blocks.stone))) possibleCoords.add(pos); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java index 8ab4ab8ea..35a95b406 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java @@ -14,6 +14,7 @@ import java.util.List; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.math.AxisAlignedBB; @@ -35,7 +36,7 @@ public class SubTileMedumone extends SubTileFunctional { for(EntityLivingBase entity : entities) if(!(entity instanceof EntityPlayer)) { - entity.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 2, 100)); + entity.addPotionEffect(new PotionEffect(MobEffects.moveSlowdown, 2, 100)); mana--; if(mana == 0) return; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java index d805e3ef7..9a9638238 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java @@ -11,20 +11,22 @@ package vazkii.botania.common.block.subtile.functional; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import java.util.Map; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockStateMatcher; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.WeightedRandom; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.Botania; @@ -58,7 +60,7 @@ public class SubTileOrechid extends SubTileFunctional { supertile.getWorld().setBlockState(coords, block.getStateFromMeta(meta), 1 | 2); if(ConfigHandler.blockBreakParticles) supertile.getWorld().playAuxSFX(2001, coords, Block.getIdFromBlock(block) + (meta << 12)); - supertile.getWorld().playSoundEffect(supertile.getPos().getX(), supertile.getPos().getY(), supertile.getPos().getZ(), "botania:orechid", 2F, 1F); + supertile.getWorld().playSound(null, supertile.getPos(), BotaniaSoundEvents.orechid, SoundCategory.BLOCKS, 2F, 1F); mana -= cost; sync(); @@ -68,7 +70,7 @@ public class SubTileOrechid extends SubTileFunctional { } public ItemStack getOreToPut() { - Collection values = new ArrayList<>(); + List values = new ArrayList<>(); Map map = getOreMap(); for(String s : map.keySet()) values.add(new StringRandomItem(map.get(s), s)); @@ -105,8 +107,8 @@ public class SubTileOrechid extends SubTileFunctional { for(int j = -RANGE_Y; j < RANGE_Y; j++) for(int k = -RANGE; k < RANGE + 1; k++) { BlockPos pos = supertile.getPos().add(i, j, k); - Block block = supertile.getWorld().getBlockState(pos).getBlock(); - if(block != null && block.isReplaceableOreGen(supertile.getWorld(), pos, BlockStateMatcher.forBlock(source))) + IBlockState state = supertile.getWorld().getBlockState(pos); + if(state.getBlock().isReplaceableOreGen(state, supertile.getWorld(), pos, BlockStateMatcher.forBlock(source))) possibleCoords.add(pos); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java index 89a663867..d05adf47d 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java @@ -98,9 +98,10 @@ public class SubTileRannuncarpus extends SubTileFunctional { for(int j = -rangePlaceY; j < rangePlaceY + 1; j++) for(int l = -rangePlace; l < rangePlace + 1; l++) { BlockPos pos_ = pos.add(i, j, l); - Block blockAbove = supertile.getWorld().getBlockState(pos_.up()).getBlock(); + IBlockState stateAbove = supertile.getWorld().getBlockState(pos_.up()); + Block blockAbove = stateAbove.getBlock(); - if(filter.equals(supertile.getWorld(), pos_) && (blockAbove.isAir(supertile.getWorld(), pos_.up()) || blockAbove.isReplaceable(supertile.getWorld(), pos_.up()))) + if(filter.equals(supertile.getWorld(), pos_) && (blockAbove.isAir(stateAbove, supertile.getWorld(), pos_.up()) || blockAbove.isReplaceable(supertile.getWorld(), pos_.up()))) validPositions.add(pos_.up()); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index 3533761f6..6bd02d808 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -19,6 +19,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java index e7c0e663a..36d5559f7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -159,7 +160,8 @@ public class SubTileDandelifeon extends SubTileGenerating { void setBlockForGeneration(BlockPos pos, int gen, int prevGen) { World world = supertile.getWorld(); - Block blockAt = world.getBlockState(pos).getBlock(); + IBlockState stateAt = world.getBlockState(pos); + Block blockAt = stateAt.getBlock(); TileEntity tile = world.getTileEntity(pos); if(gen == -2) { int val = prevGen * MANA_PER_GEN; @@ -169,7 +171,7 @@ public class SubTileDandelifeon extends SubTileGenerating { if(gen < 0 || gen > MAX_GENERATIONS) world.setBlockToAir(pos); else ((TileCell) tile).setGeneration(supertile, gen); - } else if(gen >= 0 && blockAt.isAir(supertile.getWorld(), pos)) { + } else if(gen >= 0 && blockAt.isAir(stateAt, supertile.getWorld(), pos)) { world.setBlockState(pos, ModBlocks.cellBlock.getDefaultState()); tile = world.getTileEntity(pos); ((TileCell) tile).setGeneration(supertile, gen); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java index f6b64197f..b16b6fddd 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java @@ -59,7 +59,7 @@ public class SubTileDaybloom extends SubTilePassiveGenerating { @Override public boolean canGeneratePassively() { - boolean rain = supertile.getWorld().getBiomeGenForCoords(supertile.getPos()).getIntRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); + boolean rain = supertile.getWorld().getBiomeGenForCoords(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); return supertile.getWorld().isDaytime() && !rain && supertile.getWorld().canBlockSeeSky(supertile.getPos().up()); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index 98ee5699e..997fb8ddc 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -17,9 +17,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.EnumParticleTypes; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.block.ModBlocks; @@ -65,7 +67,7 @@ public class SubTileEndoflame extends SubTileGenerating { if(!supertile.getWorld().isRemote) { stack.stackSize--; - supertile.getWorld().playSoundEffect(supertile.getPos().getX(), supertile.getPos().getY(), supertile.getPos().getZ(), "botania:endoflame", 0.2F, 1F); + supertile.getWorld().playSound(null, supertile.getPos(), BotaniaSoundEvents.endoflame, SoundCategory.BLOCKS, 0.2F, 1F); if(stack.stackSize == 0) item.setDead(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java index bb241c779..e032701aa 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.subtile.generating; import java.util.List; import net.minecraft.entity.item.EntityTNTPrimed; +import net.minecraft.init.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumParticleTypes; @@ -33,11 +34,11 @@ public class SubTileEntropinnyum extends SubTileGenerating { if(mana == 0) { List tnts = supertile.getWorld().getEntitiesWithinAABB(EntityTNTPrimed.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityTNTPrimed tnt : tnts) { - if(tnt.fuse == 1 && !tnt.isDead && !supertile.getWorld().getBlockState(new BlockPos(tnt)).getBlock().getMaterial().isLiquid()) { + if(tnt.getFuse() == 1 && !tnt.isDead && !supertile.getWorld().getBlockState(new BlockPos(tnt)).getMaterial().isLiquid()) { if(!supertile.getWorld().isRemote) { + tnt.playSound(SoundEvents.entity_generic_explode, 0.2F, (1F + (supertile.getWorld().rand.nextFloat() - supertile.getWorld().rand.nextFloat()) * 0.2F) * 0.7F); tnt.setDead(); mana += getMaxMana(); - supertile.getWorld().playSoundEffect(tnt.posX, tnt.posY, tnt.posZ, "random.explode", 0.2F, (1F + (supertile.getWorld().rand.nextFloat() - supertile.getWorld().rand.nextFloat()) * 0.2F) * 0.7F); sync(); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java index ef7aea9af..d5f9e01dd 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.subtile.generating; import java.util.List; import net.minecraft.entity.item.EntityItem; +import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; @@ -68,7 +69,7 @@ public class SubTileGourmaryllis extends SubTileGenerating { int val = ((ItemFood) stack.getItem()).getHealAmount(stack); storedMana = val * val * 64; cooldown = val * 10; - supertile.getWorld().playSoundEffect(supertile.getPos().getX(), supertile.getPos().getY(), supertile.getPos().getZ(), "random.eat", 0.2F, 0.5F + (float) Math.random() * 0.5F); + item.playSound(SoundEvents.entity_generic_eat, 0.2F, 0.5F + (float) Math.random() * 0.5F); sync(); ((WorldServer) supertile.getWorld()).spawnParticle(EnumParticleTypes.ITEM_CRACK, false, item.posX, item.posY, item.posZ, 20, 0.1D, 0.1D, 0.1D, 0.05D, Item.getIdFromItem(stack.getItem()), stack.getItemDamage()); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java index 2695cf3cc..c2155846b 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java @@ -20,8 +20,10 @@ import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -65,13 +67,13 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { Material search = getMaterialToSearchFor(); PropertyInteger prop = supertile.getWorld().getBlockState(pos).getBlock() instanceof BlockLiquid ? BlockLiquid.LEVEL : supertile.getWorld().getBlockState(pos).getBlock() instanceof BlockFluidBase ? BlockFluidBase.LEVEL : null; - if(supertile.getWorld().getBlockState(pos).getBlock().getMaterial() == search && (getBlockToSearchBelow() == null || supertile.getWorld().getBlockState(pos.down()).getBlock() == getBlockToSearchBelow()) && (prop == null || supertile.getWorld().getBlockState(pos).getValue(prop) == 0)) { + if(supertile.getWorld().getBlockState(pos).getMaterial() == search && (getBlockToSearchBelow() == null || supertile.getWorld().getBlockState(pos.down()).getBlock() == getBlockToSearchBelow()) && (prop == null || supertile.getWorld().getBlockState(pos).getValue(prop) == 0)) { if(search != Material.water) supertile.getWorld().setBlockToAir(pos); else { int waterAround = 0; for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) - if(supertile.getWorld().getBlockState(pos.offset(dir)).getBlock().getMaterial() == search) + if(supertile.getWorld().getBlockState(pos.offset(dir)).getMaterial() == search) waterAround++; if(waterAround < 2) @@ -112,7 +114,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { } public void playSound() { - supertile.getWorld().playSoundEffect(supertile.getPos().getX(), supertile.getPos().getY(), supertile.getPos().getZ(), "random.drink", 0.01F, 0.5F + (float) Math.random() * 0.5F); + supertile.getWorld().playSound(null, supertile.getPos(), SoundEvents.entity_generic_drink, SoundCategory.BLOCKS, 0.01F, 0.5F + (float) Math.random() * 0.5F); } public int getBurnTime() { @@ -179,7 +181,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { @Override public int getDelayBetweenPassiveGeneration() { - boolean rain = supertile.getWorld().getBiomeGenForCoords(supertile.getPos()).getIntRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); + boolean rain = supertile.getWorld().getBiomeGenForCoords(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); return rain ? 1 : 2; } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java index c663c39de..6014fd2d6 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java @@ -13,6 +13,8 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.block.Block; import net.minecraft.block.BlockCake; import net.minecraft.block.state.IBlockState; +import net.minecraft.init.SoundEvents; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -43,7 +45,7 @@ public class SubTileKekimurus extends SubTileGenerating { else supertile.getWorld().setBlockState(pos, state.withProperty(BlockCake.BITES, nextSlicesEaten), 1 | 2); supertile.getWorld().playAuxSFX(2001, pos, Block.getStateId(state.withProperty(BlockCake.BITES, nextSlicesEaten))); - supertile.getWorld().playSoundEffect(supertile.getPos().getX(), supertile.getPos().getY(), supertile.getPos().getZ(), "random.eat", 1F, 0.5F + (float) Math.random() * 0.5F); + supertile.getWorld().playSound(null, supertile.getPos(), SoundEvents.entity_generic_eat, SoundCategory.BLOCKS, 1F, 0.5F + (float) Math.random() * 0.5F); this.mana += mana; sync(); return; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java index cd00067f5..bb870b563 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java @@ -62,14 +62,16 @@ public class SubTileMunchdew extends SubTileGenerating { for(int j = 0; j < RANGE_Y; j++) for(int k = -RANGE; k < RANGE + 1; k++) { BlockPos pos_ = pos.add(i, j, k); - Block block = supertile.getWorld().getBlockState(pos_).getBlock(); - if(block.getMaterial() == Material.leaves) { + if(supertile.getWorld().getBlockState(pos).getMaterial()== Material.leaves) { boolean exposed = false; - for(EnumFacing dir : EnumFacing.VALUES) - if(supertile.getWorld().getBlockState(pos_.offset(dir)).getBlock().isAir(supertile.getWorld(), pos_.offset(dir))) { + for(EnumFacing dir : EnumFacing.VALUES) { + IBlockState offState = supertile.getWorld().getBlockState(pos_.offset(dir)); + if(offState.getBlock().isAir(offState, supertile.getWorld(), pos_.offset(dir))) { exposed = true; break; } + } + if(exposed) coords.add(pos_); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java index 09907ff9f..321673dc4 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.subtile.generating; import java.util.List; import net.minecraft.entity.monster.EntitySlime; +import net.minecraft.init.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumParticleTypes; @@ -46,7 +47,7 @@ public class SubTileNarslimmus extends SubTileGenerating { int mana = 820 * mul; if(!slime.worldObj.isRemote) { slime.setDead(); - slime.worldObj.playSoundAtEntity(slime, "mob.slime." + (size > 1 ? "big" : "small"), 1F, 0.02F); + slime.playSound(size > 1 ? SoundEvents.entity_slime_squish : SoundEvents.entity_small_slime_squish, 1, 0.02F); this.mana = Math.min(getMaxMana(), this.mana + mana); sync(); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java index 1871bb3bf..672470373 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java @@ -11,7 +11,9 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.block.material.Material; +import net.minecraft.util.SoundCategory; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; import vazkii.botania.common.lexicon.LexiconData; @@ -44,7 +46,7 @@ public class SubTileThermalily extends SubTileHydroangeas { @Override public void playSound() { - supertile.getWorld().playSoundEffect(supertile.getPos().getX(), supertile.getPos().getY(), supertile.getPos().getZ(), "botania:thermalily", 0.2F, 1F); + supertile.getWorld().playSound(null, supertile.getPos(), BotaniaSoundEvents.thermalily, SoundCategory.BLOCKS, 0.2F, 1F); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java index 8411ff47e..aa116fbb5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -23,6 +23,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -143,8 +144,8 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil subTile.onBlockPlacedBy(world, pos, state, entity, stack); } - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { - return subTile == null ? false : subTile.onBlockActivated(world, pos, state, player, side, hitX, hitY, hitZ); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float hitX, float hitY, float hitZ) { + return subTile == null ? false : subTile.onBlockActivated(world, pos, state, player, hand, stack, side, hitX, hitY, hitZ); } public void onBlockAdded(World world, BlockPos pos, IBlockState state) { diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 07aaaa406..a0456a23e 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -82,7 +82,7 @@ public final class SkyblockWorldEvents { } else if(equipped != null && equipped.getItem() == Items.bowl && event.action == Action.RIGHT_CLICK_BLOCK && !event.world.isRemote) { RayTraceResult RayTraceResult = ToolCommons.raytraceFromEntity(event.world, event.entityPlayer, true, 4.5F); if(RayTraceResult != null) { - if (RayTraceResult.typeOfHit == RayTraceResult.Type.BLOCK) { + if (RayTraceResult.typeOfHit == net.minecraft.util.math.RayTraceResult.Type.BLOCK) { if(event.world.getBlockState(RayTraceResult.getBlockPos()).getBlock().getMaterial() == Material.water) { --equipped.stackSize;