diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EnergyBlastProjectile.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EnergyBlastProjectile.java index 4dc6faf7..3d6b7e36 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EnergyBlastProjectile.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EnergyBlastProjectile.java @@ -4,6 +4,7 @@ import java.util.Iterator; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IProjectile; @@ -12,7 +13,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; @@ -20,7 +23,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.IThrowableEntity; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; //Shamelessly ripped off from x3n0ph0b3 public class EnergyBlastProjectile extends Entity implements IProjectile, IThrowableEntity @@ -53,7 +55,6 @@ public class EnergyBlastProjectile extends Entity implements IProjectile, IThrow super(par1World); this.setSize(0.5F, 0.5F); this.setPosition(par2, par4, par6); - yOffset = 0.0F; this.maxTicksInAir = 600; } @@ -68,7 +69,6 @@ public class EnergyBlastProjectile extends Entity implements IProjectile, IThrow posY -= 0.2D; posZ -= MathHelper.sin(rotationYaw / 180.0F * (float) Math.PI) * 0.16F; this.setPosition(posX, posY, posZ); - yOffset = 0.0F; motionX = -MathHelper.sin(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI); motionZ = MathHelper.cos(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI); motionY = -MathHelper.sin(rotationPitch / 180.0F * (float) Math.PI); @@ -88,7 +88,6 @@ public class EnergyBlastProjectile extends Entity implements IProjectile, IThrow posY -= 0.2D; posZ -= MathHelper.sin(rotationYaw / 180.0F * (float) Math.PI) * 0.16F; this.setPosition(posX, posY, posZ); - yOffset = 0.0F; motionX = -MathHelper.sin(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI); motionZ = MathHelper.cos(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI); motionY = -MathHelper.sin(rotationPitch / 180.0F * (float) Math.PI); @@ -104,7 +103,7 @@ public class EnergyBlastProjectile extends Entity implements IProjectile, IThrow this.shootingEntity = par2EntityLivingBase; this.posY = par2EntityLivingBase.posY + (double) par2EntityLivingBase.getEyeHeight() - 0.10000000149011612D; double d0 = par3EntityLivingBase.posX - par2EntityLivingBase.posX; - double d1 = par3EntityLivingBase.boundingBox.minY + (double) (par3EntityLivingBase.height / 1.5F) - this.posY; + double d1 = par3EntityLivingBase.getBoundingBox().minY + (double) (par3EntityLivingBase.height / 1.5F) - this.posY; double d2 = par3EntityLivingBase.posZ - par2EntityLivingBase.posZ; double d3 = (double) MathHelper.sqrt_double(d0 * d0 + d2 * d2); @@ -115,7 +114,6 @@ public class EnergyBlastProjectile extends Entity implements IProjectile, IThrow double d4 = d0 / d3; double d5 = d2 / d3; this.setLocationAndAngles(par2EntityLivingBase.posX + d4, this.posY, par2EntityLivingBase.posZ + d5, f2, f3); - this.yOffset = 0.0F; float f4 = (float) d3 * 0.2F; this.setThrowableHeading(d0, d1, d2, par4, par5); } @@ -155,18 +153,6 @@ public class EnergyBlastProjectile extends Entity implements IProjectile, IThrow prevRotationPitch = rotationPitch = (float) (Math.atan2(var3, var10) * 180.0D / Math.PI); } - @Override - @SideOnly(Side.CLIENT) - /** - * Sets the position and rotation. Only difference from the other one is no bounding on the rotation. Args: posX, - * posY, posZ, yaw, pitch - */ - public void setPositionAndRotation2(double par1, double par3, double par5, float par7, float par8, int par9) - { - this.setPosition(par1, par3, par5); - this.setRotation(par7, par8); - } - @Override @SideOnly(Side.CLIENT) /** @@ -233,28 +219,21 @@ public class EnergyBlastProjectile extends Entity implements IProjectile, IThrow prevRotationPitch = rotationPitch = (float) (Math.atan2(motionY, var1) * 180.0D / Math.PI); } - Block var16 = worldObj.getBlock(xTile, yTile, zTile); + IBlockState state = worldObj.getBlockState(new BlockPos(xTile, yTile, zTile)); + Block var16 = state.getBlock(); if (var16 != null) { - var16.setBlockBoundsBasedOnState(worldObj, xTile, yTile, zTile); - AxisAlignedBB var2 = var16.getCollisionBoundingBoxFromPool(worldObj, xTile, yTile, zTile); + var16.setBlockBoundsBasedOnState(worldObj, new BlockPos(xTile, yTile, zTile)); + AxisAlignedBB var2 = var16.getCollisionBoundingBox(worldObj, new BlockPos(xTile, yTile, zTile), state); - if (var2 != null && var2.isVecInside(SpellHelper.createVec3(posX, posY, posZ))) + if (var2 != null && var2.isVecInside(new Vec3(posX, posY, posZ))) { inGround = true; } } - if (inGround) - { - Block var18 = worldObj.getBlock(xTile, yTile, zTile); - int var19 = worldObj.getBlockMetadata(xTile, yTile, zTile); - - if (var18.equals(Block.getBlockById(inTile)) && var19 == inData) - { - } - } else + if (!inGround) { ++ticksInAir; @@ -266,19 +245,19 @@ public class EnergyBlastProjectile extends Entity implements IProjectile, IThrow } } - Vec3 var17 = SpellHelper.createVec3(posX, posY, posZ); - Vec3 var3 = SpellHelper.createVec3(posX + motionX, posY + motionY, posZ + motionZ); - MovingObjectPosition var4 = worldObj.func_147447_a(var17, var3, true, false, false); - var17 = SpellHelper.createVec3(posX, posY, posZ); - var3 = SpellHelper.createVec3(posX + motionX, posY + motionY, posZ + motionZ); + Vec3 var17 = new Vec3(posX, posY, posZ); + Vec3 var3 = new Vec3(posX + motionX, posY + motionY, posZ + motionZ); + MovingObjectPosition var4 = worldObj.rayTraceBlocks(var17, var3, true, false, false); + var17 = new Vec3(posX, posY, posZ); + var3 = new Vec3(posX + motionX, posY + motionY, posZ + motionZ); if (var4 != null) { - var3 = SpellHelper.createVec3(var4.hitVec.xCoord, var4.hitVec.yCoord, var4.hitVec.zCoord); + var3 = new Vec3(var4.hitVec.xCoord, var4.hitVec.yCoord, var4.hitVec.zCoord); } Entity var5 = null; - List var6 = worldObj.getEntitiesWithinAABBExcludingEntity(this, boundingBox.addCoord(motionX, motionY, motionZ).expand(1.0D, 1.0D, 1.0D)); + List var6 = worldObj.getEntitiesWithinAABBExcludingEntity(this, getBoundingBox().addCoord(motionX, motionY, motionZ).expand(1.0D, 1.0D, 1.0D)); double var7 = 0.0D; Iterator var9 = var6.iterator(); float var11; @@ -290,7 +269,7 @@ public class EnergyBlastProjectile extends Entity implements IProjectile, IThrow if (var10.canBeCollidedWith() && (var10 != shootingEntity || ticksInAir >= 5)) { var11 = 0.3F; - AxisAlignedBB var12 = var10.boundingBox.expand(var11, var11, var11); + AxisAlignedBB var12 = var10.getBoundingBox().expand(var11, var11, var11); MovingObjectPosition var13 = var12.calculateIntercept(var17, var3); if (var13 != null) @@ -331,8 +310,8 @@ public class EnergyBlastProjectile extends Entity implements IProjectile, IThrow public void doFiringParticles() { - worldObj.spawnParticle("mobSpellAmbient", posX + smallGauss(0.1D), posY + smallGauss(0.1D), posZ + smallGauss(0.1D), 0.5D, 0.5D, 0.5D); - worldObj.spawnParticle("flame", posX, posY, posZ, gaussian(motionX), gaussian(motionY), gaussian(motionZ)); + worldObj.spawnParticle(EnumParticleTypes.SPELL_MOB_AMBIENT, posX + smallGauss(0.1D), posY + smallGauss(0.1D), posZ + smallGauss(0.1D), 0.5D, 0.5D, 0.5D); + worldObj.spawnParticle(EnumParticleTypes.FLAME, posX, posY, posZ, gaussian(motionX), gaussian(motionY), gaussian(motionZ)); } /** @@ -379,13 +358,6 @@ public class EnergyBlastProjectile extends Entity implements IProjectile, IThrow return false; } - @Override - @SideOnly(Side.CLIENT) - public float getShadowSize() - { - return 0.0F; - } - /** * Sets the amount of knockback the arrow applies when it hits a mob. */ @@ -462,20 +434,15 @@ public class EnergyBlastProjectile extends Entity implements IProjectile, IThrow worldObj.createExplosion(shootingEntity, this.posX, this.posY, this.posZ, (float) (0.1), true); } - spawnHitParticles("magicCrit", 8); + spawnHitParticles(EnumParticleTypes.CRIT_MAGIC, 8); this.setDead(); } - private int d6() - { - return rand.nextInt(6) + 1; - } - - protected void spawnHitParticles(String string, int i) + protected void spawnHitParticles(EnumParticleTypes type, int i) { for (int particles = 0; particles < i; particles++) { - worldObj.spawnParticle(string, posX, posY - (string == "portal" ? 1 : 0), posZ, gaussian(motionX), gaussian(motionY), gaussian(motionZ)); + worldObj.spawnParticle(type, posX, posY - (type == EnumParticleTypes.PORTAL ? 1 : 0), posZ, gaussian(motionX), gaussian(motionY), gaussian(motionZ)); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/AWBaseItems.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/AWBaseItems.java index 2960e5ee..f45f9ae2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/AWBaseItems.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/AWBaseItems.java @@ -1,14 +1,12 @@ package WayofTime.alchemicalWizardry.common.items; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.ModItems; -import net.minecraft.client.renderer.texture.IIconRegister; +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; - -import java.util.List; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; public class AWBaseItems extends Item { @@ -19,23 +17,6 @@ public class AWBaseItems extends Item setCreativeTab(AlchemicalWizardry.tabBloodMagic); } - public void registerIcons(IIconRegister iconRegister) - { - if (this.equals(ModItems.blankSlate)) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:BlankSlate"); - } else if (this.equals(ModItems.reinforcedSlate)) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:ReinforcedSlate"); - } else if (this.equals(ModItems.imbuedSlate)) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:InfusedSlate"); - } else if (this.equals(ModItems.demonicSlate)) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:DemonSlate"); - } - } - @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java index 75354585..1661b0ff 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java @@ -1,30 +1,27 @@ package WayofTime.alchemicalWizardry.common.items; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import org.lwjgl.input.Keyboard; -import java.util.List; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; public class ActivationCrystal extends EnergyItems { private static final String[] ACTIVATION_CRYSTAL_NAMES = new String[]{"Weak", "Awakened", "Creative"}; - @SideOnly(Side.CLIENT) - private IIcon[] icons; - public ActivationCrystal() { super(); @@ -34,18 +31,6 @@ public class ActivationCrystal extends EnergyItems this.hasSubtypes = true; } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - icons = new IIcon[ACTIVATION_CRYSTAL_NAMES.length]; - - for (int i = 0; i < ACTIVATION_CRYSTAL_NAMES.length; ++i) - { - icons[i] = iconRegister.registerIcon("AlchemicalWizardry:" + "activationCrystal" + ACTIVATION_CRYSTAL_NAMES[i]); - } - } - @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { @@ -119,14 +104,6 @@ public class ActivationCrystal extends EnergyItems return ("" + "item.activationCrystal" + ACTIVATION_CRYSTAL_NAMES[meta]); } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int meta) - { - int j = MathHelper.clamp_int(meta, 0, ACTIVATION_CRYSTAL_NAMES.length - 1); - return icons[j]; - } - @Override @SideOnly(Side.CLIENT) public void getSubItems(Item id, CreativeTabs creativeTab, List list) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/AirScribeTool.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/AirScribeTool.java index 612ee865..d3332bbc 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/AirScribeTool.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/AirScribeTool.java @@ -1,8 +1,5 @@ package WayofTime.alchemicalWizardry.common.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; public class AirScribeTool extends ScribeTool { @@ -10,11 +7,4 @@ public class AirScribeTool extends ScribeTool { super(4); } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:AirScribeTool"); - } } \ No newline at end of file diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ApprenticeBloodOrb.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ApprenticeBloodOrb.java index ac3aa56c..64432cd8 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ApprenticeBloodOrb.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ApprenticeBloodOrb.java @@ -1,8 +1,5 @@ package WayofTime.alchemicalWizardry.common.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; public class ApprenticeBloodOrb extends EnergyBattery { @@ -11,11 +8,4 @@ public class ApprenticeBloodOrb extends EnergyBattery super(damage); orbLevel = 2; } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:ApprenticeBloodOrb"); - } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ArchmageBloodOrb.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ArchmageBloodOrb.java index 065781e3..ae0ef586 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ArchmageBloodOrb.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ArchmageBloodOrb.java @@ -1,8 +1,5 @@ package WayofTime.alchemicalWizardry.common.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; public class ArchmageBloodOrb extends EnergyBattery { @@ -11,11 +8,4 @@ public class ArchmageBloodOrb extends EnergyBattery super(damage); orbLevel = 5; } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:ArchmageBloodOrb"); - } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java index 8c3fe83b..20fd9f0c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java @@ -1,26 +1,18 @@ package WayofTime.alchemicalWizardry.common.items; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; +import java.util.List; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; - -import java.util.List; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; public class ArmourInhibitor extends EnergyItems { - @SideOnly(Side.CLIENT) - private IIcon activeIcon; - @SideOnly(Side.CLIENT) - private IIcon passiveIcon; private int tickDelay = 200; public ArmourInhibitor() @@ -32,117 +24,76 @@ public class ArmourInhibitor extends EnergyItems } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { - par3List.add(StatCollector.translateToLocal("tooltip.armorinhibitor.desc1")); - par3List.add(StatCollector.translateToLocal("tooltip.armorinhibitor.desc2")); + list.add(StatCollector.translateToLocal("tooltip.armorinhibitor.desc1")); + list.add(StatCollector.translateToLocal("tooltip.armorinhibitor.desc2")); - if (!(par1ItemStack.getTagCompound() == null)) + if (!(stack.getTagCompound() == null)) { - if (par1ItemStack.getTagCompound().getBoolean("isActive")) + if (stack.getTagCompound().getBoolean("isActive")) { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.activated")); + list.add(StatCollector.translateToLocal("tooltip.sigil.state.activated")); } else { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.deactivated")); + list.add(StatCollector.translateToLocal("tooltip.sigil.state.deactivated")); } - par3List.add(StatCollector.translateToLocal("tooltip.owner.currentowner") + " " + par1ItemStack.getTagCompound().getString("ownerName")); + list.add(StatCollector.translateToLocal("tooltip.owner.currentowner") + " " + stack.getTagCompound().getString("ownerName")); } } @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:ArmourInhibitor_deactivated"); - this.activeIcon = iconRegister.registerIcon("AlchemicalWizardry:ArmourInhibitor_activated"); - this.passiveIcon = iconRegister.registerIcon("AlchemicalWizardry:ArmourInhibitor_deactivated"); - } + if (!EnergyItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) + { + return stack; + } - @Override - public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) - { if (stack.getTagCompound() == null) { stack.setTagCompound(new NBTTagCompound()); } NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) - { - return this.activeIcon; - } else - { - return this.passiveIcon; - } - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int par1) - { - if (par1 == 1) - { - return this.activeIcon; - } else - { - return this.passiveIcon; - } - } - - @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) - { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) - { - return par1ItemStack; - } - - if (par1ItemStack.getTagCompound() == null) - { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = par1ItemStack.getTagCompound(); tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); if (tag.getBoolean("isActive")) { - par1ItemStack.setItemDamage(1); - tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % tickDelay); + stack.setItemDamage(1); + tag.setInteger("worldTimeDelay", (int) (world.getWorldTime() - 1) % tickDelay); } else { - par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage()); + stack.setItemDamage(stack.getMaxDamage()); } - return par1ItemStack; + return stack; } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) + public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) { - if (!(par3Entity instanceof EntityPlayer)) + if (!(entity instanceof EntityPlayer)) { return; } - EntityPlayer par3EntityPlayer = (EntityPlayer) par3Entity; + EntityPlayer player = (EntityPlayer) entity; - if (par1ItemStack.getTagCompound() == null) + if (stack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new NBTTagCompound()); } - if (par1ItemStack.getTagCompound().getBoolean("isActive")) + if (stack.getTagCompound().getBoolean("isActive")) { - if (par2World.getWorldTime() % tickDelay == par1ItemStack.getTagCompound().getInteger("worldTimeDelay")) + if (world.getWorldTime() % tickDelay == stack.getTagCompound().getInteger("worldTimeDelay")) { } //TODO Do stuff - par3EntityPlayer.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionInhibit.id, 2, 0)); + player.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionInhibit.id, 2, 0, true, false)); } } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java index 885b7d07..6c73547c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java @@ -1,19 +1,17 @@ package WayofTime.alchemicalWizardry.common.items; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.tileEntity.TEHomHeart; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; +import java.util.List; + 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.BlockPos; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; - -import java.util.List; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.common.tileEntity.TEHomHeart; public class BlankSpell extends EnergyItems { @@ -25,76 +23,69 @@ public class BlankSpell extends EnergyItems } @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:BlankSpell"); - } + list.add(StatCollector.translateToLocal("tooltip.blankspell.desc")); - @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) - { - par3List.add(StatCollector.translateToLocal("tooltip.blankspell.desc")); - - if (!(par1ItemStack.getTagCompound() == null)) + if (!(stack.getTagCompound() == null)) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); + NBTTagCompound itemTag = stack.getTagCompound(); - if (!par1ItemStack.getTagCompound().getString("ownerName").equals("")) + if (!stack.getTagCompound().getString("ownerName").equals("")) { - par3List.add(StatCollector.translateToLocal("tooltip.owner.currentowner") + " " + par1ItemStack.getTagCompound().getString("ownerName")); + list.add(StatCollector.translateToLocal("tooltip.owner.currentowner") + " " + stack.getTagCompound().getString("ownerName")); } - par3List.add(StatCollector.translateToLocal("tooltip.alchemy.coords") + " " + itemTag.getInteger("xCoord") + ", " + itemTag.getInteger("yCoord") + ", " + itemTag.getInteger("zCoord")); - par3List.add(StatCollector.translateToLocal("tooltip.alchemy.dimension") + " " + getDimensionID(par1ItemStack)); + list.add(StatCollector.translateToLocal("tooltip.alchemy.coords") + " " + itemTag.getInteger("xCoord") + ", " + itemTag.getInteger("yCoord") + ", " + itemTag.getInteger("zCoord")); + list.add(StatCollector.translateToLocal("tooltip.alchemy.dimension") + " " + getDimensionID(stack)); } } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!EnergyItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) { - return par1ItemStack; + return stack; } - if (!par2World.isRemote) + if (!world.isRemote) { - World world = DimensionManager.getWorld(getDimensionID(par1ItemStack)); + World newWorld = DimensionManager.getWorld(getDimensionID(stack)); - if (world != null) + if (newWorld != null) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - TileEntity tileEntity = world.getTileEntity(itemTag.getInteger("xCoord"), itemTag.getInteger("yCoord"), itemTag.getInteger("zCoord")); + NBTTagCompound itemTag = stack.getTagCompound(); + TileEntity tileEntity = newWorld.getTileEntity(new BlockPos(itemTag.getInteger("xCoord"), itemTag.getInteger("yCoord"), itemTag.getInteger("zCoord"))); if (tileEntity instanceof TEHomHeart) { TEHomHeart homHeart = (TEHomHeart) tileEntity; - if (homHeart.canCastSpell(par1ItemStack, par2World, par3EntityPlayer)) + if (homHeart.canCastSpell(stack, world, player)) { - if(EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, homHeart.getCostForSpell())) + if(EnergyItems.syphonBatteries(stack, player, homHeart.getCostForSpell())) { - EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, homHeart.castSpell(par1ItemStack, par2World, par3EntityPlayer)); + EnergyItems.syphonBatteries(stack, player, homHeart.castSpell(stack, world, player)); } } else { - return par1ItemStack; + return stack; } } else { - return par1ItemStack; + return stack; } } else { - return par1ItemStack; + return stack; } } else { - return par1ItemStack; + return stack; } - par2World.playSoundAtEntity(par3EntityPlayer, "random.fizz", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); - return par1ItemStack; + world.playSoundAtEntity(player, "random.fizz", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); + return stack; } public int getDimensionID(ItemStack itemStack) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BloodShard.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BloodShard.java index 82d93df7..ab74e4cb 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BloodShard.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BloodShard.java @@ -1,15 +1,12 @@ package WayofTime.alchemicalWizardry.common.items; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.ModItems; -import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.ModItems; +import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; public class BloodShard extends Item implements ArmourUpgrade { @@ -20,22 +17,6 @@ public class BloodShard extends Item implements ArmourUpgrade setCreativeTab(AlchemicalWizardry.tabBloodMagic); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - if (this.equals(ModItems.weakBloodShard)) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:WeakBloodShard"); - return; - } - - if (this.equals(ModItems.demonBloodShard)) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:DemonBloodShard"); - } - } - public int getBloodShardLevel() { if (this.equals(ModItems.weakBloodShard)) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java index f0ac52c4..f5ab984c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java @@ -1,11 +1,10 @@ package WayofTime.alchemicalWizardry.common.items; -import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockLeavesBase; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.IBlockState; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -13,11 +12,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; import net.minecraft.util.StatCollector; -import net.minecraft.util.Vec3; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.ItemType; @@ -25,17 +24,10 @@ import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import com.google.common.collect.HashMultiset; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - public class BoundAxe extends ItemAxe implements IBindable { public float efficiencyOnProperMaterial = 12.0F; public float damageVsEntity; - @SideOnly(Side.CLIENT) - private IIcon activeIcon; - @SideOnly(Side.CLIENT) - private IIcon passiveIcon; private int energyUsed; public BoundAxe() @@ -81,49 +73,21 @@ public class BoundAxe extends ItemAxe implements IBindable } @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:BoundAxe_activated"); - this.activeIcon = iconRegister.registerIcon("AlchemicalWizardry:BoundAxe_activated"); - this.passiveIcon = iconRegister.registerIcon("AlchemicalWizardry:SheathedItem"); - } - - @Override - public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) - { - if (stack.getTagCompound() == null) - { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) - { - return this.activeIcon; - } else - { - return this.passiveIcon; - } - } - - @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) + public ItemStack onItemRightClick(ItemStack par1ItemStack, World world, EntityPlayer par3EntityPlayer) { if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { this.setActivated(par1ItemStack, !getActivated(par1ItemStack)); - par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200); + par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (world.getWorldTime() - 1) % 200); return par1ItemStack; } - if (par2World.isRemote) + if (world.isRemote) { return par1ItemStack; } - if (!getActivated(par1ItemStack) || SpellHelper.isFakePlayer(par2World, par3EntityPlayer)) + if (!getActivated(par1ItemStack) || SpellHelper.isFakePlayer(world, par3EntityPlayer)) { return par1ItemStack; } @@ -138,10 +102,7 @@ public class BoundAxe extends ItemAxe implements IBindable return par1ItemStack; } - Vec3 blockVec = SpellHelper.getEntityBlockVector(par3EntityPlayer); - int posX = (int) (blockVec.xCoord); - int posY = (int) (blockVec.yCoord); - int posZ = (int) (blockVec.zCoord); + BlockPos pos = par3EntityPlayer.getPosition(); boolean silkTouch = EnchantmentHelper.getSilkTouchModifier(par3EntityPlayer); int fortuneLvl = EnchantmentHelper.getFortuneModifier(par3EntityPlayer); @@ -153,21 +114,22 @@ public class BoundAxe extends ItemAxe implements IBindable { for (int k = -5; k <= 5; k++) { - Block block = par2World.getBlock(posX + i, posY + j, posZ + k); - int meta = par2World.getBlockMetadata(posX + i, posY + j, posZ + k); + BlockPos newPos = pos.add(i, j, k); + IBlockState state = world.getBlockState(newPos); + Block block = state.getBlock(); if (block != null) { - float str = func_150893_a(par1ItemStack, block); + float str = getStrVsBlock(par1ItemStack, block); - if (str > 1.1f || block instanceof BlockLeavesBase && par2World.canMineBlock(par3EntityPlayer, posX + i, posY + j, posZ + k)) + if (str > 1.1f || block instanceof BlockLeavesBase && world.canMineBlockBody(par3EntityPlayer, newPos)) { - if (silkTouch && block.canSilkHarvest(par2World, par3EntityPlayer, posX + i, posY + j, posZ + k, meta)) + if (silkTouch && block.canSilkHarvest(world, newPos, state, par3EntityPlayer)) { - dropMultiset.add(new ItemType(block, meta)); + dropMultiset.add(new ItemType(block, block.getMetaFromState(state))); } else { - ArrayList itemDropList = block.getDrops(par2World, posX + i, posY + j, posZ + k, meta, fortuneLvl); + List itemDropList = block.getDrops(world, newPos, state, fortuneLvl); if (itemDropList != null) { @@ -176,20 +138,20 @@ public class BoundAxe extends ItemAxe implements IBindable } } - par2World.setBlockToAir(posX + i, posY + j, posZ + k); + world.setBlockToAir(newPos); } } } } } - BoundPickaxe.dropMultisetStacks(dropMultiset, par2World, posX, posY + par3EntityPlayer.getEyeHeight(), posZ); + BoundPickaxe.dropMultisetStacks(dropMultiset, world, pos.getX(), pos.getY() + par3EntityPlayer.getEyeHeight(), pos.getZ()); return par1ItemStack; } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) + public void onUpdate(ItemStack par1ItemStack, World world, Entity par3Entity, int par4, boolean par5) { if (!(par3Entity instanceof EntityPlayer)) { @@ -202,7 +164,7 @@ public class BoundAxe extends ItemAxe implements IBindable { par1ItemStack.setTagCompound(new NBTTagCompound()); } - if (par2World.getWorldTime() % 200 == par1ItemStack.getTagCompound().getInteger("worldTimeDelay") && par1ItemStack.getTagCompound().getBoolean("isActive")) + if (world.getWorldTime() % 200 == par1ItemStack.getTagCompound().getInteger("worldTimeDelay") && par1ItemStack.getTagCompound().getBoolean("isActive")) { if (!par3EntityPlayer.capabilities.isCreativeMode) { @@ -216,28 +178,14 @@ public class BoundAxe extends ItemAxe implements IBindable par1ItemStack.setItemDamage(0); } - public void setActivated(ItemStack par1ItemStack, boolean newActivated) + public void setActivated(ItemStack stack, boolean newActivated) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - if (itemTag == null) - { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - itemTag.setBoolean("isActive", newActivated); + stack.setItemDamage(newActivated ? 1 : 0); } - public boolean getActivated(ItemStack par1ItemStack) + public boolean getActivated(ItemStack stack) { - if (!par1ItemStack.hasTagCompound()) - { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - return itemTag.getBoolean("isActive"); + return stack.getItemDamage() == 1; } /** @@ -245,14 +193,14 @@ public class BoundAxe extends ItemAxe implements IBindable * sword */ @Override - public float func_150893_a(ItemStack par1ItemStack, Block par2Block) + public float getStrVsBlock(ItemStack par1ItemStack, Block par2Block) { if (!getActivated(par1ItemStack)) { return 0.0F; } - return super.func_150893_a(par1ItemStack, par2Block); + return super.getStrVsBlock(par1ItemStack, par2Block); } /** @@ -264,7 +212,7 @@ public class BoundAxe extends ItemAxe implements IBindable return getActivated(par1ItemStack); } - public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, Block par3, int par4, int par5, int par6, EntityLivingBase par7EntityLivingBase) + public boolean onBlockDestroyed(ItemStack par1ItemStack, World world, Block par3, int par4, int par5, int par6, EntityLivingBase par7EntityLivingBase) { return true; } @@ -292,19 +240,19 @@ public class BoundAxe extends ItemAxe implements IBindable * FORGE: Overridden to allow custom tool effectiveness */ @Override - public float getDigSpeed(ItemStack stack, Block block, int meta) + public float getDigSpeed(ItemStack stack, IBlockState state) { if (!getActivated(stack)) { return 0.0F; } - if (ForgeHooks.isToolEffective(stack, block, meta)) + for (String type : getToolClasses(stack)) { - return efficiencyOnProperMaterial; + if (state.getBlock().isToolEffective(type, state)) + return efficiencyOnProperMaterial; } - - return func_150893_a(stack, block); + return super.getDigSpeed(stack, state); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java index 1a358bca..70b6eba4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java @@ -1,10 +1,9 @@ package WayofTime.alchemicalWizardry.common.items; -import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.IBlockState; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -13,11 +12,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; import net.minecraft.util.StatCollector; -import net.minecraft.util.Vec3; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.ItemType; @@ -26,17 +25,10 @@ import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import com.google.common.collect.HashMultiset; import com.google.common.collect.Multiset; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - public class BoundPickaxe extends ItemPickaxe implements IBindable { public float efficiencyOnProperMaterial = 12.0F; public float damageVsEntity; - @SideOnly(Side.CLIENT) - private IIcon activeIcon; - @SideOnly(Side.CLIENT) - private IIcon passiveIcon; private int energyUsed; @@ -61,14 +53,14 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) + public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.boundpickaxe.desc1")); par3List.add(StatCollector.translateToLocal("tooltip.boundpickaxe.desc2")); - if (!(par1ItemStack.getTagCompound() == null)) + if (!(stack.getTagCompound() == null)) { - if (par1ItemStack.getTagCompound().getBoolean("isActive")) + if (stack.getTagCompound().getBoolean("isActive")) { par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.activated")); } else @@ -76,75 +68,44 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.deactivated")); } - if (!par1ItemStack.getTagCompound().getString("ownerName").equals("")) + if (!stack.getTagCompound().getString("ownerName").equals("")) { - par3List.add(StatCollector.translateToLocal("tooltip.owner.currentowner") + " " + par1ItemStack.getTagCompound().getString("ownerName")); + par3List.add(StatCollector.translateToLocal("tooltip.owner.currentowner") + " " + stack.getTagCompound().getString("ownerName")); } } } @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer par3EntityPlayer) { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:BoundPickaxe_activated"); - this.activeIcon = iconRegister.registerIcon("AlchemicalWizardry:BoundPickaxe_activated"); - this.passiveIcon = iconRegister.registerIcon("AlchemicalWizardry:SheathedItem"); - } - - @Override - public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) - { - if (stack.getTagCompound() == null) + if (!EnergyItems.checkAndSetItemOwner(stack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) - { - return this.activeIcon; - } else - { - return this.passiveIcon; - } - } - - @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) - { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) - { - this.setActivated(par1ItemStack, !getActivated(par1ItemStack)); - par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200); - return par1ItemStack; + this.setActivated(stack, !getActivated(stack)); + stack.getTagCompound().setInteger("worldTimeDelay", (int) (world.getWorldTime() - 1) % 200); + return stack; } - if (par2World.isRemote) + if (world.isRemote) { - return par1ItemStack; + return stack; } - if (!getActivated(par1ItemStack) || SpellHelper.isFakePlayer(par2World, par3EntityPlayer)) + if (!getActivated(stack) || SpellHelper.isFakePlayer(world, par3EntityPlayer)) { - return par1ItemStack; + return stack; } if (par3EntityPlayer.isPotionActive(AlchemicalWizardry.customPotionInhibit)) { - return par1ItemStack; + return stack; } - if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 10000)) + if(!EnergyItems.syphonBatteries(stack, par3EntityPlayer, 10000)) { - return par1ItemStack; + return stack; } - Vec3 blockVec = SpellHelper.getEntityBlockVector(par3EntityPlayer); - int posX = (int) (blockVec.xCoord); - int posY = (int) (blockVec.yCoord); - int posZ = (int) (blockVec.zCoord); + BlockPos pos = par3EntityPlayer.getPosition(); boolean silkTouch = EnchantmentHelper.getSilkTouchModifier(par3EntityPlayer); int fortuneLvl = EnchantmentHelper.getFortuneModifier(par3EntityPlayer); @@ -152,43 +113,44 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable for (int i = -5; i <= 5; i++) { - for (int j = -5; j <= 5; j++) + for (int j = 0; j <= 10; j++) { for (int k = -5; k <= 5; k++) { - Block block = par2World.getBlock(posX + i, posY + j, posZ + k); - int meta = par2World.getBlockMetadata(posX + i, posY + j, posZ + k); + BlockPos newPos = pos.add(i, j, k); + IBlockState state = world.getBlockState(newPos); + Block block = state.getBlock(); - if (block != null && block.getBlockHardness(par2World, posX + i, posY + j, posZ + k) != -1) + if (block != null) { - float str = func_150893_a(par1ItemStack, block); + float str = getStrVsBlock(stack, block); - if (str > 1.1f && par2World.canMineBlock(par3EntityPlayer, posX + i, posY + j, posZ + k)) + if (str > 1.1f && world.canMineBlockBody(par3EntityPlayer, newPos)) { - if (silkTouch && block.canSilkHarvest(par2World, par3EntityPlayer, posX + i, posY + j, posZ + k, meta)) + if (silkTouch && block.canSilkHarvest(world, newPos, state, par3EntityPlayer)) { - dropMultiset.add(new ItemType(block, meta)); + dropMultiset.add(new ItemType(block, block.getMetaFromState(state))); } else { - ArrayList itemDropList = block.getDrops(par2World, posX + i, posY + j, posZ + k, meta, fortuneLvl); + List itemDropList = block.getDrops(world, newPos, state, fortuneLvl); if (itemDropList != null) { - for (ItemStack stack : itemDropList) - dropMultiset.add(ItemType.fromStack(stack), stack.stackSize); + for (ItemStack stacky : itemDropList) + dropMultiset.add(ItemType.fromStack(stacky), stacky.stackSize); } } - par2World.setBlockToAir(posX + i, posY + j, posZ + k); + world.setBlockToAir(newPos); } } } } } - dropMultisetStacks(dropMultiset, par2World, posX, posY + par3EntityPlayer.getEyeHeight(), posZ); + BoundPickaxe.dropMultisetStacks(dropMultiset, world, pos.getX(), pos.getY() + par3EntityPlayer.getEyeHeight(), pos.getZ()); - return par1ItemStack; + return stack; } public static void dropMultisetStacks(Multiset dropMultiset, World world, double x, double y, double z) @@ -212,7 +174,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) + public void onUpdate(ItemStack stack, World world, Entity par3Entity, int par4, boolean par5) { if (!(par3Entity instanceof EntityPlayer)) { @@ -221,47 +183,33 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable EntityPlayer par3EntityPlayer = (EntityPlayer) par3Entity; - if (par1ItemStack.getTagCompound() == null) + if (stack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); + stack.setTagCompound(new NBTTagCompound()); } - if (par2World.getWorldTime() % 200 == par1ItemStack.getTagCompound().getInteger("worldTimeDelay") && par1ItemStack.getTagCompound().getBoolean("isActive")) + if (world.getWorldTime() % 200 == stack.getTagCompound().getInteger("worldTimeDelay") && stack.getTagCompound().getBoolean("isActive")) { if (!par3EntityPlayer.capabilities.isCreativeMode) { - if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 20)) + if(!EnergyItems.syphonBatteries(stack, par3EntityPlayer, 20)) { - this.setActivated(par1ItemStack, false); + this.setActivated(stack, false); } } } - par1ItemStack.setItemDamage(0); + stack.setItemDamage(0); } - public void setActivated(ItemStack par1ItemStack, boolean newActivated) + public void setActivated(ItemStack stack, boolean newActivated) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - if (itemTag == null) - { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - itemTag.setBoolean("isActive", newActivated); + stack.setItemDamage(newActivated ? 1 : 0); } - public boolean getActivated(ItemStack par1ItemStack) + public boolean getActivated(ItemStack stack) { - if (!par1ItemStack.hasTagCompound()) - { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - return itemTag.getBoolean("isActive"); + return stack.getItemDamage() == 1; } /** @@ -269,34 +217,23 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable * sword */ @Override - public float func_150893_a(ItemStack par1ItemStack, Block par2Block) //getStrVsBlock + public float getStrVsBlock(ItemStack stack, Block par2Block) //getStrVsBlock { - if (!getActivated(par1ItemStack)) + if (!getActivated(stack)) { return 0.0F; } - return super.func_150893_a(par1ItemStack, par2Block); + return super.getStrVsBlock(stack, par2Block); } /** * Current implementations of this method in child classes do not use the entry argument beside ev. They just raise * the damage on the stack. */ - public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) + public boolean hitEntity(ItemStack stack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { - return getActivated(par1ItemStack); - } - - @Override - public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, Block par3, int par4, int par5, int par6, EntityLivingBase par7EntityLivingBase) - { - - if (par7EntityLivingBase instanceof EntityPlayer) - { - EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par7EntityLivingBase, getEnergyUsed()); - } - return true; + return getActivated(stack); } @SideOnly(Side.CLIENT) @@ -322,19 +259,19 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable * FORGE: Overridden to allow custom tool effectiveness */ @Override - public float getDigSpeed(ItemStack stack, Block block, int meta) + public float getDigSpeed(ItemStack stack, IBlockState state) { if (!getActivated(stack)) { return 0.0F; } - if (ForgeHooks.isToolEffective(stack, block, meta)) + for (String type : getToolClasses(stack)) { - return efficiencyOnProperMaterial; + if (state.getBlock().isToolEffective(type, state)) + return efficiencyOnProperMaterial; } - - return func_150893_a(stack, block); + return super.getDigSpeed(stack, state); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java index 3dbfc338..fc43ba2d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java @@ -1,45 +1,33 @@ package WayofTime.alchemicalWizardry.common.items; -import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.IBlockState; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; import net.minecraft.util.StatCollector; -import net.minecraft.util.Vec3; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.ItemType; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import com.google.common.collect.HashMultiset; -import com.google.common.collect.Multimap; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BoundShovel extends ItemSpade implements IBindable { public float efficiencyOnProperMaterial = 12.0F; public float damageVsEntity; - @SideOnly(Side.CLIENT) - private IIcon activeIcon; - @SideOnly(Side.CLIENT) - private IIcon passiveIcon; - private int energyUsed; public BoundShovel() @@ -85,67 +73,36 @@ public class BoundShovel extends ItemSpade implements IBindable } @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer par3EntityPlayer) { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:BoundShovel_activated"); - this.activeIcon = iconRegister.registerIcon("AlchemicalWizardry:BoundShovel_activated"); - this.passiveIcon = iconRegister.registerIcon("AlchemicalWizardry:SheathedItem"); - } - - @Override - public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) - { - if (stack.getTagCompound() == null) + if (!EnergyItems.checkAndSetItemOwner(stack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) - { - return this.activeIcon; - } else - { - return this.passiveIcon; - } - } - - @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) - { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) - { - this.setActivated(par1ItemStack, !getActivated(par1ItemStack)); - par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200); - return par1ItemStack; + this.setActivated(stack, !getActivated(stack)); + stack.getTagCompound().setInteger("worldTimeDelay", (int) (world.getWorldTime() - 1) % 200); + return stack; } - if (par2World.isRemote) + if (world.isRemote) { - return par1ItemStack; + return stack; } - if (!getActivated(par1ItemStack) || SpellHelper.isFakePlayer(par2World, par3EntityPlayer)) + if (!getActivated(stack) || SpellHelper.isFakePlayer(world, par3EntityPlayer)) { - return par1ItemStack; + return stack; } if (par3EntityPlayer.isPotionActive(AlchemicalWizardry.customPotionInhibit)) { - return par1ItemStack; + return stack; } - if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 10000)) + if(!EnergyItems.syphonBatteries(stack, par3EntityPlayer, 10000)) { - return par1ItemStack; + return stack; } - Vec3 blockVec = SpellHelper.getEntityBlockVector(par3EntityPlayer); - int posX = (int) (blockVec.xCoord); - int posY = (int) (blockVec.yCoord); - int posZ = (int) (blockVec.zCoord); + BlockPos pos = par3EntityPlayer.getPosition(); boolean silkTouch = EnchantmentHelper.getSilkTouchModifier(par3EntityPlayer); int fortuneLvl = EnchantmentHelper.getFortuneModifier(par3EntityPlayer); @@ -157,39 +114,40 @@ public class BoundShovel extends ItemSpade implements IBindable { for (int k = -5; k <= 5; k++) { - Block block = par2World.getBlock(posX + i, posY + j, posZ + k); - int meta = par2World.getBlockMetadata(posX + i, posY + j, posZ + k); + BlockPos newPos = pos.add(i, j, k); + IBlockState state = world.getBlockState(newPos); + Block block = state.getBlock(); if (block != null) { - float str = func_150893_a(par1ItemStack, block); + float str = getStrVsBlock(stack, block); - if (str > 1.1f && par2World.canMineBlock(par3EntityPlayer, posX + i, posY + j, posZ + k)) + if (str > 1.1f && world.canMineBlockBody(par3EntityPlayer, newPos)) { - if (silkTouch && block.canSilkHarvest(par2World, par3EntityPlayer, posX + i, posY + j, posZ + k, meta)) + if (silkTouch && block.canSilkHarvest(world, newPos, state, par3EntityPlayer)) { - dropMultiset.add(new ItemType(block, meta)); + dropMultiset.add(new ItemType(block, block.getMetaFromState(state))); } else { - ArrayList itemDropList = block.getDrops(par2World, posX + i, posY + j, posZ + k, meta, fortuneLvl); + List itemDropList = block.getDrops(world, newPos, state, fortuneLvl); if (itemDropList != null) { - for (ItemStack stack : itemDropList) - dropMultiset.add(ItemType.fromStack(stack), stack.stackSize); + for (ItemStack stacky : itemDropList) + dropMultiset.add(ItemType.fromStack(stacky), stacky.stackSize); } } - par2World.setBlockToAir(posX + i, posY + j, posZ + k); + world.setBlockToAir(newPos); } } } } } - BoundPickaxe.dropMultisetStacks(dropMultiset, par2World, posX, posY + par3EntityPlayer.getEyeHeight(), posZ); - - return par1ItemStack; + BoundPickaxe.dropMultisetStacks(dropMultiset, world, pos.getX(), pos.getY() + par3EntityPlayer.getEyeHeight(), pos.getZ()); + + return stack; } @Override @@ -220,28 +178,14 @@ public class BoundShovel extends ItemSpade implements IBindable par1ItemStack.setItemDamage(0); } - public void setActivated(ItemStack par1ItemStack, boolean newActivated) + public void setActivated(ItemStack stack, boolean newActivated) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - if (itemTag == null) - { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - itemTag.setBoolean("isActive", newActivated); + stack.setItemDamage(newActivated ? 1 : 0); } - public boolean getActivated(ItemStack par1ItemStack) + public boolean getActivated(ItemStack stack) { - if (!par1ItemStack.hasTagCompound()) - { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - return itemTag.getBoolean("isActive"); + return stack.getItemDamage() == 1; } /** @@ -249,14 +193,14 @@ public class BoundShovel extends ItemSpade implements IBindable * sword */ @Override - public float func_150893_a(ItemStack par1ItemStack, Block par2Block) + public float getStrVsBlock(ItemStack par1ItemStack, Block par2Block) { if (!getActivated(par1ItemStack)) { return 0.0F; } - return super.func_150893_a(par1ItemStack, par2Block); + return super.getStrVsBlock(par1ItemStack, par2Block); } /** @@ -291,31 +235,23 @@ public class BoundShovel extends ItemSpade implements IBindable return 30; } - @Override - public Multimap getItemAttributeModifiers() - { - Multimap multimap = super.getItemAttributeModifiers(); - multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Tool modifier", (double) this.damageVsEntity, 0)); - return multimap; - } - /** * FORGE: Overridden to allow custom tool effectiveness */ @Override - public float getDigSpeed(ItemStack stack, Block block, int meta) + public float getDigSpeed(ItemStack stack, IBlockState state) { if (!getActivated(stack)) { return 0.0F; } - if (ForgeHooks.isToolEffective(stack, block, meta)) + for (String type : getToolClasses(stack)) { - return efficiencyOnProperMaterial; + if (state.getBlock().isToolEffective(type, state)) + return efficiencyOnProperMaterial; } - - return func_150893_a(stack, block); + return super.getDigSpeed(stack, state); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java index f15d7a6a..3629b6c7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java @@ -1,24 +1,21 @@ package WayofTime.alchemicalWizardry.common.items; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; - -import java.util.List; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; +import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; public class CheatyItem extends Item implements IBindable { @@ -29,13 +26,6 @@ public class CheatyItem extends Item implements IBindable setCreativeTab(AlchemicalWizardry.tabBloodMagic); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:EnergyBattery"); - } - @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { @@ -119,7 +109,7 @@ public class CheatyItem extends Item implements IBindable for (int l = 0; l < 8; ++l) { - world.spawnParticle("reddust", posX + Math.random() - Math.random(), posY + Math.random() - Math.random(), posZ + Math.random() - Math.random(), f1, f2, f3); + world.spawnParticle(EnumParticleTypes.REDSTONE, posX + Math.random() - Math.random(), posY + Math.random() - Math.random(), posZ + Math.random() - Math.random(), f1, f2, f3); } } @@ -176,10 +166,4 @@ public class CheatyItem extends Item implements IBindable int currentEssence = data.currentEssence; return (currentEssence); } - - @Override - public boolean doesContainerItemLeaveCraftingGrid(ItemStack itemStack) - { - return false; - } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/CreativeDagger.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/CreativeDagger.java index a3074d2a..a15a6f00 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/CreativeDagger.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/CreativeDagger.java @@ -1,17 +1,19 @@ package WayofTime.alchemicalWizardry.common.items; -import WayofTime.alchemicalWizardry.api.event.SacrificeKnifeUsedEvent; -import WayofTime.alchemicalWizardry.api.sacrifice.PlayerSacrificeHandler; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.event.SacrificeKnifeUsedEvent; +import WayofTime.alchemicalWizardry.api.sacrifice.PlayerSacrificeHandler; import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; @@ -20,7 +22,6 @@ public class CreativeDagger extends Item public CreativeDagger() { super(); - setTextureName("AlchemicalWizardry:SacrificialDagger"); setMaxStackSize(1); setCreativeTab(AlchemicalWizardry.tabBloodMagic); setFull3D(); @@ -69,7 +70,7 @@ public class CreativeDagger extends Item for (int l = 0; l < 8; ++l) { - world.spawnParticle("reddust", posX + Math.random() - Math.random(), posY + Math.random() - Math.random(), posZ + Math.random() - Math.random(), f1, f2, f3); + world.spawnParticle(EnumParticleTypes.REDSTONE, posX + Math.random() - Math.random(), posY + Math.random() - Math.random(), posZ + Math.random() - Math.random(), f1, f2, f3); } if (!world.isRemote && SpellHelper.isFakePlayer(world, player)) @@ -83,10 +84,8 @@ public class CreativeDagger extends Item public void findAndFillAltar(World world, EntityPlayer player, int amount) { - int posX = (int) Math.round(player.posX - 0.5f); - int posY = (int) player.posY; - int posZ = (int) Math.round(player.posZ - 0.5f); - IBloodAltar altarEntity = getAltar(world, posX, posY, posZ); + BlockPos pos = player.getPosition(); + IBloodAltar altarEntity = getAltar(world, pos); if (altarEntity == null) { @@ -97,7 +96,7 @@ public class CreativeDagger extends Item altarEntity.startCycle(); } - public IBloodAltar getAltar(World world, int x, int y, int z) + public IBloodAltar getAltar(World world, BlockPos pos) { TileEntity tileEntity; @@ -107,7 +106,8 @@ public class CreativeDagger extends Item { for (int k = -2; k <= 1; k++) { - tileEntity = world.getTileEntity(i + x, k + y, j + z); + BlockPos newPos = pos.add(i, j, k); + tileEntity = world.getTileEntity(newPos); if(tileEntity instanceof IBloodAltar) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/DaggerOfSacrifice.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/DaggerOfSacrifice.java index 856ac155..2b87a8ca 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/DaggerOfSacrifice.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/DaggerOfSacrifice.java @@ -1,10 +1,10 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; +import java.util.UUID; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; @@ -17,20 +17,18 @@ 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.DamageSource; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; import WayofTime.alchemicalWizardry.common.IDemon; import WayofTime.alchemicalWizardry.common.demonVillage.demonHoard.demon.IHoardDemon; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; import com.google.common.collect.Multimap; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - public class DaggerOfSacrifice extends EnergyItems { public DaggerOfSacrifice() @@ -43,13 +41,6 @@ public class DaggerOfSacrifice extends EnergyItems setMaxDamage(100); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:DaggerOfSacrifice"); - } - @Override public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { @@ -118,7 +109,7 @@ public class DaggerOfSacrifice extends EnergyItems } @Override - public float func_150893_a(ItemStack par1ItemStack, Block par2Block) + public float getStrVsBlock(ItemStack par1ItemStack, Block par2Block) { if (par2Block == Blocks.web) { @@ -140,16 +131,14 @@ public class DaggerOfSacrifice extends EnergyItems public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); - multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Tool modifier", 1.0d, 0)); + multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(new UUID(4186465, 46565), "Tool modifier", 1.0d, 0)); return multimap; } public boolean findAndNotifyAltarOfDemon(World world, EntityLivingBase sacrifice) { - int posX = (int) Math.round(sacrifice.posX - 0.5f); - int posY = (int) sacrifice.posY; - int posZ = (int) Math.round(sacrifice.posZ - 0.5f); - IBloodAltar altarEntity = this.getAltar(world, posX, posY, posZ); + BlockPos pos = sacrifice.getPosition(); + IBloodAltar altarEntity = this.getAltar(world, pos); if (altarEntity == null) { @@ -163,10 +152,8 @@ public class DaggerOfSacrifice extends EnergyItems public boolean findAndFillAltar(World world, EntityLivingBase sacrifice, int amount) { - int posX = (int) Math.round(sacrifice.posX - 0.5f); - int posY = (int) sacrifice.posY; - int posZ = (int) Math.round(sacrifice.posZ - 0.5f); - IBloodAltar altarEntity = this.getAltar(world, posX, posY, posZ); + BlockPos pos = sacrifice.getPosition(); + IBloodAltar altarEntity = this.getAltar(world, pos); if (altarEntity == null) { @@ -178,7 +165,7 @@ public class DaggerOfSacrifice extends EnergyItems return true; } - public IBloodAltar getAltar(World world, int x, int y, int z) + public IBloodAltar getAltar(World world, BlockPos pos) { TileEntity tileEntity; @@ -188,7 +175,8 @@ public class DaggerOfSacrifice extends EnergyItems { for (int k = -2; k <= 1; k++) { - tileEntity = world.getTileEntity(i + x, k + y, j + z); + BlockPos newPos = pos.add(i, j, k); + tileEntity = world.getTileEntity(newPos); if ((tileEntity instanceof IBloodAltar)) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/DawnScribeTool.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/DawnScribeTool.java index a0bda137..61814e22 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/DawnScribeTool.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/DawnScribeTool.java @@ -1,8 +1,5 @@ package WayofTime.alchemicalWizardry.common.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; public class DawnScribeTool extends ScribeTool { @@ -10,11 +7,4 @@ public class DawnScribeTool extends ScribeTool { super(6); } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:DawnScribeTool"); - } } \ No newline at end of file diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonPlacer.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonPlacer.java index 98e7a6db..f9caf63f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonPlacer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonPlacer.java @@ -1,29 +1,24 @@ package WayofTime.alchemicalWizardry.common.items; -import WayofTime.alchemicalWizardry.api.summoningRegistry.SummoningRegistry; -import WayofTime.alchemicalWizardry.common.entity.mob.EntityDemon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import java.util.List; + +import net.minecraft.block.BlockFence; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityList; -import net.minecraft.entity.EntityList.EntityEggInfo; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.Facing; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; import net.minecraft.world.World; - -import java.util.List; +import WayofTime.alchemicalWizardry.api.summoningRegistry.SummoningRegistry; +import WayofTime.alchemicalWizardry.common.entity.mob.EntityDemon; public class DemonPlacer extends Item { @@ -35,48 +30,45 @@ public class DemonPlacer extends Item this.maxStackSize = 1; } - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack par1ItemStack, int par2) - { - EntityEggInfo entityegginfo = (EntityEggInfo) EntityList.entityEggs.get(Integer.valueOf(par1ItemStack.getItemDamage())); - return entityegginfo != null ? (par2 == 0 ? entityegginfo.primaryColor : entityegginfo.secondaryColor) : 16777215; - } - /** - * Callback for item usage. If the item does something special on right clicking, he will have one of those. Return - * True if something happen and false if it don't. This is for ITEMS, not BLOCKS + * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer */ - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) + @Override + public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { - if (par3World.isRemote) + if (world.isRemote) { return true; - } else + } + else if (!playerIn.func_175151_a(pos.offset(side), side, stack)) { - Block i1 = par3World.getBlock(par4, par5, par6); - par4 += Facing.offsetsXForSide[par7]; - par5 += Facing.offsetsYForSide[par7]; - par6 += Facing.offsetsZForSide[par7]; + return false; + } + else + { + IBlockState iblockstate = world.getBlockState(pos); + + pos = pos.offset(side); double d0 = 0.0D; - if (par7 == 1 && i1 != null && i1.getRenderType() == 11) + if (side == EnumFacing.UP && iblockstate instanceof BlockFence) { d0 = 0.5D; } - String demonName = DemonPlacer.getDemonString(par1ItemStack); - Entity entity = spawnCreature(par3World, demonName, (double) par4 + 0.5D, (double) par5 + d0, (double) par6 + 0.5D, par1ItemStack); + String demonName = DemonPlacer.getDemonString(stack); + Entity entity = spawnCreature(world, demonName, (double)pos.getX() + 0.5D, (double)pos.getY() + d0, (double)pos.getZ() + 0.5D, stack); if (entity != null) { - if (entity instanceof EntityLivingBase && par1ItemStack.hasDisplayName()) + if (entity instanceof EntityLivingBase && stack.hasDisplayName()) { - ((EntityLiving) entity).setCustomNameTag(par1ItemStack.getDisplayName()); + entity.setCustomNameTag(stack.getDisplayName()); } - if (!par2EntityPlayer.capabilities.isCreativeMode) + if (!playerIn.capabilities.isCreativeMode) { - --par1ItemStack.stackSize; + --stack.stackSize; } } @@ -84,64 +76,6 @@ public class DemonPlacer extends Item } } - /** - * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer - */ - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) - { - if (par2World.isRemote) - { - return par1ItemStack; - } else - { - MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(par2World, par3EntityPlayer, true); - - if (movingobjectposition == null) - { - return par1ItemStack; - } else - { - if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) - { - int i = movingobjectposition.blockX; - int j = movingobjectposition.blockY; - int k = movingobjectposition.blockZ; - - if (!par2World.canMineBlock(par3EntityPlayer, i, j, k)) - { - return par1ItemStack; - } - - if (!par3EntityPlayer.canPlayerEdit(i, j, k, movingobjectposition.sideHit, par1ItemStack)) - { - return par1ItemStack; - } - - if (par2World.getBlock(i, j, k).getMaterial() == Material.water) - { - String demonName = DemonPlacer.getDemonString(par1ItemStack); - Entity entity = spawnCreature(par2World, demonName, (double) i, (double) j, (double) k, par1ItemStack); - - if (entity != null) - { - if (entity instanceof EntityLivingBase && par1ItemStack.hasDisplayName()) - { - ((EntityLiving) entity).setCustomNameTag(par1ItemStack.getDisplayName()); - } - - if (!par3EntityPlayer.capabilities.isCreativeMode) - { - --par1ItemStack.stackSize; - } - } - } - } - - return par1ItemStack; - } - } - } - /** * Spawns the creature specified by the egg's type in the location specified by the last three parameters. * Parameters: world, entityID, x, y, z. @@ -230,11 +164,4 @@ public class DemonPlacer extends Item } } } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:DemonPlacer"); - } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonicTelepositionFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonicTelepositionFocus.java index 799fc38e..c4508bc1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonicTelepositionFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonicTelepositionFocus.java @@ -1,15 +1,12 @@ package WayofTime.alchemicalWizardry.common.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; -import java.util.List; - public class DemonicTelepositionFocus extends TelepositionFocus { public DemonicTelepositionFocus() @@ -17,13 +14,6 @@ public class DemonicTelepositionFocus extends TelepositionFocus super(4); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:DemonicTeleposerFocus"); - } - @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/DuskScribeTool.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/DuskScribeTool.java index 6de25769..600cb2da 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/DuskScribeTool.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/DuskScribeTool.java @@ -1,8 +1,5 @@ package WayofTime.alchemicalWizardry.common.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; public class DuskScribeTool extends ScribeTool { @@ -10,11 +7,4 @@ public class DuskScribeTool extends ScribeTool { super(5); } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:DuskScribeTool"); - } } \ No newline at end of file diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EarthScribeTool.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EarthScribeTool.java index 824d3925..530fce10 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EarthScribeTool.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EarthScribeTool.java @@ -1,8 +1,5 @@ package WayofTime.alchemicalWizardry.common.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; public class EarthScribeTool extends ScribeTool { @@ -10,11 +7,4 @@ public class EarthScribeTool extends ScribeTool { super(3); } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:EarthScribeTool"); - } } \ No newline at end of file diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java index 30ccc0cd..a713fe7c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java @@ -1,5 +1,15 @@ package WayofTime.alchemicalWizardry.common.items; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; @@ -7,18 +17,6 @@ import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; - -import java.util.List; public class EnergyBattery extends Item implements ArmourUpgrade, IBindable, IBloodOrb { @@ -34,13 +32,6 @@ public class EnergyBattery extends Item implements ArmourUpgrade, IBindable, IBl orbLevel = 1; } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:EnergyBattery"); - } - @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { @@ -125,7 +116,7 @@ public class EnergyBattery extends Item implements ArmourUpgrade, IBindable, IBl for (int l = 0; l < 8; ++l) { - world.spawnParticle("reddust", posX + Math.random() - Math.random(), posY + Math.random() - Math.random(), posZ + Math.random() - Math.random(), f1, f2, f3); + world.spawnParticle(EnumParticleTypes.REDSTONE, posX + Math.random() - Math.random(), posY + Math.random() - Math.random(), posZ + Math.random() - Math.random(), f1, f2, f3); } } @@ -210,10 +201,4 @@ public class EnergyBattery extends Item implements ArmourUpgrade, IBindable, IBl return data.currentEssence; } - - @Override - public boolean doesContainerItemLeaveCraftingGrid(ItemStack itemStack) - { - return false; - } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java index c5fd3364..c9e44de7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java @@ -1,27 +1,19 @@ package WayofTime.alchemicalWizardry.common.items; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.entity.projectile.EntityEnergyBazookaMainProjectile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; +import java.util.List; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.util.Vec3; import net.minecraft.world.World; - -import java.util.List; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.common.entity.projectile.EntityEnergyBazookaMainProjectile; public class EnergyBazooka extends EnergyItems { - @SideOnly(Side.CLIENT) - private IIcon activeIcon; - @SideOnly(Side.CLIENT) - private IIcon passiveIcon; private int damage; public EnergyBazooka() @@ -35,34 +27,6 @@ public class EnergyBazooka extends EnergyItems damage = 12; } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:EnergyBazooka_activated"); - this.activeIcon = iconRegister.registerIcon("AlchemicalWizardry:EnergyBazooka_activated"); - this.passiveIcon = iconRegister.registerIcon("AlchemicalWizardry:SheathedItem"); - } - - @Override - public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) - { - if (stack.getTagCompound() == null) - { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) - { - return this.activeIcon; - } else - { - return this.passiveIcon; - } - } - @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { @@ -168,28 +132,14 @@ public class EnergyBazooka extends EnergyItems } } - public void setActivated(ItemStack par1ItemStack, boolean newActivated) + public void setActivated(ItemStack stack, boolean newActivated) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - if (itemTag == null) - { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - itemTag.setBoolean("isActive", newActivated); + stack.setItemDamage(newActivated ? 1 : 0); } - public boolean getActivated(ItemStack par1ItemStack) + public boolean getActivated(ItemStack stack) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - if (itemTag == null) - { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - return itemTag.getBoolean("isActive"); + return stack.getItemDamage() == 1; } public void setDelay(ItemStack par1ItemStack, int newDelay) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java index 03023a79..f1103f4f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java @@ -1,26 +1,18 @@ package WayofTime.alchemicalWizardry.common.items; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.entity.projectile.EnergyBlastProjectile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; +import java.util.List; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; - -import java.util.List; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.common.entity.projectile.EnergyBlastProjectile; public class EnergyBlast extends EnergyItems { - @SideOnly(Side.CLIENT) - private IIcon activeIcon; - @SideOnly(Side.CLIENT) - private IIcon passiveIcon; private int damage; public EnergyBlast() @@ -35,34 +27,6 @@ public class EnergyBlast extends EnergyItems damage = 12; } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:EnergyBlaster_activated"); - this.activeIcon = iconRegister.registerIcon("AlchemicalWizardry:EnergyBlaster_activated"); - this.passiveIcon = iconRegister.registerIcon("AlchemicalWizardry:SheathedItem"); - } - - @Override - public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) - { - if (stack.getTagCompound() == null) - { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) - { - return this.activeIcon; - } else - { - return this.passiveIcon; - } - } - @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { @@ -162,28 +126,14 @@ public class EnergyBlast extends EnergyItems } } - public void setActivated(ItemStack par1ItemStack, boolean newActivated) + public void setActivated(ItemStack stack, boolean newActivated) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - if (itemTag == null) - { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - itemTag.setBoolean("isActive", newActivated); + stack.setItemDamage(newActivated ? 1 : 0); } - public boolean getActivated(ItemStack par1ItemStack) + public boolean getActivated(ItemStack stack) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - if (itemTag == null) - { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - return itemTag.getBoolean("isActive"); + return stack.getItemDamage() == 1; } public void setDelay(ItemStack par1ItemStack, int newDelay) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java index 34be619d..ee96a703 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java @@ -11,6 +11,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.World; public class EnergyItems extends Item implements IBindable @@ -47,7 +48,7 @@ public class EnergyItems extends Item implements IBindable float f3 = f * f * 0.6F - 0.7F; for (int l = 0; l < 8; ++l) { - world.spawnParticle("reddust", posX + Math.random() - Math.random(), posY + Math.random() - Math.random(), posZ + Math.random() - Math.random(), f1, f2, f3); + world.spawnParticle(EnumParticleTypes.REDSTONE, posX + Math.random() - Math.random(), posY + Math.random() - Math.random(), posZ + Math.random() - Math.random(), f1, f2, f3); } } for (int i = 0; i < damage; i++) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java index 2ac7f609..ac626b63 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java @@ -4,7 +4,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -14,21 +13,14 @@ import net.minecraft.item.ItemSword; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.common.omega.OmegaParadigm; import WayofTime.alchemicalWizardry.common.omega.OmegaRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class EnergySword extends ItemSword { - @SideOnly(Side.CLIENT) - private IIcon activeIcon; - @SideOnly(Side.CLIENT) - private IIcon passiveIcon; private int energyUsed; public EnergySword() @@ -50,34 +42,6 @@ public class EnergySword extends ItemSword { return this.energyUsed; } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:BoundSword_activated"); - this.activeIcon = iconRegister.registerIcon("AlchemicalWizardry:BoundSword_activated"); - this.passiveIcon = iconRegister.registerIcon("AlchemicalWizardry:SheathedItem"); - } - - @Override - public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) - { - if (stack.getTagCompound() == null) - { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) - { - return this.activeIcon; - } else - { - return this.passiveIcon; - } - } private OmegaParadigm getOmegaParadigmOfWeilder(EntityPlayer player) { @@ -171,28 +135,14 @@ public class EnergySword extends ItemSword par1ItemStack.setItemDamage(0); } - public void setActivated(ItemStack par1ItemStack, boolean newActivated) + public void setActivated(ItemStack stack, boolean newActivated) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - if (itemTag == null) - { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - itemTag.setBoolean("isActive", newActivated); + stack.setItemDamage(newActivated ? 1 : 0); } - public boolean getActivated(ItemStack par1ItemStack) + public boolean getActivated(ItemStack stack) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - if (itemTag == null) - { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - return itemTag.getBoolean("isActive"); + return stack.getItemDamage() == 1; } public float func_82803_g() @@ -224,7 +174,7 @@ public class EnergySword extends ItemSword } @Override - public float func_150893_a(ItemStack par1ItemStack, Block par2Block) + public float getStrVsBlock(ItemStack par1ItemStack, Block par2Block) { if (par2Block == Blocks.web) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnhancedTelepositionFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnhancedTelepositionFocus.java index 165ecda3..2b4d1a42 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnhancedTelepositionFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnhancedTelepositionFocus.java @@ -1,15 +1,12 @@ package WayofTime.alchemicalWizardry.common.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; -import java.util.List; - public class EnhancedTelepositionFocus extends TelepositionFocus { public EnhancedTelepositionFocus() @@ -17,13 +14,6 @@ public class EnhancedTelepositionFocus extends TelepositionFocus super(2); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:EnhancedTeleposerFocus"); - } - @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/FireScribeTool.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/FireScribeTool.java index 67420fc2..8b3a55f9 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/FireScribeTool.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/FireScribeTool.java @@ -1,8 +1,5 @@ package WayofTime.alchemicalWizardry.common.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; public class FireScribeTool extends ScribeTool { @@ -10,11 +7,4 @@ public class FireScribeTool extends ScribeTool { super(2); } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:FireScribeTool"); - } } \ No newline at end of file diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemAlchemyBase.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemAlchemyBase.java index bb60ec62..29a9148d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemAlchemyBase.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemAlchemyBase.java @@ -1,30 +1,27 @@ package WayofTime.alchemicalWizardry.common.items; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import org.lwjgl.input.Keyboard; -import java.util.List; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; public class ItemAlchemyBase extends Item { private static final String[] ITEM_NAMES = new String[]{"Offensa", "Praesidium", "OrbisTerrae", "StrengthenedCatalyst", "ConcentratedCatalyst", "FracturedBone", "Virtus", "Reductus", "Potentia"}; - @SideOnly(Side.CLIENT) - private IIcon[] icons; - public ItemAlchemyBase() { super(); @@ -33,18 +30,6 @@ public class ItemAlchemyBase extends Item this.hasSubtypes = true; } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - icons = new IIcon[ITEM_NAMES.length]; - - for (int i = 0; i < ITEM_NAMES.length; ++i) - { - icons[i] = iconRegister.registerIcon("AlchemicalWizardry:" + "baseAlchemyItem" + ITEM_NAMES[i]); - } - } - @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { @@ -85,14 +70,6 @@ public class ItemAlchemyBase extends Item return ("" + "item.bloodMagicAlchemyItem." + ITEM_NAMES[meta]); } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int meta) - { - int j = MathHelper.clamp_int(meta, 0, ITEM_NAMES.length - 1); - return icons[j]; - } - @Override @SideOnly(Side.CLIENT) public void getSubItems(Item id, CreativeTabs creativeTab, List list) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBlockCrystalBelljar.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBlockCrystalBelljar.java index b6452305..5e10c4a1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBlockCrystalBelljar.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBlockCrystalBelljar.java @@ -3,11 +3,14 @@ package WayofTime.alchemicalWizardry.common.items; import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentContainer; import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentStack; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; @@ -77,17 +80,14 @@ public class ItemBlockCrystalBelljar extends ItemBlock } @Override - public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) + public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState newState) { - if (!world.setBlock(x, y, z, field_150939_a, metadata, 3)) - { - return false; - } + if (!world.setBlockState(pos, newState, 3)) return false; - if (world.getBlock(x, y, z) == field_150939_a) + IBlockState state = world.getBlockState(pos); + if (state.getBlock() == this.block) { - field_150939_a.onBlockPlacedBy(world, x, y, z, player, stack); - field_150939_a.onPostBlockPlaced(world, x, y, z, metadata); + this.block.onBlockPlacedBy(world, pos, state, player, stack); } return true; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java index dc5354c8..c223d9de 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java @@ -2,14 +2,13 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -18,14 +17,9 @@ import WayofTime.alchemicalWizardry.api.items.IAltarManipulator; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemBloodLetterPack extends ItemArmor implements ArmourUpgrade, IAltarManipulator -{ - @SideOnly(Side.CLIENT) - private IIcon plateIcon; - +{ public int conversionRate = 100; //LP / half heart public float activationPoint = 0.5f; public int tickRate = 20; @@ -37,13 +31,6 @@ public class ItemBloodLetterPack extends ItemArmor implements ArmourUpgrade, IAl setCreativeTab(AlchemicalWizardry.tabBloodMagic); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.plateIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodPack"); - } - @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { @@ -54,12 +41,6 @@ public class ItemBloodLetterPack extends ItemArmor implements ArmourUpgrade, IAl par3List.add(StatCollector.translateToLocal("tooltip.lp.storedlp") + " " + this.getStoredLP(par1ItemStack)); } } - - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int par1) - { - return this.plateIcon; - } @Override public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) @@ -84,11 +65,9 @@ public class ItemBloodLetterPack extends ItemArmor implements ArmourUpgrade, IAl { if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { - int x = movingobjectposition.blockX; - int y = movingobjectposition.blockY; - int z = movingobjectposition.blockZ; + BlockPos pos = movingobjectposition.func_178782_a(); - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos); if (!(tile instanceof TEAltar)) { @@ -106,7 +85,7 @@ public class ItemBloodLetterPack extends ItemArmor implements ArmourUpgrade, IAl amount -= filledAmount; this.setStoredLP(itemStack, amount); - world.markBlockForUpdate(x, y, z); + world.markBlockForUpdate(pos); } } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java index 3798a1c7..c6830b10 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java @@ -1,19 +1,17 @@ package WayofTime.alchemicalWizardry.common.items; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.tileEntity.TESpellParadigmBlock; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.StatCollector; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; - -import java.util.List; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.common.tileEntity.TESpellParadigmBlock; public class ItemComplexSpellCrystal extends EnergyItems { @@ -24,13 +22,6 @@ public class ItemComplexSpellCrystal extends EnergyItems setCreativeTab(AlchemicalWizardry.tabBloodMagic); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:ComplexCrystal"); - } - @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { @@ -65,7 +56,7 @@ public class ItemComplexSpellCrystal extends EnergyItems if (world != null) { NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - TileEntity tileEntity = world.getTileEntity(itemTag.getInteger("xCoord"), itemTag.getInteger("yCoord"), itemTag.getInteger("zCoord")); + TileEntity tileEntity = world.getTileEntity(new BlockPos(itemTag.getInteger("xCoord"), itemTag.getInteger("yCoord"), itemTag.getInteger("zCoord"))); if (tileEntity instanceof TESpellParadigmBlock) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComponents.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComponents.java index 4175c955..7ccfc9d3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComponents.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComponents.java @@ -1,26 +1,21 @@ package WayofTime.alchemicalWizardry.common.items; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; - -import java.util.List; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; public class ItemComponents extends Item { private static final String[] ITEM_NAMES = new String[]{"QuartzRod", "EmptyCore", "MagicalesCable", "WoodBrace", "StoneBrace", "ProjectileCore", "SelfCore", "MeleeCore", "ParadigmBackPlate", "OutputCable", "FlameCore", "IcyCore", "GustCore", "EarthenCore", "InputCable", "CrackedRunicPlate", "RunicPlate", "ScribedRunicPlate", "DefaultCore", "OffensiveCore", "DefensiveCore", "EnvironmentalCore", "PowerCore", "CostCore", "PotencyCore", "ObsidianBrace", "ToolCore", "EtherealSlate", "LifeShard", "SoulShard", "SoulRunicPlate", "LifeBrace", "EnderShard"}; - @SideOnly(Side.CLIENT) - private IIcon[] icons; - public ItemComponents() { super(); @@ -29,18 +24,6 @@ public class ItemComponents extends Item this.hasSubtypes = true; } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - icons = new IIcon[ITEM_NAMES.length]; - - for (int i = 0; i < ITEM_NAMES.length; ++i) - { - icons[i] = iconRegister.registerIcon("AlchemicalWizardry:" + "baseItem" + ITEM_NAMES[i]); - } - } - @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { @@ -55,14 +38,6 @@ public class ItemComponents extends Item return ("" + "item.bloodMagicBaseItem." + ITEM_NAMES[meta]); } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int meta) - { - int j = MathHelper.clamp_int(meta, 0, ITEM_NAMES.length - 1); - return icons[j]; - } - @Override @SideOnly(Side.CLIENT) public void getSubItems(Item id, CreativeTabs creativeTab, List list) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java index a2fb0288..98079478 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java @@ -1,12 +1,7 @@ package WayofTime.alchemicalWizardry.common.items; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.ModItems; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -16,8 +11,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; - -import java.util.List; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.ModItems; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; public class ItemDiabloKey extends EnergyItems { @@ -30,13 +29,6 @@ public class ItemDiabloKey extends EnergyItems this.hasSubtypes = true; } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:DiabloKey"); - } - @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java index f906c402..3788f9da 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java @@ -2,32 +2,27 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.ModItems; import WayofTime.alchemicalWizardry.api.items.ShapelessBloodOrbRecipe; import WayofTime.alchemicalWizardry.api.sacrifice.IIncense; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemIncense extends Item implements IIncense { private static final String[] ITEM_NAMES = new String[]{"Woodash", "Byrrus", "Livens", "Viridis", "Purpura"}; - @SideOnly(Side.CLIENT) - private IIcon[] icons; - public ItemIncense() { super(); @@ -36,26 +31,6 @@ public class ItemIncense extends Item implements IIncense this.hasSubtypes = true; } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - icons = new IIcon[ITEM_NAMES.length]; - - IIcon baseIcon = iconRegister.registerIcon("AlchemicalWizardry:" + "baseIncenseItem"); - - for (int i = 0; i < ITEM_NAMES.length; ++i) - { - if(this.doesIncenseHaveUniqueTexture(i)) - { - icons[i] = iconRegister.registerIcon("AlchemicalWizardry:" + "baseIncenseItem" + ITEM_NAMES[i]); - }else - { - icons[i] = baseIcon; - } - } - } - @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { @@ -69,14 +44,6 @@ public class ItemIncense extends Item implements IIncense return ("" + "item.bloodMagicIncenseItem." + ITEM_NAMES[meta]); } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int meta) - { - int j = MathHelper.clamp_int(meta, 0, ITEM_NAMES.length - 1); - return icons[j]; - } - @Override @SideOnly(Side.CLIENT) public void getSubItems(Item id, CreativeTabs creativeTab, List list) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemMailOrderCatalogue.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemMailOrderCatalogue.java index 2e2e07e7..be16d5c9 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemMailOrderCatalogue.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemMailOrderCatalogue.java @@ -1,14 +1,11 @@ package WayofTime.alchemicalWizardry.common.items; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.common.entity.mob.MailOrderEntityItem; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemMailOrderCatalogue extends Item { @@ -18,13 +15,6 @@ public class ItemMailOrderCatalogue extends Item this.setCreativeTab(AlchemicalWizardry.tabBloodMagic); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:MailOrder"); - } - @Override public boolean hasCustomEntity(ItemStack stack) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java index 597177ca..6f74f440 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java @@ -1,21 +1,20 @@ package WayofTime.alchemicalWizardry.common.items; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.ModBlocks; import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.Rituals; import WayofTime.alchemicalWizardry.common.block.BlockRitualStone; import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; - -import java.util.List; public class ItemRitualDismantler extends EnergyItems { @@ -26,13 +25,6 @@ public class ItemRitualDismantler extends EnergyItems setCreativeTab(AlchemicalWizardry.tabBloodMagic); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:ritual_dismantler"); - } - @Override public void addInformation(ItemStack stack, EntityPlayer player, List par3List, boolean x) { @@ -42,15 +34,15 @@ public class ItemRitualDismantler extends EnergyItems } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int par7, float par8, float par9, float par10) + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { - return EnergyItems.checkAndSetItemOwner(stack, player) && breakRitualStoneAtMasterStone(stack, player, world, x, y, z); + return EnergyItems.checkAndSetItemOwner(stack, player) && breakRitualStoneAtMasterStone(stack, player, world, pos); } - public boolean breakRitualStoneAtMasterStone(ItemStack stack, EntityPlayer player, World world, int x, int y, int z) + public boolean breakRitualStoneAtMasterStone(ItemStack stack, EntityPlayer player, World world, BlockPos pos) { ItemStack[] playerInventory = player.inventory.mainInventory; - TileEntity tileEntity = world.getTileEntity(x, y, z); + TileEntity tileEntity = world.getTileEntity(pos); if (tileEntity instanceof TEMasterStone) { @@ -75,17 +67,18 @@ public class ItemRitualDismantler extends EnergyItems for (RitualComponent rc : ritualList) { - if (!world.isAirBlock(x + rc.getX(direction), y + rc.getY(), z + rc.getZ(direction)) && world.getBlock(x + rc.getX(direction), y + rc.getY(), z + rc.getZ(direction)) instanceof BlockRitualStone) + BlockPos newPos = pos.add(rc.getX(direction), rc.getY(), rc.getZ(direction)); + if (!world.isAirBlock(newPos) && world.getBlockState(newPos).getBlock() instanceof BlockRitualStone) { if (freeSpace >= 0) { if (EnergyItems.syphonBatteries(stack, player, getEnergyUsed()) || player.capabilities.isCreativeMode) { - world.setBlockToAir(x + rc.getX(direction), y + rc.getY(), z + rc.getZ(direction)); + world.setBlockToAir(newPos); player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.ritualStone)); if (world.isRemote) { - world.playAuxSFX(2005, x, y + 1, z, 0); + world.playAuxSFX(2005, pos.offsetUp(), 0); return true; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java index 4f6b419c..c101711a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java @@ -3,7 +3,7 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -12,11 +12,15 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; @@ -29,8 +33,6 @@ import WayofTime.alchemicalWizardry.api.rituals.IRitualStone; import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.Rituals; import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner { @@ -46,13 +48,6 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner this.hasSubtypes = true; } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:RitualDiviner"); - } - @Override public void addInformation(ItemStack stack, EntityPlayer player, List par3List, boolean x) { @@ -166,15 +161,15 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int par7, float par8, float par9, float par10) + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { if (!EnergyItems.checkAndSetItemOwner(stack, player)) return false; - if(placeRitualStoneAtMasterStone(stack, player, world, x, y, z)) + if(placeRitualStoneAtMasterStone(stack, player, world, pos)) { - this.setStoredLocation(stack, new Int3(x, y, z)); + this.setStoredLocation(stack, new Int3(pos)); return true; - }else if(!(world.getBlock(x, y, z) instanceof IRitualStone || world.getBlock(x, y, z) instanceof IMasterRitualStone) && !player.isSneaking()) + }else if(!(world.getBlockState(pos).getBlock() instanceof IRitualStone || world.getBlockState(pos).getBlock() instanceof IMasterRitualStone) && !player.isSneaking()) { if(world.isRemote) { @@ -188,12 +183,12 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner return false; } - public boolean placeRitualStoneAtMasterStone(ItemStack stack, EntityPlayer player, World world, int x, int y, int z) + public boolean placeRitualStoneAtMasterStone(ItemStack stack, EntityPlayer player, World world, BlockPos pos) { int direction = this.getDirection(stack); ItemStack[] playerInventory = player.inventory.mainInventory; - TileEntity tileEntity = world.getTileEntity(x, y, z); + TileEntity tileEntity = world.getTileEntity(pos); if (tileEntity instanceof TEMasterStone) { @@ -221,13 +216,15 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner for (RitualComponent rc : ritualList) { - if (world.isAirBlock(x + rc.getX(direction), y + rc.getY(), z + rc.getZ(direction))) + BlockPos newPos = pos.add(rc.getX(direction), rc.getY(), rc.getZ(direction)); + + if (world.isAirBlock(newPos)) { if (playerInvRitualStoneLocation >= 0 || player.capabilities.isCreativeMode) { if (rc.getStoneType() > this.maxMetaData + this.getMaxRuneDisplacement(stack)) { - world.playAuxSFX(200, x, y + 1, z, 0); + world.playAuxSFX(200, newPos.offsetUp(), 0); return true; } @@ -238,11 +235,11 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner if(EnergyItems.syphonBatteries(stack, player, getEnergyUsed())) { - world.setBlock(x + rc.getX(direction), y + rc.getY(), z + rc.getZ(direction), ModBlocks.ritualStone, rc.getStoneType(), 3); + world.setBlockState(newPos, ModBlocks.ritualStone.getStateFromMeta(rc.getStoneType()), 3); if (world.isRemote) { - world.playAuxSFX(2005, x, y + 1, z, 0); + world.playAuxSFX(2005, newPos.offsetUp(), 0); return true; } @@ -252,29 +249,29 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner } } else { - Block block = world.getBlock(x + rc.getX(direction), y + rc.getY(), z + rc.getZ(direction)); + IBlockState state = world.getBlockState(newPos); + Block block = state.getBlock(); if (block == ModBlocks.ritualStone) { - int metadata = world.getBlockMetadata(x + rc.getX(direction), y + rc.getY(), z + rc.getZ(direction)); - + int metadata = block.getMetaFromState(state); if (metadata != rc.getStoneType()) { if(EnergyItems.syphonBatteries(stack, player, getEnergyUsed())) { if (rc.getStoneType() > this.maxMetaData + this.getMaxRuneDisplacement(stack)) { - world.playAuxSFX(200, x, y + 1, z, 0); + world.playAuxSFX(200, newPos.offsetUp(), 0); return true; } - world.setBlockMetadataWithNotify(x + rc.getX(direction), y + rc.getY(), z + rc.getZ(direction), rc.getStoneType(), 3); + world.setBlockState(newPos, ModBlocks.ritualStone.getStateFromMeta(rc.getStoneType()), 3); return true; } } } else { - world.playAuxSFX(0, x, y + 1, z, 0); + world.playAuxSFX(0, newPos.offsetUp(), 0); return true; } } @@ -295,7 +292,7 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner int y = loc.yCoord; int z = loc.zCoord; - if(!this.placeRitualStoneAtMasterStone(stack, (EntityPlayer)entity, world, x, y, z)) + if(!this.placeRitualStoneAtMasterStone(stack, (EntityPlayer)entity, world, new BlockPos(x, y, z))) { this.voidStoredLocation(stack); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java index eec96479..c813115f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java @@ -2,18 +2,13 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraft.world.WorldProvider; -import net.minecraftforge.common.DimensionManager; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; public class LavaCrystal extends EnergyItems { @@ -26,13 +21,6 @@ public class LavaCrystal extends EnergyItems setEnergyUsed(25); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:LavaCrystal"); - } - /* * Used to have the item contain itself. */ @@ -83,22 +71,7 @@ public class LavaCrystal extends EnergyItems return false; } -// World world = MinecraftServer.getServer().worldServers[0]; - WorldProvider provider = DimensionManager.getProvider(0); - if(provider == null || provider.worldObj == null) - { - return false; - } - World world = provider.worldObj; - LifeEssenceNetwork data = (LifeEssenceNetwork) world.loadItemData(LifeEssenceNetwork.class, ownerName); - - if (data == null) - { - data = new LifeEssenceNetwork(ownerName); - world.setItemData(ownerName, data); - } - - if (data.currentEssence >= this.getEnergyUsed()) + if (SoulNetworkHandler.getCurrentEssence(ownerName) >= this.getEnergyUsed()) { return true; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/LifeBucket.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/LifeBucket.java index daaec1d1..7a19f8bd 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/LifeBucket.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/LifeBucket.java @@ -1,9 +1,6 @@ package WayofTime.alchemicalWizardry.common.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemBucket; public class LifeBucket extends ItemBucket @@ -12,11 +9,4 @@ public class LifeBucket extends ItemBucket { super(block); } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:LifeBucket"); - } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/MagicianBloodOrb.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/MagicianBloodOrb.java index 737760e4..0bfa4a49 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/MagicianBloodOrb.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/MagicianBloodOrb.java @@ -1,8 +1,5 @@ package WayofTime.alchemicalWizardry.common.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; public class MagicianBloodOrb extends EnergyBattery { @@ -11,11 +8,4 @@ public class MagicianBloodOrb extends EnergyBattery super(damage); orbLevel = 3; } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:MagicianBloodOrb"); - } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/MasterBloodOrb.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/MasterBloodOrb.java index e82a160d..64021b33 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/MasterBloodOrb.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/MasterBloodOrb.java @@ -1,8 +1,5 @@ package WayofTime.alchemicalWizardry.common.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; public class MasterBloodOrb extends EnergyBattery { @@ -11,11 +8,4 @@ public class MasterBloodOrb extends EnergyBattery super(damage); orbLevel = 4; } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:MasterBloodOrb"); - } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/OrbOfTesting.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/OrbOfTesting.java index 4cd07069..1afe84a4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/OrbOfTesting.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/OrbOfTesting.java @@ -1,8 +1,5 @@ package WayofTime.alchemicalWizardry.common.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -21,13 +18,6 @@ public class OrbOfTesting extends EnergyItems this.setEnergyUsed(100); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:Untitled"); - } - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { if (!par3EntityPlayer.shouldHeal()) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ReinforcedTelepositionFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ReinforcedTelepositionFocus.java index 8d83eb3f..90c5f01d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ReinforcedTelepositionFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ReinforcedTelepositionFocus.java @@ -1,15 +1,12 @@ package WayofTime.alchemicalWizardry.common.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; -import java.util.List; - public class ReinforcedTelepositionFocus extends TelepositionFocus { public ReinforcedTelepositionFocus() @@ -17,13 +14,6 @@ public class ReinforcedTelepositionFocus extends TelepositionFocus super(3); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:ReinforcedTeleposerFocus"); - } - @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/SacrificialDagger.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/SacrificialDagger.java index b40ee311..a3b7b28b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/SacrificialDagger.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/SacrificialDagger.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; @@ -10,18 +9,20 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.event.SacrificeKnifeUsedEvent; import WayofTime.alchemicalWizardry.api.sacrifice.PlayerSacrificeHandler; import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class SacrificialDagger extends Item { @@ -33,19 +34,6 @@ public class SacrificialDagger extends Item setFull3D(); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - if (AlchemicalWizardry.wimpySettings) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:SheathedItem"); - } else - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:SacrificialDagger"); - } - } - @Override public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { @@ -85,7 +73,7 @@ public class SacrificialDagger extends Item @Override public EnumAction getItemUseAction(ItemStack stack) { - return EnumAction.bow; + return EnumAction.BOW; } @Override @@ -132,7 +120,7 @@ public class SacrificialDagger extends Item for (int l = 0; l < 8; ++l) { - world.spawnParticle("reddust", posX + Math.random() - Math.random(), posY + Math.random() - Math.random(), posZ + Math.random() - Math.random(), f1, f2, f3); + world.spawnParticle(EnumParticleTypes.REDSTONE, posX + Math.random() - Math.random(), posY + Math.random() - Math.random(), posZ + Math.random() - Math.random(), f1, f2, f3); } if (!world.isRemote && SpellHelper.isFakePlayer(world, player)) @@ -158,10 +146,8 @@ public class SacrificialDagger extends Item public void findAndFillAltar(World world, EntityPlayer player, int amount) { - int posX = (int) Math.round(player.posX - 0.5f); - int posY = (int) player.posY; - int posZ = (int) Math.round(player.posZ - 0.5f); - IBloodAltar altarEntity = getAltar(world, posX, posY, posZ); + BlockPos pos = player.getPosition(); + IBloodAltar altarEntity = getAltar(world, pos); if (altarEntity == null) { @@ -172,7 +158,7 @@ public class SacrificialDagger extends Item altarEntity.startCycle(); } - public IBloodAltar getAltar(World world, int x, int y, int z) + public IBloodAltar getAltar(World world, BlockPos pos) { TileEntity tileEntity; @@ -182,7 +168,8 @@ public class SacrificialDagger extends Item { for (int k = -2; k <= 1; k++) { - tileEntity = world.getTileEntity(i + x, k + y, j + z); + BlockPos newPos = pos.add(i, j, k); + tileEntity = world.getTileEntity(newPos); if(tileEntity instanceof IBloodAltar) { @@ -240,8 +227,8 @@ public class SacrificialDagger extends Item @Override @SideOnly(Side.CLIENT) - public boolean hasEffect(ItemStack stack, int pass) + public boolean hasEffect(ItemStack stack) { - return this.canUseForSacrifice(stack) || super.hasEffect(stack, pass); + return this.canUseForSacrifice(stack) || super.hasEffect(stack); } } \ No newline at end of file diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java index 9a7a4fbb..156dca5a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -11,8 +10,6 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class TelepositionFocus extends EnergyItems { @@ -26,13 +23,6 @@ public class TelepositionFocus extends EnergyItems this.focusLevel = focusLevel; } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:TeleposerFocus"); - } - @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/TranscendentBloodOrb.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/TranscendentBloodOrb.java index ecab2b21..665f8d88 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/TranscendentBloodOrb.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/TranscendentBloodOrb.java @@ -1,8 +1,5 @@ package WayofTime.alchemicalWizardry.common.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; public class TranscendentBloodOrb extends EnergyBattery { @@ -11,11 +8,4 @@ public class TranscendentBloodOrb extends EnergyBattery super(damage); orbLevel = 6; } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:TranscendentBloodOrb"); - } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/WaterScribeTool.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/WaterScribeTool.java index bec61005..cec691aa 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/WaterScribeTool.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/WaterScribeTool.java @@ -1,9 +1,6 @@ package WayofTime.alchemicalWizardry.common.items; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; public class WaterScribeTool extends ScribeTool { @@ -12,11 +9,4 @@ public class WaterScribeTool extends ScribeTool super(1); setCreativeTab(AlchemicalWizardry.tabBloodMagic); } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:WaterScribeTool"); - } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilAir.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilAir.java index 78f7b38d..61b14e09 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilAir.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilAir.java @@ -2,19 +2,19 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraft.util.Vec3; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import codechicken.lib.render.TextureUtils.IIconRegister; public class SigilAir extends EnergyItems implements ArmourUpgrade, ISigil { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/ContainerHolding.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/ContainerHolding.java index c3d0e651..e4d3afc2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/ContainerHolding.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/ContainerHolding.java @@ -1,12 +1,12 @@ package WayofTime.alchemicalWizardry.common.items.sigil.holding; -import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; -import cpw.mods.fml.common.FMLCommonHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.FMLCommonHandler; +import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; public class ContainerHolding extends Container { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/GuiHolding.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/GuiHolding.java index 3abcf197..f47ee663 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/GuiHolding.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/GuiHolding.java @@ -1,10 +1,11 @@ package WayofTime.alchemicalWizardry.common.items.sigil.holding; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/HoldingPacketHandler.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/HoldingPacketHandler.java index 6da027bd..f6acf021 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/HoldingPacketHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/HoldingPacketHandler.java @@ -1,8 +1,8 @@ package WayofTime.alchemicalWizardry.common.items.sigil.holding; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import cpw.mods.fml.relauncher.Side; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import net.minecraftforge.fml.relauncher.Side; public class HoldingPacketHandler { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/HoldingPacketProcessor.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/HoldingPacketProcessor.java index ad44abdf..dc82e3b1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/HoldingPacketProcessor.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/HoldingPacketProcessor.java @@ -1,10 +1,10 @@ package WayofTime.alchemicalWizardry.common.items.sigil.holding; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; public class HoldingPacketProcessor implements IMessage, IMessageHandler { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/ScrollHelper.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/ScrollHelper.java index c40984b6..bb96bf84 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/ScrollHelper.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/ScrollHelper.java @@ -6,9 +6,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.MouseEvent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ScrollHelper diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/SigilOfHolding.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/SigilOfHolding.java index c26c7265..d01f7316 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/SigilOfHolding.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/SigilOfHolding.java @@ -2,20 +2,19 @@ package WayofTime.alchemicalWizardry.common.items.sigil.holding; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import codechicken.lib.render.TextureUtils.IIconRegister; public class SigilOfHolding extends EnergyItems { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionAmphibian.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionAmphibian.java index 1e3afb29..910fa201 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionAmphibian.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionAmphibian.java @@ -1,12 +1,13 @@ package WayofTime.alchemicalWizardry.common.potion; import net.minecraft.potion.Potion; +import net.minecraft.util.ResourceLocation; public class PotionAmphibian extends Potion { public PotionAmphibian(int par1, boolean par2, int par3) { - super(par1, par2, par3); + super(par1, new ResourceLocation("speed"), par2, par3); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionBoost.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionBoost.java index 132205bb..829a64a6 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionBoost.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionBoost.java @@ -1,12 +1,13 @@ package WayofTime.alchemicalWizardry.common.potion; import net.minecraft.potion.Potion; +import net.minecraft.util.ResourceLocation; public class PotionBoost extends Potion { public PotionBoost(int par1, boolean par2, int par3) { - super(par1, par2, par3); + super(par1, new ResourceLocation("speed"),par2, par3); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionDeaf.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionDeaf.java index fc46e77b..ef3f6d8c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionDeaf.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionDeaf.java @@ -1,12 +1,13 @@ package WayofTime.alchemicalWizardry.common.potion; import net.minecraft.potion.Potion; +import net.minecraft.util.ResourceLocation; public class PotionDeaf extends Potion { public PotionDeaf(int par1, boolean par2, int par3) { - super(par1, par2, par3); + super(par1, new ResourceLocation("speed"),par2, par3); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionDemonCloak.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionDemonCloak.java index ea2045f4..f227139e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionDemonCloak.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionDemonCloak.java @@ -1,12 +1,13 @@ package WayofTime.alchemicalWizardry.common.potion; import net.minecraft.potion.Potion; +import net.minecraft.util.ResourceLocation; public class PotionDemonCloak extends Potion { public PotionDemonCloak(int par1, boolean par2, int par3) { - super(par1, par2, par3); + super(par1, new ResourceLocation("speed"),par2, par3); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionDrowning.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionDrowning.java index 87558f26..e93d897e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionDrowning.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionDrowning.java @@ -1,12 +1,13 @@ package WayofTime.alchemicalWizardry.common.potion; import net.minecraft.potion.Potion; +import net.minecraft.util.ResourceLocation; public class PotionDrowning extends Potion { public PotionDrowning(int par1, boolean par2, int par3) { - super(par1, par2, par3); + super(par1, new ResourceLocation("speed"),par2, par3); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFeatherFall.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFeatherFall.java index 0c35263b..241eda04 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFeatherFall.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFeatherFall.java @@ -1,12 +1,13 @@ package WayofTime.alchemicalWizardry.common.potion; import net.minecraft.potion.Potion; +import net.minecraft.util.ResourceLocation; public class PotionFeatherFall extends Potion { public PotionFeatherFall(int par1, boolean par2, int par3) { - super(par1, par2, par3); + super(par1, new ResourceLocation("speed"),par2, par3); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFireFuse.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFireFuse.java index 8fe5d527..2d044f6c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFireFuse.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFireFuse.java @@ -1,12 +1,13 @@ package WayofTime.alchemicalWizardry.common.potion; import net.minecraft.potion.Potion; +import net.minecraft.util.ResourceLocation; public class PotionFireFuse extends Potion { public PotionFireFuse(int par1, boolean par2, int par3) { - super(par1, par2, par3); + super(par1, new ResourceLocation("speed"),par2, par3); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFlameCloak.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFlameCloak.java index 46363b11..ff7e0727 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFlameCloak.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFlameCloak.java @@ -1,12 +1,13 @@ package WayofTime.alchemicalWizardry.common.potion; import net.minecraft.potion.Potion; +import net.minecraft.util.ResourceLocation; public class PotionFlameCloak extends Potion { public PotionFlameCloak(int par1, boolean par2, int par3) { - super(par1, par2, par3); + super(par1, new ResourceLocation("speed"),par2, par3); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFlight.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFlight.java index 23e93e57..be96423e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFlight.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFlight.java @@ -1,12 +1,13 @@ package WayofTime.alchemicalWizardry.common.potion; import net.minecraft.potion.Potion; +import net.minecraft.util.ResourceLocation; public class PotionFlight extends Potion { public PotionFlight(int par1, boolean par2, int par3) { - super(par1, par2, par3); + super(par1, new ResourceLocation("speed"),par2, par3); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionHeavyHeart.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionHeavyHeart.java index 952fb59c..e2111686 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionHeavyHeart.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionHeavyHeart.java @@ -1,12 +1,13 @@ package WayofTime.alchemicalWizardry.common.potion; import net.minecraft.potion.Potion; +import net.minecraft.util.ResourceLocation; public class PotionHeavyHeart extends Potion { public PotionHeavyHeart(int par1, boolean par2, int par3) { - super(par1, par2, par3); + super(par1, new ResourceLocation("speed"),par2, par3); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionIceCloak.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionIceCloak.java index c2ba716a..64b588ad 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionIceCloak.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionIceCloak.java @@ -1,12 +1,13 @@ package WayofTime.alchemicalWizardry.common.potion; import net.minecraft.potion.Potion; +import net.minecraft.util.ResourceLocation; public class PotionIceCloak extends Potion { public PotionIceCloak(int par1, boolean par2, int par3) { - super(par1, par2, par3); + super(par1, new ResourceLocation("speed"),par2, par3); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionInhibit.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionInhibit.java index 2214e105..42164497 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionInhibit.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionInhibit.java @@ -1,12 +1,13 @@ package WayofTime.alchemicalWizardry.common.potion; import net.minecraft.potion.Potion; +import net.minecraft.util.ResourceLocation; public class PotionInhibit extends Potion { public PotionInhibit(int par1, boolean par2, int par3) { - super(par1, par2, par3); + super(par1, new ResourceLocation("speed"),par2, par3); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionPlanarBinding.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionPlanarBinding.java index 54d6cd72..35165db5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionPlanarBinding.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionPlanarBinding.java @@ -1,12 +1,13 @@ package WayofTime.alchemicalWizardry.common.potion; import net.minecraft.potion.Potion; +import net.minecraft.util.ResourceLocation; public class PotionPlanarBinding extends Potion { public PotionPlanarBinding(int par1, boolean par2, int par3) { - super(par1, par2, par3); + super(par1, new ResourceLocation("speed"),par2, par3); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionProjectileProtect.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionProjectileProtect.java index 317edd54..e6dd1a9d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionProjectileProtect.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionProjectileProtect.java @@ -1,12 +1,13 @@ package WayofTime.alchemicalWizardry.common.potion; import net.minecraft.potion.Potion; +import net.minecraft.util.ResourceLocation; public class PotionProjectileProtect extends Potion { public PotionProjectileProtect(int par1, boolean par2, int par3) { - super(par1, par2, par3); + super(par1, new ResourceLocation("speed"),par2, par3); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionReciprocation.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionReciprocation.java index ddceed0b..e152a45a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionReciprocation.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionReciprocation.java @@ -1,12 +1,13 @@ package WayofTime.alchemicalWizardry.common.potion; import net.minecraft.potion.Potion; +import net.minecraft.util.ResourceLocation; public class PotionReciprocation extends Potion { public PotionReciprocation(int par1, boolean par2, int par3) { - super(par1, par2, par3); + super(par1, new ResourceLocation("speed"),par2, par3); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionSoulFray.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionSoulFray.java index 304b0307..03c2323e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionSoulFray.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionSoulFray.java @@ -3,6 +3,7 @@ package WayofTime.alchemicalWizardry.common.potion; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; +import net.minecraft.util.ResourceLocation; import java.util.ArrayList; @@ -10,7 +11,7 @@ public class PotionSoulFray extends Potion { public PotionSoulFray(int par1, boolean par2, int par3) { - super(par1, par2, par3); + super(par1, new ResourceLocation("speed"),par2, par3); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionSoulHarden.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionSoulHarden.java index 0ac24694..e78da4d9 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionSoulHarden.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionSoulHarden.java @@ -1,12 +1,13 @@ package WayofTime.alchemicalWizardry.common.potion; import net.minecraft.potion.Potion; +import net.minecraft.util.ResourceLocation; public class PotionSoulHarden extends Potion { public PotionSoulHarden(int par1, boolean par2, int par3) { - super(par1, par2, par3); + super(par1, new ResourceLocation("speed"),par2, par3); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelBloodAltar.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelBloodAltar.java index 8443086a..82a9d3b7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelBloodAltar.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelBloodAltar.java @@ -17,16 +17,16 @@ public class ModelBloodAltar extends ModelBase { private static final ResourceLocation altar_texture = new ResourceLocation("alchemicalwizardry:textures/models/altar.png"); - private IModelCustom modelBloodAltar; +// private IModelCustom modelBloodAltar; public ModelBloodAltar() { - modelBloodAltar = AdvancedModelLoader.loadModel(new ResourceLocation("alchemicalwizardry:models/bloodaltar-fixeUV.obj")); +// modelBloodAltar = AdvancedModelLoader.loadModel(new ResourceLocation("alchemicalwizardry:models/bloodaltar-fixeUV.obj")); } public void renderBloodAltar() { - modelBloodAltar.renderAll(); +// modelBloodAltar.renderAll(); } public void renderBloodAltar(TEAltar altar, double x, double y, double z)