diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java index 5545519a..f4c731f0 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.Constants; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; +import WayofTime.bloodmagic.api.Constants; public class ItemSigilElementalAffinity extends ItemSigilToggleable { @@ -20,7 +20,7 @@ public class ItemSigilElementalAffinity extends ItemSigilToggleable { player.fallDistance = 0; player.extinguish(); - player.addPotionEffect(new PotionEffect(Potion.fireResistance.id, 2, 1, true, false)); - player.addPotionEffect(new PotionEffect(Potion.waterBreathing.id, 2, 0, true, false)); + player.addPotionEffect(new PotionEffect(MobEffects.fireResistance, 2, 1, true, false)); + player.addPotionEffect(new PotionEffect(MobEffects.waterBreathing, 2, 0, true, false)); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java index e424e29c..ad7535a8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java @@ -1,16 +1,15 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.registry.ModPotions; +import java.util.List; + import net.minecraft.entity.Entity; import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; - -import java.util.List; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.registry.ModPotions; public class ItemSigilEnderSeverance extends ItemSigilToggleable { @@ -23,11 +22,11 @@ public class ItemSigilEnderSeverance extends ItemSigilToggleable @Override public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { - List entityList = world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(player.posX - 4.5, player.posY - 4.5, player.posZ - 4.5, player.posX + 4.5, player.posY + 4.5, player.posZ + 4.5)); + List entityList = world.getEntitiesWithinAABB(Entity.class, new net.minecraft.util.math.AxisAlignedBB(player.posX - 4.5, player.posY - 4.5, player.posZ - 4.5, player.posX + 4.5, player.posY + 4.5, player.posZ + 4.5)); for (Entity entity : entityList) { if (entity instanceof EntityEnderman) - ((EntityEnderman) entity).addPotionEffect(new PotionEffect(ModPotions.planarBinding.id, 40, 0)); + ((EntityEnderman) entity).addPotionEffect(new PotionEffect(ModPotions.planarBinding, 40, 0)); } } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java index 9142e565..2b8c47b6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.Constants; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; +import WayofTime.bloodmagic.api.Constants; public class ItemSigilFastMiner extends ItemSigilToggleable { @@ -18,6 +18,6 @@ public class ItemSigilFastMiner extends ItemSigilToggleable @Override public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { - player.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 2, 0, true, false)); + player.addPotionEffect(new PotionEffect(MobEffects.digSpeed, 2, 0, true, false)); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java index 7cf23ed2..7678f2f2 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java @@ -1,16 +1,16 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.Constants; import net.minecraft.block.Block; import net.minecraft.block.IGrowable; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; +import WayofTime.bloodmagic.api.BloodMagicAPI; +import WayofTime.bloodmagic.api.Constants; public class ItemSigilGreenGrove extends ItemSigilToggleable { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java index 695aeb9f..737f2659 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java @@ -18,6 +18,6 @@ public class ItemSigilHaste extends ItemSigilToggleable @Override public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { - player.addPotionEffect(new PotionEffect(ModPotions.boost.id, 2, 0, true, false)); + player.addPotionEffect(new PotionEffect(ModPotions.boost, 2, 0, true, false)); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java index 37b77d8f..f8e67160 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java @@ -1,19 +1,22 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.Constants; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; +import WayofTime.bloodmagic.api.Constants; public class ItemSigilLava extends ItemSigilBase { @@ -24,62 +27,60 @@ public class ItemSigilLava extends ItemSigilBase } @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if (!world.isRemote && !isUnusable(stack)) { - MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(world, player, false); + RayTraceResult movingobjectposition = this.getMovingObjectPositionFromPlayer(world, player, false); if (movingobjectposition != null) { - ItemStack ret = ForgeEventFactory.onBucketUse(player, world, stack, movingobjectposition); + ActionResult ret = ForgeEventFactory.onBucketUse(player, world, stack, movingobjectposition); if (ret != null) return ret; - if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) + if (movingobjectposition.typeOfHit == RayTraceResult.Type.BLOCK) { BlockPos blockpos = movingobjectposition.getBlockPos(); if (!world.isBlockModifiable(player, blockpos)) { - return stack; + return super.onItemRightClick(stack, world, player, hand); } if (!player.canPlayerEdit(blockpos.offset(movingobjectposition.sideHit), movingobjectposition.sideHit, stack)) { - return stack; + return super.onItemRightClick(stack, world, player, hand); } BlockPos blockpos1 = blockpos.offset(movingobjectposition.sideHit); if (!player.canPlayerEdit(blockpos1, movingobjectposition.sideHit, stack)) { - return stack; + return super.onItemRightClick(stack, world, player, hand); } if (this.canPlaceLava(world, blockpos1) && syphonNetwork(stack, player, getLPUsed()) && this.tryPlaceLava(world, blockpos1)) { - return stack; + return super.onItemRightClick(stack, world, player, hand); } } } } - return stack; + return super.onItemRightClick(stack, world, player, hand); } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos blockPos, EnumFacing side, float hitX, float hitY, float hitZ) + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos blockPos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { - super.onItemUse(stack, player, world, blockPos, side, hitX, hitY, hitZ); - if (world.isRemote || player.isSneaking() || isUnusable(stack)) { - return false; + return EnumActionResult.FAIL; } if (!world.canMineBlockBody(player, blockPos)) { - return false; + return EnumActionResult.FAIL; } TileEntity tile = world.getTileEntity(blockPos); @@ -93,7 +94,7 @@ public class ItemSigilLava extends ItemSigilBase ((IFluidHandler) tile).fill(side, fluid, true); } - return false; + return EnumActionResult.FAIL; } // else if (tile instanceof TESocket) { // return false; @@ -103,20 +104,20 @@ public class ItemSigilLava extends ItemSigilBase if (!player.canPlayerEdit(newPos, side, stack)) { - return false; + return EnumActionResult.FAIL; } if (this.canPlaceLava(world, newPos) && syphonNetwork(stack, player, getLPUsed())) { - return this.tryPlaceLava(world, newPos); + return this.tryPlaceLava(world, newPos) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; } - return false; + return EnumActionResult.FAIL; } public boolean canPlaceLava(World world, BlockPos blockPos) { - if (!world.isAirBlock(blockPos) && world.getBlockState(blockPos).getBlock().getMaterial().isSolid()) + if (!world.isAirBlock(blockPos) && world.getBlockState(blockPos).getBlock().getMaterial(world.getBlockState(blockPos)).isSolid()) { return false; } else if ((world.getBlockState(blockPos).getBlock() == Blocks.lava || world.getBlockState(blockPos).getBlock() == Blocks.flowing_lava) && world.getBlockState(blockPos).getBlock().getMetaFromState(world.getBlockState(blockPos)) == 0) @@ -129,10 +130,10 @@ public class ItemSigilLava extends ItemSigilBase } } - public boolean tryPlaceLava(World worldIn, BlockPos pos) + public boolean tryPlaceLava(World world, BlockPos pos) { - Material material = worldIn.getBlockState(pos).getBlock().getMaterial(); + Material material = world.getBlockState(pos).getBlock().getMaterial(world.getBlockState(pos)); - return worldIn.isAirBlock(pos) && !material.isSolid(); + return world.isAirBlock(pos) && !material.isSolid(); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java index 2a200a43..2aa491ed 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.Constants; +import java.util.List; + import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; - -import java.util.List; +import WayofTime.bloodmagic.api.Constants; public class ItemSigilMagnetism extends ItemSigilToggleable { @@ -26,8 +26,8 @@ public class ItemSigilMagnetism extends ItemSigilToggleable float posX = Math.round(player.posX); float posY = (float) (player.posY - player.getEyeHeight()); float posZ = Math.round(player.posZ); - List entities = player.worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.fromBounds(posX - 0.5f, posY - 0.5f, posZ - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f).expand(range, verticalRange, range)); - List xpOrbs = player.worldObj.getEntitiesWithinAABB(EntityXPOrb.class, AxisAlignedBB.fromBounds(posX - 0.5f, posY - 0.5f, posZ - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f).expand(range, verticalRange, range)); + List entities = player.worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(posX - 0.5f, posY - 0.5f, posZ - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f).expand(range, verticalRange, range)); + List xpOrbs = player.worldObj.getEntitiesWithinAABB(EntityXPOrb.class, new AxisAlignedBB(posX - 0.5f, posY - 0.5f, posZ - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f).expand(range, verticalRange, range)); for (EntityItem entity : entities) { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java index 947f2bd6..86e2f4b8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.registry.ModBlocks; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.registry.ModBlocks; public class ItemSigilPhantomBridge extends ItemSigilToggleable { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java index f3ac476e..cbb11b3f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.tile.TileSpectralBlock; -import WayofTime.bloodmagic.util.Utils; -import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.tile.TileSpectralBlock; +import WayofTime.bloodmagic.util.Utils; public class ItemSigilSuppression extends ItemSigilToggleable { @@ -39,9 +39,9 @@ public class ItemSigilSuppression extends ItemSigilToggleable } BlockPos blockPos = new BlockPos(x + i, y + j, z + k); - Block block = world.getBlockState(blockPos).getBlock(); + IBlockState state = world.getBlockState(blockPos); - if (Utils.isBlockLiquid(block) && world.getTileEntity(blockPos) == null) + if (Utils.isBlockLiquid(state) && world.getTileEntity(blockPos) == null) TileSpectralBlock.createSpectralBlock(world, blockPos, refresh); else { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java index f0030fb7..5a328511 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java @@ -1,21 +1,24 @@ package WayofTime.bloodmagic.item.sigil; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.teleport.TeleportQueue; import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.ritual.portal.Teleports; import WayofTime.bloodmagic.tile.TileTeleposer; import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.List; public class ItemSigilTeleposition extends ItemSigilBase { @@ -43,12 +46,12 @@ public class ItemSigilTeleposition extends ItemSigilBase } @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if (!world.isRemote && NBTHelper.checkNBT(stack) != null && stack.getTagCompound().hasKey(Constants.NBT.DIMENSION_ID) && stack.getTagCompound().hasKey(Constants.NBT.X_COORD) && stack.getTagCompound().hasKey(Constants.NBT.Y_COORD) && stack.getTagCompound().hasKey(Constants.NBT.Z_COORD)) { BlockPos blockPos = new BlockPos(getValue(stack.getTagCompound(), Constants.NBT.X_COORD), getValue(stack.getTagCompound(), Constants.NBT.Y_COORD), getValue(stack.getTagCompound(), Constants.NBT.Z_COORD)).up(); - if (world.provider.getDimensionId() == getValue(stack.getTagCompound(), Constants.NBT.DIMENSION_ID)) + if (world.provider.getDimension() == getValue(stack.getTagCompound(), Constants.NBT.DIMENSION_ID)) { TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(blockPos, player, getOwnerUUID(stack))); } else @@ -56,25 +59,25 @@ public class ItemSigilTeleposition extends ItemSigilBase TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(blockPos, player, getOwnerUUID(stack), world, getValue(stack.getTagCompound(), Constants.NBT.DIMENSION_ID))); } } - return stack; + return super.onItemRightClick(stack, world, player, hand); } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer entityPlayer, World world, BlockPos blockPos, EnumFacing side, float hitX, float hitY, float hitZ) + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { - if (!world.isRemote && entityPlayer.isSneaking() && NBTHelper.checkNBT(stack) != null) + if (!world.isRemote && player.isSneaking() && NBTHelper.checkNBT(stack) != null) { - if (world.getTileEntity(blockPos) != null && world.getTileEntity(blockPos) instanceof TileTeleposer) + if (world.getTileEntity(pos) != null && world.getTileEntity(pos) instanceof TileTeleposer) { - stack.getTagCompound().setInteger(Constants.NBT.DIMENSION_ID, world.provider.getDimensionId()); - stack.getTagCompound().setInteger(Constants.NBT.X_COORD, blockPos.getX()); - stack.getTagCompound().setInteger(Constants.NBT.Y_COORD, blockPos.getY()); - stack.getTagCompound().setInteger(Constants.NBT.Z_COORD, blockPos.getZ()); + stack.getTagCompound().setInteger(Constants.NBT.DIMENSION_ID, world.provider.getDimension()); + stack.getTagCompound().setInteger(Constants.NBT.X_COORD, pos.getX()); + stack.getTagCompound().setInteger(Constants.NBT.Y_COORD, pos.getY()); + stack.getTagCompound().setInteger(Constants.NBT.Z_COORD, pos.getZ()); - return true; + return EnumActionResult.SUCCESS; } } - return false; + return EnumActionResult.FAIL; } public int getValue(NBTTagCompound tag, String key) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java index ffce3971..a23d2a92 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java @@ -1,9 +1,7 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.effect.EntityLightningBolt; @@ -11,13 +9,17 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntityMobSpawner; -import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.List; +import WayofTime.bloodmagic.ConfigHandler; +import WayofTime.bloodmagic.api.BlockStack; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.util.helper.NBTHelper; public class ItemSigilTransposition extends ItemSigilBase { @@ -59,16 +61,17 @@ public class ItemSigilTransposition extends ItemSigilBase } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos blockPos, EnumFacing side, float hitX, float hitY, float hitZ) + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos blockPos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { stack = NBTHelper.checkNBT(stack); + IBlockState state = world.getBlockState(blockPos); if (!world.isRemote) { BlockStack rightClickedBlock = BlockStack.getStackFromPos(world, blockPos); if (!ConfigHandler.transpositionBlacklist.contains(rightClickedBlock) && player.isSneaking() && (!stack.getTagCompound().hasKey(Constants.NBT.CONTAINED_BLOCK_NAME) || !stack.getTagCompound().hasKey(Constants.NBT.CONTAINED_BLOCK_META))) { - if (rightClickedBlock.getBlock().getPlayerRelativeBlockHardness(player, world, blockPos) >= 0 && rightClickedBlock.getBlock().getBlockHardness(world, blockPos) >= 0) + if (rightClickedBlock.getBlock().getPlayerRelativeBlockHardness(state, player, world, blockPos) >= 0 && rightClickedBlock.getBlock().getBlockHardness(state, world, blockPos) >= 0) { int cost = getLPUsed(); @@ -97,7 +100,7 @@ public class ItemSigilTransposition extends ItemSigilBase world.removeTileEntity(blockPos); world.setBlockToAir(blockPos); - return true; + return EnumActionResult.SUCCESS; } } else if (stack.getTagCompound().hasKey(Constants.NBT.CONTAINED_BLOCK_NAME) && stack.getTagCompound().hasKey(Constants.NBT.CONTAINED_BLOCK_META)) { @@ -115,7 +118,7 @@ public class ItemSigilTransposition extends ItemSigilBase if (world.setBlockState(blockPos, blockToPlace.getState(), 3)) { blockToPlace.getBlock().onBlockPlacedBy(world, blockPos, blockToPlace.getState(), player, blockToPlace.getItemStack()); - world.playSoundEffect((double) ((float) blockPos.getX() + 0.5F), (double) ((float) blockPos.getY() + 0.5F), (double) ((float) blockPos.getZ() + 0.5F), blockToPlace.getBlock().stepSound.getPlaceSound(), (blockToPlace.getBlock().stepSound.getVolume() + 1.0F) / 2.0F, blockToPlace.getBlock().stepSound.getFrequency() * 0.8F); +// world.playSound((double) ((float) blockPos.getX() + 0.5F), (double) ((float) blockPos.getY() + 0.5F), (double) ((float) blockPos.getZ() + 0.5F), blockToPlace.getBlock().getStepSound().getPlaceSound(), (blockToPlace.getBlock().getStepSound().getVolume() + 1.0F) / 2.0F, blockToPlace.getBlock().getStepSound().getPitch() * 0.8F); if (stack.getTagCompound().hasKey(Constants.NBT.CONTAINED_TILE_ENTITY) && blockToPlace.getBlock().hasTileEntity(blockToPlace.getState())) { @@ -125,24 +128,24 @@ public class ItemSigilTransposition extends ItemSigilBase tag.setInteger("z", blockPos.getZ()); world.getTileEntity(blockPos).readFromNBT(tag); } - world.markBlockForUpdate(blockPos); + world.notifyBlockUpdate(blockPos, state, state, 3); stack.getTagCompound().removeTag(Constants.NBT.CONTAINED_BLOCK_NAME); stack.getTagCompound().removeTag(Constants.NBT.CONTAINED_BLOCK_META); stack.getTagCompound().removeTag(Constants.NBT.CONTAINED_TILE_ENTITY); lightning(world, blockPos); - return true; + return EnumActionResult.SUCCESS; } } } } - return false; + return EnumActionResult.FAIL; } public void lightning(World world, BlockPos blockPos) { - world.addWeatherEffect(new EntityLightningBolt(world, blockPos.getX(), blockPos.getY(), blockPos.getZ())); + world.addWeatherEffect(new EntityLightningBolt(world, blockPos.getX(), blockPos.getY(), blockPos.getZ(), true)); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java index 13b63ad7..a8e1a221 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java @@ -1,10 +1,12 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.Constants; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -12,6 +14,7 @@ import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fluids.IFluidHandler; +import WayofTime.bloodmagic.api.Constants; public class ItemSigilVoid extends ItemSigilBase { @@ -22,7 +25,7 @@ public class ItemSigilVoid extends ItemSigilBase } @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if (!world.isRemote && !isUnusable(stack)) { @@ -30,7 +33,7 @@ public class ItemSigilVoid extends ItemSigilBase if (movingobjectposition != null) { - ItemStack ret = ForgeEventFactory.onBucketUse(player, world, stack, movingobjectposition); + ActionResult ret = ForgeEventFactory.onBucketUse(player, world, stack, movingobjectposition); if (ret != null) return ret; @@ -40,50 +43,48 @@ public class ItemSigilVoid extends ItemSigilBase if (!world.isBlockModifiable(player, blockpos)) { - return stack; + return super.onItemRightClick(stack, world, player, hand); } if (!player.canPlayerEdit(blockpos.offset(movingobjectposition.sideHit), movingobjectposition.sideHit, stack)) { - return stack; + return super.onItemRightClick(stack, world, player, hand); } if (!player.canPlayerEdit(blockpos, movingobjectposition.sideHit, stack)) { - return stack; + return super.onItemRightClick(stack, world, player, hand); } - if (world.getBlockState(blockpos).getBlock().getMaterial().isLiquid() && syphonNetwork(stack, player, getLPUsed())) + if (world.getBlockState(blockpos).getBlock().getMaterial(world.getBlockState(blockpos)).isLiquid() && syphonNetwork(stack, player, getLPUsed())) { world.setBlockToAir(blockpos); - return stack; + return super.onItemRightClick(stack, world, player, hand); } } } else { - return stack; + return super.onItemRightClick(stack, world, player, hand); } if (!player.capabilities.isCreativeMode) this.setUnusable(stack, !syphonNetwork(stack, player, getLPUsed())); } - return stack; + return super.onItemRightClick(stack, world, player, hand); } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos blockPos, EnumFacing side, float hitX, float hitY, float hitZ) + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos blockPos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { - super.onItemUse(stack, player, world, blockPos, side, hitX, hitY, hitZ); - if (world.isRemote || player.isSneaking() || isUnusable(stack)) { - return false; + return EnumActionResult.FAIL; } if (!world.canMineBlockBody(player, blockPos)) { - return false; + return EnumActionResult.FAIL; } TileEntity tile = world.getTileEntity(blockPos); @@ -94,25 +95,25 @@ public class ItemSigilVoid extends ItemSigilBase if (amount != null && amount.amount > 0 && syphonNetwork(stack, player, getLPUsed())) { ((IFluidHandler) tile).drain(side, 1000, true); - return true; + return EnumActionResult.SUCCESS; } - return false; + return EnumActionResult.FAIL; } BlockPos newPos = blockPos.offset(side); if (!player.canPlayerEdit(newPos, side, stack)) { - return false; + return EnumActionResult.FAIL; } if (world.getBlockState(newPos).getBlock() instanceof IFluidBlock && syphonNetwork(stack, player, getLPUsed())) { world.setBlockToAir(newPos); - return true; + return EnumActionResult.SUCCESS; } - return false; + return EnumActionResult.FAIL; } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java index 10e51956..f9fced5f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java @@ -1,20 +1,25 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.Constants; import net.minecraft.block.BlockCauldron; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; +import WayofTime.bloodmagic.api.Constants; public class ItemSigilWater extends ItemSigilBase { @@ -25,52 +30,50 @@ public class ItemSigilWater extends ItemSigilBase } @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if (!world.isRemote && !isUnusable(stack)) { - MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(world, player, false); + RayTraceResult movingobjectposition = this.getMovingObjectPositionFromPlayer(world, player, false); if (movingobjectposition != null) { - ItemStack ret = net.minecraftforge.event.ForgeEventFactory.onBucketUse(player, world, stack, movingobjectposition); + ActionResult ret = net.minecraftforge.event.ForgeEventFactory.onBucketUse(player, world, stack, movingobjectposition); if (ret != null) return ret; - if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) + if (movingobjectposition.typeOfHit == RayTraceResult.Type.BLOCK) { BlockPos blockpos = movingobjectposition.getBlockPos(); if (!world.isBlockModifiable(player, blockpos)) - return stack; + return super.onItemRightClick(stack, world, player, hand); if (!player.canPlayerEdit(blockpos.offset(movingobjectposition.sideHit), movingobjectposition.sideHit, stack)) - return stack; + return super.onItemRightClick(stack, world, player, hand); BlockPos blockpos1 = blockpos.offset(movingobjectposition.sideHit); if (!player.canPlayerEdit(blockpos1, movingobjectposition.sideHit, stack)) - return stack; + return super.onItemRightClick(stack, world, player, hand); if (this.canPlaceWater(world, blockpos1) && syphonNetwork(stack, player, getLPUsed()) && this.tryPlaceWater(world, blockpos1)) - return stack; + return super.onItemRightClick(stack, world, player, hand); } } } - return stack; + return super.onItemRightClick(stack, world, player, hand); } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos blockPos, EnumFacing side, float hitX, float hitY, float hitZ) + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos blockPos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { - super.onItemUse(stack, player, world, blockPos, side, hitX, hitY, hitZ); - if (world.isRemote || player.isSneaking() || isUnusable(stack)) - return false; + return EnumActionResult.FAIL; if (!world.canMineBlockBody(player, blockPos)) - return false; + return EnumActionResult.FAIL; TileEntity tile = world.getTileEntity(blockPos); if (tile instanceof IFluidHandler) @@ -80,22 +83,22 @@ public class ItemSigilWater extends ItemSigilBase if (amount > 0 && syphonNetwork(stack, player, getLPUsed())) ((IFluidHandler) tile).fill(side, fluid, true); - return false; + return EnumActionResult.FAIL; } if (world.getBlockState(blockPos).getBlock() == Blocks.cauldron && syphonNetwork(stack, player, getLPUsed())) { world.setBlockState(blockPos, Blocks.cauldron.getDefaultState().withProperty(BlockCauldron.LEVEL, 3)); - return true; + return EnumActionResult.SUCCESS; } BlockPos newPos = blockPos.offset(side); - return player.canPlayerEdit(newPos, side, stack) && this.canPlaceWater(world, newPos) && syphonNetwork(stack, player, getLPUsed()) && this.tryPlaceWater(world, newPos); + return (player.canPlayerEdit(newPos, side, stack) && this.canPlaceWater(world, newPos) && syphonNetwork(stack, player, getLPUsed()) && this.tryPlaceWater(world, newPos)) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; } public boolean canPlaceWater(World world, BlockPos blockPos) { - if (!world.isAirBlock(blockPos) && world.getBlockState(blockPos).getBlock().getMaterial().isSolid()) + if (!world.isAirBlock(blockPos) && world.getBlockState(blockPos).getBlock().getMaterial(world.getBlockState(blockPos)).isSolid()) return false; else if ((world.getBlockState(blockPos).getBlock() == Blocks.water || world.getBlockState(blockPos).getBlock() == Blocks.flowing_water) && world.getBlockState(blockPos).getBlock().getMetaFromState(world.getBlockState(blockPos)) == 0) return false; @@ -106,7 +109,7 @@ public class ItemSigilWater extends ItemSigilBase public boolean tryPlaceWater(World worldIn, BlockPos pos) { - Material material = worldIn.getBlockState(pos).getBlock().getMaterial(); + Material material = worldIn.getBlockState(pos).getBlock().getMaterial(worldIn.getBlockState(pos)); boolean notSolid = !material.isSolid(); if (!worldIn.isAirBlock(pos) && !notSolid) @@ -119,7 +122,7 @@ public class ItemSigilWater extends ItemSigilBase int i = pos.getX(); int j = pos.getY(); int k = pos.getZ(); - worldIn.playSoundEffect((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), "random.fizz", 0.5F, 2.6F + (worldIn.rand.nextFloat() - worldIn.rand.nextFloat()) * 0.8F); + worldIn.playSound((EntityPlayer) null, i, j, k, SoundEvents.block_fire_extinguish, SoundCategory.BLOCKS, 0.5F, 2.6F + (worldIn.rand.nextFloat() - worldIn.rand.nextFloat()) * 0.8F); for (int l = 0; l < 8; ++l) worldIn.spawnParticle(EnumParticleTypes.SMOKE_LARGE, (double) i + Math.random(), (double) j + Math.random(), (double) k + Math.random(), 0.0D, 0.0D, 0.0D, 0); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java index a2cefbdc..7e9594c0 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java @@ -18,6 +18,6 @@ public class ItemSigilWhirlwind extends ItemSigilToggleable @Override public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { - player.addPotionEffect(new PotionEffect(ModPotions.whirlwind.id, 2, 0, true, false)); + player.addPotionEffect(new PotionEffect(ModPotions.whirlwind, 2, 0, true, false)); } }