From c23b9dcaee642f418d17969b97fb059da9c01f13 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 18 Mar 2016 20:20:23 -0500 Subject: [PATCH] Some blocks --- .../vazkii/botania/common/block/BlockAltar.java | 4 ++-- .../vazkii/botania/common/block/BlockAvatar.java | 4 ++-- .../vazkii/botania/common/block/BlockBifrost.java | 2 +- .../botania/common/block/BlockBifrostPerm.java | 2 +- .../vazkii/botania/common/block/BlockCamo.java | 6 +++--- .../vazkii/botania/common/block/BlockCocoon.java | 4 ++-- .../vazkii/botania/common/block/BlockFakeAir.java | 2 +- .../botania/common/block/BlockForestEye.java | 4 ++-- .../botania/common/block/BlockHourglass.java | 4 ++-- .../botania/common/block/BlockIncensePlate.java | 4 ++-- .../botania/common/block/BlockLightLauncher.java | 4 ++-- .../botania/common/block/BlockLightRelay.java | 4 ++-- .../botania/common/block/BlockPistonRelay.java | 2 +- .../vazkii/botania/common/block/BlockPylon.java | 4 ++-- .../botania/common/block/BlockSparkChanger.java | 4 ++-- .../botania/common/block/BlockTeruTeruBozu.java | 4 ++-- .../botania/common/block/BlockTinyPlanet.java | 4 ++-- .../block/corporea/BlockCorporeaCrystalCube.java | 13 ++++++------- .../common/block/corporea/BlockCorporeaIndex.java | 6 +++--- .../block/corporea/BlockCorporeaInterceptor.java | 4 ++-- .../block/corporea/BlockCorporeaRetainer.java | 4 ++-- .../common/block/decor/BlockBuriedPetals.java | 7 ++++--- .../common/block/decor/BlockCustomBrick.java | 2 +- .../botania/common/block/decor/BlockDirtPath.java | 10 +++++----- .../common/block/decor/BlockEndStoneBrick.java | 2 +- .../common/block/decor/BlockFloatingFlower.java | 14 +++++++------- .../common/block/decor/BlockManaBeacon.java | 4 ++-- .../common/block/decor/BlockManaFlame.java | 15 ++++++++------- .../common/block/decor/BlockManaGlass.java | 14 +++++--------- .../common/block/decor/BlockModMushroom.java | 11 ++++++----- .../botania/common/block/decor/BlockPavement.java | 2 +- .../common/block/decor/BlockPrismarine.java | 2 +- .../common/block/decor/BlockShinyFlower.java | 2 +- .../common/block/decor/BlockTinyPotato.java | 12 +++++++----- .../botania/common/block/decor/BlockUnstable.java | 6 +++--- .../common/block/decor/panes/BlockModPane.java | 3 ++- .../block/decor/quartz/BlockSpecialQuartz.java | 5 ----- .../decor/quartz/BlockSpecialQuartzSlab.java | 2 +- .../common/block/decor/walls/BlockModWall.java | 2 +- .../block/dispenser/BehaviourPoolMinecart.java | 2 +- .../common/block/dispenser/BehaviourSeeds.java | 2 +- .../botania/common/block/mana/BlockBellows.java | 4 ++-- .../botania/common/block/mana/BlockBrewery.java | 4 ++-- .../botania/common/block/mana/BlockEnchanter.java | 2 +- .../botania/common/block/mana/BlockPool.java | 4 ++-- .../botania/common/block/mana/BlockPrism.java | 4 ++-- .../botania/common/block/mana/BlockPump.java | 4 ++-- .../botania/common/block/mana/BlockRuneAltar.java | 4 ++-- .../common/block/mana/BlockSpawnerClaw.java | 4 ++-- .../botania/common/block/mana/BlockSpreader.java | 4 ++-- .../common/block/mana/BlockTerraPlate.java | 4 ++-- 51 files changed, 121 insertions(+), 125 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 2417664f0..d7b2a30ed 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -249,12 +249,12 @@ public class BlockAltar extends BlockMod implements ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 2a3b401e5..000d3c793 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -148,12 +148,12 @@ public class BlockAvatar extends BlockMod implements ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index bda653b4e..d65c60037 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -50,7 +50,7 @@ public class BlockBifrost extends BlockMod implements ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index 7f22761ab..010de0893 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -41,7 +41,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index cd8a008e6..0a88ef3ff 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -33,7 +33,7 @@ public abstract class BlockCamo extends BlockMod { } public static boolean isValidBlock(Block block) { - return block.isOpaqueCube() || block.getRenderType() == 3; + return block.isOpaqueCube(IBlockState state) || block.getRenderType() == 3; } @Override @@ -80,12 +80,12 @@ public abstract class BlockCamo extends BlockMod { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index 1116ec502..82c788822 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -43,12 +43,12 @@ public class BlockCocoon extends BlockMod implements ILexiconable { } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index 89d10ea66..ddad5a95b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -87,7 +87,7 @@ public class BlockFakeAir extends BlockMod { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index 4a4cf96cc..71fc50581 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -35,12 +35,12 @@ public class BlockForestEye extends BlockMod implements ILexiconable { } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 6071ab996..b7548abdb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -166,12 +166,12 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 8b5d1735a..3f4d41579 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -126,12 +126,12 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index 72ffa1d31..e1238c8f0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -63,12 +63,12 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 7cd3355c9..2cd0b48cb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -135,12 +135,12 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index c89c24664..096a4414e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -73,7 +73,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 447509ca8..cac93375f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -92,12 +92,12 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 70d304354..e6a66da51 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -65,12 +65,12 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 18f1b8b27..ba90f25fc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -97,12 +97,12 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index 02441306c..1496e3dcc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -36,12 +36,12 @@ public class BlockTinyPlanet extends BlockMod implements ILexiconable { } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(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 7e5de67f5..242d63cad 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -19,6 +19,7 @@ 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.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; @@ -81,9 +82,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi } @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) { TileCorporeaCrystalCube cube = (TileCorporeaCrystalCube) world.getTileEntity(pos); cube.setRequestTarget(stack); @@ -93,12 +92,12 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @@ -113,12 +112,12 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi } @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 ((TileCorporeaCrystalCube) world.getTileEntity(pos)).compValue; } 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 14c37d95a..294fe5109 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -43,17 +43,17 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @Override - public EnumBlockRenderType getRenderType() { + public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } 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 eae0b703e..9fecddb29 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -59,12 +59,12 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi } @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/corporea/BlockCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java index bc127f9cf..6469e3680 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -69,12 +69,12 @@ public class BlockCorporeaRetainer extends BlockMod implements ILexiconable, ICr } @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 ((TileCorporeaRetainer) world.getTileEntity(pos)).hasPendingRequest() ? 15 : 0; } 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 7ee50d87f..de6820c3f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -15,6 +15,7 @@ import java.util.Random; 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.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -36,7 +37,7 @@ public class BlockBuriedPetals extends BlockModFlower { @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, BlockPos pos) { + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); } @@ -65,7 +66,7 @@ public class BlockBuriedPetals extends BlockModFlower { } @Override - public int getRenderType() { - return -1; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.INVISIBLE; } } 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 b71e76da7..74aaf4017 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -85,7 +85,7 @@ public class BlockCustomBrick 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/BlockDirtPath.java b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java index 886756bf4..750a958b6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -64,7 +64,7 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { public void onEntityCollidedWithBlock(World world, BlockPos pos, Entity entity) { if(!world.isRemote && entity instanceof EntityPlayerMP) { EntityLivingBase living = ((EntityLivingBase) entity); - IAttributeInstance attr = living.getEntityAttribute(SharedMonsterAttributes.movementSpeed); + IAttributeInstance attr = living.getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED); if(!attr.hasModifier(speedBoost)) { attr.applyModifier(speedBoost); } @@ -90,22 +90,22 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { } @Override - public AxisAlignedBB getCollisionBoundingBox(World world, BlockPos pos, IBlockState state) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) { return new AxisAlignedBB(pos, pos.add(1, 1, 1)); } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @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/decor/BlockEndStoneBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java index c1061b71d..88948cc17 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -85,7 +85,7 @@ public class BlockEndStoneBrick 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/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index 86e322f54..fb7075aae 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -27,6 +27,7 @@ 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.util.EnumParticleTypes; @@ -83,7 +84,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu } @Override - public EnumBlockRenderType getRenderType() { + public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @@ -153,7 +154,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, BlockPos pos) { + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); } @@ -173,7 +174,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu } @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; @@ -195,18 +196,17 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @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) { IFloatingFlower flower = (IFloatingFlower) world.getTileEntity(pos); IslandType type = null; 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 42b8083d6..d33717f79 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -84,12 +84,12 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } 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 d094ad4fa..5688bbb79 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -20,6 +20,8 @@ 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; @@ -58,17 +60,17 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { } @Override - public int getRenderType() { - return -1; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.INVISIBLE; } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @@ -78,14 +80,13 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { } @Override - public AxisAlignedBB getCollisionBoundingBox(World p_149668_1_, BlockPos pos, IBlockState state) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) { return null; } @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(WorldTypeSkyblock.isWorldSkyblock(world)) { - ItemStack stack = player.getCurrentEquippedItem(); if(stack != null && stack.getItem() == Item.getItemFromBlock(Blocks.sapling) && !player.inventory.hasItem(ModItems.lexicon)) { if(!world.isRemote) stack.stackSize--; 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 1830655c6..d87f70bac 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.Block; 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; @@ -40,19 +41,14 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } - public boolean shouldSideBeRendered1(IBlockAccess world, BlockPos pos, EnumFacing side) { - Block block = world.getBlockState(pos).getBlock(); - - return block == this ? false : super.shouldSideBeRendered(world, pos, side); - } - @Override - public boolean shouldSideBeRendered(IBlockAccess world, BlockPos pos, EnumFacing side) { - return shouldSideBeRendered1(world, pos, side.getOpposite()); + public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + Block block = world.getBlockState(pos).getBlock(); + return block == this ? false : super.shouldSideBeRendered(state, world, pos, side); } @Override 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 65ed116a4..580509a61 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -83,10 +83,11 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public boolean canPlaceBlockAt(World p_149718_1_, BlockPos pos) { + public boolean canPlaceBlockAt(World world, BlockPos pos) { if(pos.getY() >= 0 && pos.getY() < 256) { - Block block = p_149718_1_.getBlockState(pos.down()).getBlock(); - return block == Blocks.mycelium || block == Blocks.dirt && p_149718_1_.getBlockState(pos.down()).getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.PODZOL || block.canSustainPlant(p_149718_1_, pos.down(), EnumFacing.UP, this); + IBlockState state = world.getBlockState(pos.down()); + Block block = state.getBlock(); + return block == Blocks.mycelium || block == Blocks.dirt && state.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.PODZOL || block.canSustainPlant(state, world, pos.down(), EnumFacing.UP, this); } return false; @@ -112,7 +113,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, BlockPos pos) { + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); } @@ -122,7 +123,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @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/decor/BlockPavement.java b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java index 6d806751f..73f83127d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -103,7 +103,7 @@ public class BlockPavement extends BlockMod { } @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/BlockPrismarine.java b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java index 998adc9ea..44c7333a4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -87,7 +87,7 @@ public class BlockPrismarine 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/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index 22faa10ac..b8d24793a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -37,7 +37,7 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, BlockPos pos) { + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); } 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 05a0dbd7d..0c03ea4e4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -21,6 +21,8 @@ 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.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; @@ -93,7 +95,7 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { } @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 stack, EnumFacing par6, float par7, float par8, float par9) { TileEntity tile = par1World.getTileEntity(pos); if(tile instanceof TileTinyPotato) { ((TileTinyPotato) tile).interact(); @@ -133,18 +135,18 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @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/decor/BlockUnstable.java b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java index d65911cb1..a78838f75 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -85,17 +85,17 @@ public class BlockUnstable extends BlockMod implements ILexiconable { } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { + public void randomDisplayTick(IBlockState state, World par1World, BlockPos pos, Random par5Random) { int color = getRenderColor(state); 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/panes/BlockModPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java index 0bf5cd1c0..9e28aee39 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 @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor.panes; import net.minecraft.block.Block; import net.minecraft.block.BlockPane; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; @@ -43,7 +44,7 @@ public class BlockModPane extends BlockPane { } @Override - public boolean shouldSideBeRendered(IBlockAccess iblockaccess, BlockPos pos, EnumFacing side) { + public boolean shouldSideBeRendered(IBlockState state, IBlockAccess iblockaccess, BlockPos pos, EnumFacing side) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java index e040076ed..a14741554 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java @@ -116,11 +116,6 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { return new ItemStack(this, 1, damageDropped(state)); } - @Override - public int getRenderType() { - return 3; - } - @Override @SideOnly(Side.CLIENT) public void getSubBlocks(Item item, CreativeTabs tab, List par3List) { diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java index eb682412c..ba9c1993f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java @@ -79,7 +79,7 @@ public class BlockSpecialQuartzSlab extends BlockModSlab { } @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(getSingleBlock()); } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index b701481b3..04e8cf9e7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -73,7 +73,7 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable { } @Override - public boolean canPlaceTorchOnTop(IBlockAccess world, BlockPos pos) { + public boolean canPlaceTorchOnTop(IBlockState state, IBlockAccess world, BlockPos pos) { return true; } diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java index 04f5dc9ad..1c1046a19 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java @@ -39,7 +39,7 @@ public class BehaviourPoolMinecart extends BehaviorDefaultDispenseItem { if(BlockRailBase.isRailBlock(state)) d3 = 0.0D; else { - if(state.getBlock().getMaterial() != Material.air || !BlockRailBase.isRailBlock(world.getBlockState(pos.down()))) + if(state.getMaterial() != Material.air || !BlockRailBase.isRailBlock(world.getBlockState(pos.down()))) return super.dispenseStack(p_82487_1_, p_82487_2_); d3 = -1.0D; diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java index baf4b2fb9..a8c83de7c 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java @@ -33,7 +33,7 @@ public class BehaviourSeeds extends BehaviorDefaultDispenseItem { BlockPos pos = par1IBlockSource.getBlockPos().offset(facing); World world = par1IBlockSource.getWorld(); - if(world.getBlockState(pos).getBlock().isAir(world, pos) && block.canPlaceBlockAt(world, pos)) { + if(world.getBlockState(pos).getBlock().isAir(world.getBlockState(pos), world, pos) && block.canPlaceBlockAt(world, pos)) { world.setBlockState(pos, block.getDefaultState()); par2ItemStack.stackSize--; return par2ItemStack; 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 3b807b6d0..c5e130030 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -73,12 +73,12 @@ public class BlockBellows extends BlockMod implements ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } 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 a075c9da1..4b7dcf76f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -147,12 +147,12 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } 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 f4508305d..952bd34d4 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -95,7 +95,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } 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 0944e063b..8cb69cb5f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -171,12 +171,12 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } 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 5150ad079..40c28d027 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -88,12 +88,12 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } 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 895058364..21909928b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -88,12 +88,12 @@ public class BlockPump extends BlockMod implements ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } 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 e83065eb6..f2f1050d7 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -50,12 +50,12 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java index 13b3dad9a..7490bead3 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -48,12 +48,12 @@ public class BlockSpawnerClaw extends BlockMod implements ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index 03a9ab72b..fa76ebccc 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -135,12 +135,12 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } 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 d75b4d35a..e03660b9f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -70,12 +70,12 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; }