From d20882c5b9d71494f86313bd218c84bb357128ce Mon Sep 17 00:00:00 2001 From: John Yorke Date: Mon, 26 Oct 2020 20:40:27 -0300 Subject: [PATCH] Focus changes & cleanup --- .../items/wand/foci/ItemFocusDarkMatter.java | 307 +++++++++--------- .../items/wand/foci/ItemFocusLumos.java | 211 ++++++------ .../items/wand/foci/ItemFocusMageMace.java | 177 +++++----- .../items/wand/foci/ItemFocusShockwave.java | 230 ++++++------- .../items/wand/foci/ItemFocusTaintSwarm.java | 235 +++++++------- .../items/wand/foci/ItemFocusVisShard.java | 158 ++++----- 6 files changed, 661 insertions(+), 657 deletions(-) diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusDarkMatter.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusDarkMatter.java index e1c1cfd..eef4d9a 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusDarkMatter.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusDarkMatter.java @@ -1,21 +1,13 @@ package taintedmagic.common.items.wand.foci; -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.Tessellator; 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.util.IIcon; import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import taintedmagic.api.IRenderInventoryItem; import taintedmagic.common.TaintedMagic; import taintedmagic.common.entities.EntityDarkMatter; import taintedmagic.common.entities.EntityDiffusion; @@ -24,174 +16,183 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.FocusUpgradeType; import thaumcraft.api.wands.ItemFocusBasic; -import thaumcraft.client.lib.UtilsFX; import thaumcraft.common.Thaumcraft; import thaumcraft.common.items.wands.ItemWandCasting; public class ItemFocusDarkMatter extends ItemFocusBasic { - IIcon depthIcon = null; - IIcon ornIcon = null; + IIcon depthIcon = null; + IIcon ornIcon = null; - private static final AspectList cost = new AspectList().add(Aspect.ENTROPY, 20).add(Aspect.FIRE, 20); - private static final AspectList costSanity = new AspectList().add(Aspect.ENTROPY, 20).add(Aspect.FIRE, 50).add(Aspect.ORDER, 50); - private static final AspectList costCorrosive = new AspectList().add(Aspect.ENTROPY, 20).add(Aspect.FIRE, 50).add(Aspect.WATER, 20); + private static final AspectList COST = new AspectList().add(Aspect.ENTROPY, 150).add(Aspect.FIRE, 100); + private static final AspectList COST_SANITY = COST.copy().add(Aspect.ORDER, 50); + private static final AspectList COST_CORROSIVE = COST.copy().add(Aspect.WATER, 50); - public ItemFocusDarkMatter () - { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); - this.setUnlocalizedName("ItemFocusDarkMatter"); - } + private static final AspectList COST_DIFFUSION = new AspectList().add(Aspect.ENTROPY, 15).add(Aspect.FIRE, 10); + private static final AspectList COST_DIFFUSION_SANITY = COST_DIFFUSION.copy().add(Aspect.ORDER, 5); + private static final AspectList COST_DIFFUSION_CORROSIVE = COST_DIFFUSION.copy().add(Aspect.WATER, 5); - @SideOnly (Side.CLIENT) - public void registerIcons (IIconRegister ir) - { - this.icon = ir.registerIcon("taintedmagic:ItemFocusDarkMatter"); - this.depthIcon = ir.registerIcon("taintedmagic:ItemFocusDarkMatter_depth"); - this.ornIcon = ir.registerIcon("thaumcraft:focus_warding_orn"); - } + public ItemFocusDarkMatter () + { + this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setUnlocalizedName("ItemFocusDarkMatter"); + } - public IIcon getFocusDepthLayerIcon (ItemStack s) - { - return this.depthIcon; - } + @SideOnly (Side.CLIENT) + public void registerIcons (IIconRegister ir) + { + this.icon = ir.registerIcon("taintedmagic:ItemFocusDarkMatter"); + this.depthIcon = ir.registerIcon("taintedmagic:ItemFocusDarkMatter_depth"); + this.ornIcon = ir.registerIcon("thaumcraft:focus_warding_orn"); + } - public IIcon getOrnament (ItemStack s) - { - return this.ornIcon; - } + public IIcon getFocusDepthLayerIcon (ItemStack stack) + { + return this.depthIcon; + } - @SideOnly (Side.CLIENT) - public boolean requiresMultipleRenderPasses () - { - return true; - } + public IIcon getOrnament (ItemStack stack) + { + return this.ornIcon; + } - @SideOnly (Side.CLIENT) - public int getRenderPasses (int m) - { - return 2; - } + @SideOnly (Side.CLIENT) + public boolean requiresMultipleRenderPasses () + { + return true; + } - @Override - @SideOnly (Side.CLIENT) - public IIcon getIconFromDamageForRenderPass (int meta, int pass) - { - return (pass == 0) ? this.ornIcon : this.icon; - } + @SideOnly (Side.CLIENT) + public int getRenderPasses (int meta) + { + return 2; + } - public String getSortingHelper (ItemStack s) - { - return "ELDRITCH" + super.getSortingHelper(s); - } + @Override + @SideOnly (Side.CLIENT) + public IIcon getIconFromDamageForRenderPass (int meta, int pass) + { + return (pass == 0) ? this.ornIcon : this.icon; + } - public int getFocusColor (ItemStack s) - { - return 0x000018; - } + public String getSortingHelper (ItemStack stack) + { + return "ELDRITCH" + super.getSortingHelper(stack); + } - public AspectList getVisCost (ItemStack s) - { - return isUpgradedWith(s, FocusUpgrades.corrosive) ? costCorrosive : isUpgradedWith(s, FocusUpgrades.sanity) ? costSanity : cost; - } + public int getFocusColor (ItemStack stack) + { + return 0x000018; + } - public int getActivationCooldown (ItemStack s) - { - return isUpgradedWith(s, FocusUpgrades.diffusion) ? -1 : 1000; - } + public AspectList getVisCost (ItemStack stack) + { + return isUpgradedWith(stack, TMFocusUpgrades.diffusion) + ? (isUpgradedWith(stack, TMFocusUpgrades.sanity) ? COST_DIFFUSION_SANITY + : isUpgradedWith(stack, TMFocusUpgrades.corrosive) ? COST_DIFFUSION_CORROSIVE : COST_DIFFUSION) + : (isUpgradedWith(stack, TMFocusUpgrades.sanity) ? COST_SANITY + : isUpgradedWith(stack, TMFocusUpgrades.corrosive) ? COST_CORROSIVE : COST); + } - public boolean isVisCostPerTick (ItemStack s) - { - return isUpgradedWith(s, FocusUpgrades.diffusion); - } + public int getActivationCooldown (ItemStack stack) + { + return isUpgradedWith(stack, TMFocusUpgrades.diffusion) ? -1 : 1000; + } - public ItemFocusBasic.WandFocusAnimation getAnimation (ItemStack s) - { - return isUpgradedWith(s, FocusUpgrades.diffusion) ? ItemFocusBasic.WandFocusAnimation.CHARGE : ItemFocusBasic.WandFocusAnimation.WAVE; - } + public boolean isVisCostPerTick (ItemStack stack) + { + return isUpgradedWith(stack, TMFocusUpgrades.diffusion); + } - public ItemStack onFocusRightClick (ItemStack s, World w, EntityPlayer p, MovingObjectPosition mop) - { - ItemWandCasting wand = (ItemWandCasting) s.getItem(); + public ItemFocusBasic.WandFocusAnimation getAnimation (ItemStack stack) + { + return isUpgradedWith(stack, TMFocusUpgrades.diffusion) ? ItemFocusBasic.WandFocusAnimation.CHARGE + : ItemFocusBasic.WandFocusAnimation.WAVE; + } - if (isUpgradedWith(wand.getFocusItem(s), FocusUpgrades.diffusion)) - { - p.setItemInUse(s, 2147483647); - } - else - { - if (!w.isRemote) - { - if (wand.consumeAllVis(s, p, getVisCost(s), true, false)) - { - EntityDarkMatter proj = new EntityDarkMatter(w, p, 16F + wand.getFocusPotency(s), isUpgradedWith(wand.getFocusItem(s), FocusUpgrades.corrosive)); - w.spawnEntityInWorld(proj); - if (!isUpgradedWith(wand.getFocusItem(s), FocusUpgrades.sanity)) - { - if (w.rand.nextInt(20) == 0) - { - Thaumcraft.addStickyWarpToPlayer(p, 1); - } - } - } - w.playSoundAtEntity(p, "thaumcraft:egattack", 0.4F, 1.0F + w.rand.nextFloat() * 0.1F); - } - p.swingItem(); - } - return s; - } + public ItemStack onFocusRightClick (ItemStack stack, World world, EntityPlayer player, MovingObjectPosition mop) + { + ItemWandCasting wand = (ItemWandCasting) stack.getItem(); - public void onUsingFocusTick (ItemStack s, EntityPlayer p, int i) - { - ItemWandCasting wand = (ItemWandCasting) s.getItem(); - if (!wand.consumeAllVis(s, p, getVisCost(s), false, false)) - { - p.stopUsingItem(); - return; - } - if (!p.worldObj.isRemote && p.ticksExisted % 5 == 0) p.worldObj.playSoundAtEntity(p, "thaumcraft:wind", 0.33F, 5.0F * (float) Math.random()); + if (isUpgradedWith(wand.getFocusItem(stack), TMFocusUpgrades.diffusion)) + { + player.setItemInUse(stack, 2147483647); + } + else + { + if (!world.isRemote) + { + if (wand.consumeAllVis(stack, player, getVisCost(stack), true, false)) + { + EntityDarkMatter proj = new EntityDarkMatter(world, player, 16F + wand.getFocusPotency(stack), + isUpgradedWith(wand.getFocusItem(stack), TMFocusUpgrades.corrosive)); + world.spawnEntityInWorld(proj); - if (!p.worldObj.isRemote && wand.consumeAllVis(s, p, getVisCost(s), true, false)) - { - for (int a = 0; a < 2 + wand.getFocusPotency(s); a++) - { - EntityDiffusion proj = new EntityDiffusion(p.worldObj, p, isUpgradedWith(wand.getFocusItem(s), FocusUpgradeType.enlarge) ? 15.0F : 9.0F, 12F + wand.getFocusPotency(s), - isUpgradedWith(wand.getFocusItem(s), FocusUpgrades.corrosive)); - proj.posX += proj.motionX; - proj.posY += proj.motionY; - proj.posZ += proj.motionZ; - p.worldObj.spawnEntityInWorld(proj); - if (!isUpgradedWith(wand.getFocusItem(s), FocusUpgrades.sanity)) - { - if (p.worldObj.rand.nextInt(200) == 0) - { - Thaumcraft.addStickyWarpToPlayer(p, 1); - } - } - } - } - } + if (!isUpgradedWith(wand.getFocusItem(stack), TMFocusUpgrades.sanity) && world.rand.nextInt(20) == 0) + Thaumcraft.addStickyWarpToPlayer(player, 1); - public FocusUpgradeType[] getPossibleUpgradesByRank (ItemStack s, int r) - { - switch (r) - { - case 1 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; - case 2 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; - case 3 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency, FocusUpgrades.corrosive, FocusUpgrades.sanity }; - case 4 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; - case 5 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency, FocusUpgrades.diffusion }; - } - return null; - } + world.playSoundAtEntity(player, "thaumcraft:egattack", 0.4F, 1.0F + world.rand.nextFloat() * 0.1F); + } + } + player.swingItem(); + } + return stack; + } - public boolean canApplyUpgrade (ItemStack s, EntityPlayer p, FocusUpgradeType t, int rank) - { - return (!t.equals(FocusUpgrades.diffusion)) || (ThaumcraftApiHelper.isResearchComplete(p.getCommandSenderName(), "DIFFUSIONUPGRADE")); - } + public void onUsingFocusTick (ItemStack stack, EntityPlayer player, int i) + { + ItemWandCasting wand = (ItemWandCasting) stack.getItem(); + + if (!wand.consumeAllVis(stack, player, getVisCost(stack), false, false)) + { + player.stopUsingItem(); + return; + } + if (!player.worldObj.isRemote && player.ticksExisted % 5 == 0) + player.worldObj.playSoundAtEntity(player, "thaumcraft:wind", 0.33F, 5.0F * (float) Math.random()); + + if (!player.worldObj.isRemote && wand.consumeAllVis(stack, player, getVisCost(stack), true, false)) + { + for (int a = 0; a < 2 + wand.getFocusPotency(stack); a++) + { + EntityDiffusion proj = new EntityDiffusion(player.worldObj, player, + isUpgradedWith(wand.getFocusItem(stack), FocusUpgradeType.enlarge) ? 15.0F : 9.0F, + 12F + wand.getFocusPotency(stack), isUpgradedWith(wand.getFocusItem(stack), TMFocusUpgrades.corrosive)); + + proj.posX += proj.motionX; + proj.posY += proj.motionY; + proj.posZ += proj.motionZ; + + player.worldObj.spawnEntityInWorld(proj); + + if (!isUpgradedWith(wand.getFocusItem(stack), TMFocusUpgrades.sanity) && player.worldObj.rand.nextInt(200) == 0) + Thaumcraft.addStickyWarpToPlayer(player, 1); + } + } + } + + public FocusUpgradeType[] getPossibleUpgradesByRank (ItemStack stack, int rank) + { + switch (rank) + { + case 1 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; + case 2 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; + case 3 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency, TMFocusUpgrades.corrosive, + TMFocusUpgrades.sanity }; + case 4 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; + case 5 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency, TMFocusUpgrades.diffusion }; + } + return null; + } + + public boolean canApplyUpgrade (ItemStack stack, EntityPlayer player, FocusUpgradeType type, int rank) + { + return (!type.equals(TMFocusUpgrades.diffusion)) + || (ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), "DIFFUSIONUPGRADE")); + } } diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusLumos.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusLumos.java index 98529c4..9748b18 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusLumos.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusLumos.java @@ -1,7 +1,5 @@ package taintedmagic.common.items.wand.foci; -import java.util.List; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; @@ -21,125 +19,120 @@ import thaumcraft.common.items.wands.ItemWandCasting; public class ItemFocusLumos extends ItemFocusBasic { - private static final AspectList cost = new AspectList().add(Aspect.AIR, 500).add(Aspect.FIRE, 500); + private static final AspectList COST = new AspectList().add(Aspect.AIR, 10).add(Aspect.FIRE, 25); - public ItemFocusLumos () - { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); - this.setUnlocalizedName("ItemFocusLumos"); - } + public ItemFocusLumos () + { + this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setUnlocalizedName("ItemFocusLumos"); + } - @SideOnly (Side.CLIENT) - public void registerIcons (IIconRegister ir) - { - this.icon = ir.registerIcon("taintedmagic:ItemFocusLumos"); - } + @SideOnly (Side.CLIENT) + public void registerIcons (IIconRegister ir) + { + this.icon = ir.registerIcon("taintedmagic:ItemFocusLumos"); + } - public String getSortingHelper (ItemStack s) - { - return "LUMOS" + super.getSortingHelper(s); - } + public String getSortingHelper (ItemStack stack) + { + return "LUMOS" + super.getSortingHelper(stack); + } - public int getFocusColor (ItemStack s) - { - return 0xC9D2F8; - } + public int getFocusColor (ItemStack stack) + { + return 0xC9D2F8; + } - @Override - public void addInformation (ItemStack s, EntityPlayer p, List l, boolean b) - { - super.addInformation(s, p, l, b); - } + public AspectList getVisCost (ItemStack stack) + { + return this.COST; + } - public AspectList getVisCost (ItemStack s) - { - return this.cost; - } + public int getActivationCooldown (ItemStack stack) + { + return 1000; + } - public int getActivationCooldown (ItemStack s) - { - return 1000; - } + public boolean isVisCostPerTick (ItemStack stack) + { + return false; + } - public boolean isVisCostPerTick (ItemStack s) - { - return false; - } + public ItemFocusBasic.WandFocusAnimation getAnimation (ItemStack stack) + { + return ItemFocusBasic.WandFocusAnimation.WAVE; + } - public ItemFocusBasic.WandFocusAnimation getAnimation (ItemStack s) - { - return ItemFocusBasic.WandFocusAnimation.WAVE; - } + public ItemStack onFocusRightClick (ItemStack stack, World world, EntityPlayer player, MovingObjectPosition mop) + { + ItemWandCasting wand = (ItemWandCasting) stack.getItem(); - public ItemStack onFocusRightClick (ItemStack s, World w, EntityPlayer p, MovingObjectPosition mop) - { - ItemWandCasting wand = (ItemWandCasting) s.getItem(); + if (mop != null && mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) + { + int x = mop.blockX; + int y = mop.blockY; + int z = mop.blockZ; - if (mop != null && mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) - { - int x = mop.blockX; - int y = mop.blockY; - int z = mop.blockZ; + if (!world.getBlock(x, y, z).getMaterial().isReplaceable()) switch (mop.sideHit) + { + case 0 : + y--; + break; + case 1 : + y++; + break; + case 2 : + z--; + break; + case 3 : + z++; + break; + case 4 : + x--; + break; + case 5 : + x++; + } + if (world.getBlock(x, y, z).isReplaceable(world, x, y, z)) + { + if (wand.consumeAllVis(stack, player, getVisCost(stack), true, false)) + { + if (!world.isRemote) world.setBlock(x, y, z, BlockRegistry.BlockLumos, 0, 3); + world.playSoundAtEntity(player, "thaumcraft:ice", 0.3F, 1.1F + world.rand.nextFloat() * 0.1F); - if (!w.getBlock(x, y, z).getMaterial().isReplaceable()) switch (mop.sideHit) - { - case 0 : - y--; - break; - case 1 : - y++; - break; - case 2 : - z--; - break; - case 3 : - z++; - break; - case 4 : - x--; - break; - case 5 : - x++; - } - if (w.getBlock(x, y, z).isReplaceable(w, x, y, z)) - { - if (wand.consumeAllVis(s, p, getVisCost(s), true, false)) - { - if (!w.isRemote) w.setBlock(x, y, z, BlockRegistry.BlockLumos, 0, 3); - w.playSoundAtEntity(p, "thaumcraft:ice", 0.3F, 1.1F + w.rand.nextFloat() * 0.1F); + for (int a = 0; a < 9; a++) + if (world.isRemote) spawnLumosParticles(world, x, y, z); + } + } + } + player.swingItem(); + return stack; + } - for (int a = 0; a < 9; a++) - if (w.isRemote) spawnLumosParticles(w, x, y, z); - } - } - } - p.swingItem(); - return s; - } + @SideOnly (Side.CLIENT) + void spawnLumosParticles (World world, double x, double y, double z) + { + FXSparkle fx = new FXSparkle(world, x + world.rand.nextFloat(), y + world.rand.nextFloat(), z + world.rand.nextFloat(), + 1.75F, 6, 3 + world.rand.nextInt(3)); + fx.setGravity(0.1F); + ParticleEngine.instance.addEffect(world, fx); + } - @SideOnly (Side.CLIENT) - void spawnLumosParticles (World w, double x, double y, double z) - { - FXSparkle fx = new FXSparkle(w, x + w.rand.nextFloat(), y + w.rand.nextFloat(), z + w.rand.nextFloat(), 1.75F, 6, 3 + w.rand.nextInt(3)); - fx.setGravity(0.1F); - ParticleEngine.instance.addEffect(w, fx); - } - - public FocusUpgradeType[] getPossibleUpgradesByRank (ItemStack s, int r) - { - switch (r) - { - case 1 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal }; - case 2 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal }; - case 3 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal }; - case 4 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal }; - case 5 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal }; - } - return null; - } + public FocusUpgradeType[] getPossibleUpgradesByRank (ItemStack stack, int rank) + { + switch (rank) + { + case 1 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal }; + case 2 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal }; + case 3 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal }; + case 4 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal }; + case 5 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal }; + } + return null; + } } diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMageMace.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMageMace.java index 882171f..09c542f 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMageMace.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMageMace.java @@ -1,5 +1,6 @@ package taintedmagic.common.items.wand.foci; +import java.text.DecimalFormat; import java.util.List; import cpw.mods.fml.relauncher.Side; @@ -21,106 +22,110 @@ import thaumcraft.api.wands.ItemFocusBasic; public class ItemFocusMageMace extends ItemFocusBasic { - public IIcon ornIcon = null; + IIcon ornIcon = null; - public static final AspectList cost = new AspectList().add(Aspect.ENTROPY, 50); + private static final AspectList COST = new AspectList().add(Aspect.ENTROPY, 10); - public ItemFocusMageMace () - { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); - this.setUnlocalizedName("ItemFocusMageMace"); - } + public ItemFocusMageMace () + { + this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setUnlocalizedName("ItemFocusMageMace"); + } - @SideOnly (Side.CLIENT) - public void registerIcons (IIconRegister ir) - { - this.icon = ir.registerIcon("taintedmagic:ItemFocusMageMace"); - this.ornIcon = ir.registerIcon("taintedmagic:ItemFocusMageMace_orn"); - } + @SideOnly (Side.CLIENT) + public void registerIcons (IIconRegister ir) + { + this.icon = ir.registerIcon("taintedmagic:ItemFocusMageMace"); + this.ornIcon = ir.registerIcon("taintedmagic:ItemFocusMageMace_orn"); + } - public IIcon getOrnament (ItemStack s) - { - return this.ornIcon; - } + public IIcon getOrnament (ItemStack stack) + { + return this.ornIcon; + } - @SideOnly (Side.CLIENT) - public boolean requiresMultipleRenderPasses () - { - return true; - } + @SideOnly (Side.CLIENT) + public boolean requiresMultipleRenderPasses () + { + return true; + } - @SideOnly (Side.CLIENT) - public int getRenderPasses (int m) - { - return 2; - } + @SideOnly (Side.CLIENT) + public int getRenderPasses (int meta) + { + return 2; + } - @Override - @SideOnly (Side.CLIENT) - public IIcon getIconFromDamageForRenderPass (int meta, int pass) - { - return (pass == 0) ? this.ornIcon : this.icon; - } + @Override + @SideOnly (Side.CLIENT) + public IIcon getIconFromDamageForRenderPass (int meta, int pass) + { + return (pass == 0) ? this.ornIcon : this.icon; + } - public String getSortingHelper (ItemStack s) - { - return "MACE" + super.getSortingHelper(s); - } + public String getSortingHelper (ItemStack stack) + { + return "MACE" + super.getSortingHelper(stack); + } - public int getFocusColor (ItemStack s) - { - return 0xACA9B5; - } + public int getFocusColor (ItemStack stack) + { + return 0xACA9B5; + } - public AspectList getVisCost (ItemStack s) - { - return this.cost; - } + public AspectList getVisCost (ItemStack stack) + { + return this.COST; + } - public int getActivationCooldown (ItemStack s) - { - return -1; - } + public int getActivationCooldown (ItemStack stack) + { + return -1; + } - public boolean isVisCostPerTick (ItemStack s) - { - return false; - } + public boolean isVisCostPerTick (ItemStack stack) + { + return false; + } - public ItemFocusBasic.WandFocusAnimation getAnimation (ItemStack s) - { - return WandFocusAnimation.WAVE; - } + public ItemFocusBasic.WandFocusAnimation getAnimation (ItemStack stack) + { + return WandFocusAnimation.WAVE; + } - public ItemStack onFocusRightClick (ItemStack s, World w, EntityPlayer p, MovingObjectPosition mop) - { - return s; - } + public ItemStack onFocusRightClick (ItemStack stack, World world, EntityPlayer player, MovingObjectPosition mop) + { + return stack; + } - @Override - public void addInformation (ItemStack s, EntityPlayer p, List l, boolean b) - { - super.addInformation(s, p, l, b); - l.add(" "); - l.add(EnumChatFormatting.BLUE + "+" + String.valueOf(ConfigHandler.MAGE_MACE_DMG_INC_BASE + (double) this.getUpgradeLevel(s, FocusUpgradeType.potency)) + " " - + StatCollector.translateToLocal("text.attackdamageequipped")); - } + @Override + public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean b) + { + super.addInformation(stack, player, list, b); + list.add(" "); - public FocusUpgradeType[] getPossibleUpgradesByRank (ItemStack s, int rank) - { - switch (rank) - { - case 1 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; - case 2 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; - case 3 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; - case 4 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; - case 5 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; - } - return null; - } + DecimalFormat df = new DecimalFormat("0.#"); + double dmg = ConfigHandler.MAGE_MACE_DMG_INC_BASE + (double) this.getUpgradeLevel(stack, FocusUpgradeType.potency); + + list.add(EnumChatFormatting.BLUE + "+" + df.format(dmg) + " " + + StatCollector.translateToLocal("text.attackdamageequipped")); + } + + public FocusUpgradeType[] getPossibleUpgradesByRank (ItemStack stack, int rank) + { + switch (rank) + { + case 1 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; + case 2 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; + case 3 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; + case 4 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; + case 5 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; + } + return null; + } } diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusShockwave.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusShockwave.java index 6037a06..7d3e05b 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusShockwave.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusShockwave.java @@ -1,6 +1,7 @@ package taintedmagic.common.items.wand.foci; import java.util.List; +import java.util.Random; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -29,130 +30,141 @@ import thaumcraft.common.items.wands.ItemWandCasting; public class ItemFocusShockwave extends ItemFocusBasic { - private static final AspectList cost = new AspectList().add(Aspect.AIR, 500).add(Aspect.ENTROPY, 300); + private static final AspectList COST = new AspectList().add(Aspect.AIR, 150).add(Aspect.ENTROPY, 100); - public static IIcon depthIcon; + IIcon depthIcon; - public ItemFocusShockwave () - { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); - this.setUnlocalizedName("ItemFocusShockwave"); - } + public ItemFocusShockwave () + { + this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setUnlocalizedName("ItemFocusShockwave"); + } - @SideOnly (Side.CLIENT) - public void registerIcons (IIconRegister ir) - { - this.icon = ir.registerIcon("taintedmagic:ItemFocusShockwave"); - this.depthIcon = ir.registerIcon("taintedmagic:ItemFocusShockwave_depth"); - } + @SideOnly (Side.CLIENT) + public void registerIcons (IIconRegister ir) + { + this.icon = ir.registerIcon("taintedmagic:ItemFocusShockwave"); + this.depthIcon = ir.registerIcon("taintedmagic:ItemFocusShockwave_depth"); + } - public IIcon getFocusDepthLayerIcon (ItemStack s) - { - return this.depthIcon; - } + public IIcon getFocusDepthLayerIcon (ItemStack stack) + { + return this.depthIcon; + } - public String getSortingHelper (ItemStack s) - { - return "SHOCKWAVE" + super.getSortingHelper(s); - } + public String getSortingHelper (ItemStack stack) + { + return "SHOCKWAVE" + super.getSortingHelper(stack); + } - public int getFocusColor (ItemStack s) - { - return 0xB0B7C4; - } + public int getFocusColor (ItemStack stack) + { + return 0xB0B7C4; + } - public AspectList getVisCost (ItemStack s) - { - return cost; - } + public AspectList getVisCost (ItemStack stack) + { + return COST; + } - public int getActivationCooldown (ItemStack s) - { - return 10000; - } + public int getActivationCooldown (ItemStack stack) + { + return 10000; + } - public boolean isVisCostPerTick (ItemStack s) - { - return false; - } + public boolean isVisCostPerTick (ItemStack stack) + { + return false; + } - public ItemFocusBasic.WandFocusAnimation getAnimation (ItemStack s) - { - return ItemFocusBasic.WandFocusAnimation.WAVE; - } + public ItemFocusBasic.WandFocusAnimation getAnimation (ItemStack stack) + { + return ItemFocusBasic.WandFocusAnimation.WAVE; + } - @Override - public void addInformation (ItemStack s, EntityPlayer p, List l, boolean b) - { - super.addInformation(s, p, l, b); - l.add(" "); - l.add(EnumChatFormatting.BLUE + "+" + new String(this.isUpgradedWith(s, FocusUpgradeType.enlarge) ? Integer.toString(15 + this.getUpgradeLevel(s, FocusUpgradeType.enlarge)) : "15") + " " - + StatCollector.translateToLocal("text.radius")); - } + @Override + public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean b) + { + super.addInformation(stack, player, list, b); + list.add(" "); + list.add(EnumChatFormatting.BLUE + "+" + + new String(this.isUpgradedWith(stack, FocusUpgradeType.enlarge) + ? Integer.toString(15 + this.getUpgradeLevel(stack, FocusUpgradeType.enlarge)) : "15") + + " " + StatCollector.translateToLocal("text.radius")); + } - public ItemStack onFocusRightClick (ItemStack s, World w, EntityPlayer p, MovingObjectPosition mop) - { - ItemWandCasting wand = (ItemWandCasting) s.getItem(); + public ItemStack onFocusRightClick (ItemStack stack, World world, EntityPlayer player, MovingObjectPosition mop) + { + ItemWandCasting wand = (ItemWandCasting) stack.getItem(); - int pot = wand.getFocusPotency(s); - if (wand.consumeAllVis(s, p, getVisCost(s), true, false)) - { - List ents = w.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(p.posX, p.posY, p.posZ, p.posX + 1, p.posY + 1, p.posZ + 1).expand(15.0D - + this.getUpgradeLevel(s, FocusUpgradeType.enlarge), 15.0D + this.getUpgradeLevel(s, FocusUpgradeType.enlarge), 15.0D + this.getUpgradeLevel(s, FocusUpgradeType.enlarge))); - if (ents != null && ents.size() > 0) - { - for (int a = 0; a < ents.size(); a++) - { - EntityLivingBase e = ents.get(a); + int potency = wand.getFocusPotency(stack); + int enlarge = wand.getFocusEnlarge(stack); - if (e != p && e.isEntityAlive() && !e.isEntityInvulnerable()) - { - double dist = TaintedMagicHelper.getDistanceTo(e.posX, e.posY, e.posZ, p); - if (dist < 7.0D) e.attackEntityFrom(DamageSource.magic, 2.0F + this.getUpgradeLevel(s, FocusUpgradeType.potency)); - Vector3 movement = TaintedMagicHelper.getVectorBetweenEntities(e, p); - e.addVelocity(movement.x * (5.0D + this.getUpgradeLevel(s, FocusUpgradeType.potency)), 1.5D + (this.getUpgradeLevel(s, FocusUpgradeType.potency) * 0.1D), movement.z - * (5.0D + this.getUpgradeLevel(s, FocusUpgradeType.potency))); - if (w.isRemote) spawnParticles(w, p, e); - } - } - } - w.playSoundAtEntity(p, "taintedmagic:shockwave", 5.0F, 1.5F * (float) Math.random()); - return s; - } - return null; - } + if (wand.consumeAllVis(stack, player, getVisCost(stack), true, false)) + { + List ents = + world.getEntitiesWithinAABB(EntityLivingBase.class, + AxisAlignedBB.getBoundingBox(player.posX, player.posY, player.posZ, player.posX + 1, + player.posY + 1, player.posZ + 1) + .expand(15.0D + enlarge, 15.0D + enlarge, 15.0D + enlarge)); - @SideOnly (Side.CLIENT) - public static void spawnParticles (World w, EntityPlayer p, Entity e) - { - FXLightningBolt bolt = new FXLightningBolt(w, p, e, w.rand.nextLong(), 4); + if (ents != null && ents.size() > 0) for (int i = 0; i < ents.size(); i++) + { + EntityLivingBase entity = ents.get(i); - bolt.defaultFractal(); - bolt.setType(2); - bolt.setWidth(0.125F); - bolt.finalizeBolt(); - for (int a = 0; a < 5; a++) - { - Thaumcraft.proxy.sparkle((float) e.posX + (p.worldObj.rand.nextFloat() - p.worldObj.rand.nextFloat()) * 0.6F, (float) e.posY + (p.worldObj.rand.nextFloat() - p.worldObj.rand.nextFloat()) - * 0.6F, (float) e.posZ + (p.worldObj.rand.nextFloat() - p.worldObj.rand.nextFloat()) * 0.6F, 2.0F + p.worldObj.rand.nextFloat(), 2, 0.05F + p.worldObj.rand.nextFloat() * 0.05F); - } - } + if (entity != player && entity.isEntityAlive() && !entity.isEntityInvulnerable()) + { + double dist = TaintedMagicHelper.getDistanceTo(player, entity.posX, entity.posY, entity.posZ); - public FocusUpgradeType[] getPossibleUpgradesByRank (ItemStack s, int rank) - { - switch (rank) - { - case 1 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge, FocusUpgradeType.potency }; - case 2 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge, FocusUpgradeType.potency }; - case 3 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge, FocusUpgradeType.potency }; - case 4 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge, FocusUpgradeType.potency }; - case 5 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge, FocusUpgradeType.potency }; - } - return null; - } + if (dist < 7.0D) entity.attackEntityFrom(DamageSource.magic, 2.0F + potency); + + Vector3 vel = TaintedMagicHelper.getVectorBetweenEntities(entity, player); + entity.addVelocity(vel.x * (5.0D + potency), 1.5D + (potency * 0.1D), vel.z * (5.0D + potency)); + + if (world.isRemote) spawnParticles(world, player, entity); + } + } + world.playSoundAtEntity(player, "taintedmagic:shockwave", 5.0F, 1.5F * (float) Math.random()); + return stack; + } + return null; + } + + @SideOnly (Side.CLIENT) + public static void spawnParticles (World world, EntityPlayer player, Entity entity) + { + FXLightningBolt bolt = new FXLightningBolt(world, player, entity, world.rand.nextLong(), 4); + + bolt.defaultFractal(); + bolt.setType(2); + bolt.setWidth(0.125F); + bolt.finalizeBolt(); + + for (int a = 0; a < 5; a++) + { + Random random = player.worldObj.rand; + float x = (float) entity.posX + (random.nextFloat() - random.nextFloat()) * 0.6F; + float y = (float) entity.posY + (random.nextFloat() - random.nextFloat()) * 0.6F; + float z = (float) entity.posZ + (random.nextFloat() - random.nextFloat()) * 0.6F; + Thaumcraft.proxy.sparkle(x, y, z, 2.0F + random.nextFloat(), 2, 0.05F + random.nextFloat() * 0.05F); + } + } + + public FocusUpgradeType[] getPossibleUpgradesByRank (ItemStack stack, int rank) + { + switch (rank) + { + case 1 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge, FocusUpgradeType.potency }; + case 2 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge, FocusUpgradeType.potency }; + case 3 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge, FocusUpgradeType.potency }; + case 4 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge, FocusUpgradeType.potency }; + case 5 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.enlarge, FocusUpgradeType.potency }; + } + return null; + } } diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaintSwarm.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaintSwarm.java index 798095d..5cfced3 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaintSwarm.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaintSwarm.java @@ -25,148 +25,139 @@ import thaumcraft.common.lib.utils.EntityUtils; public class ItemFocusTaintSwarm extends ItemFocusBasic { - IIcon depthIcon = null; - IIcon ornIcon = null; + IIcon depthIcon = null; + IIcon ornIcon = null; - private static final AspectList cost = new AspectList().add(Aspect.EARTH, 500).add(Aspect.WATER, 500); - private static final AspectList costAntibody = new AspectList().add(Aspect.EARTH, 500).add(Aspect.WATER, 500).add(Aspect.ORDER, 200); + private static final AspectList COST = new AspectList().add(Aspect.EARTH, 50).add(Aspect.WATER, 50); + private static final AspectList COST_ANTIBODY = COST.copy().add(Aspect.ORDER, 10); - public ItemFocusTaintSwarm () - { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); - this.setUnlocalizedName("ItemFocusTaintSwarm"); - } + public ItemFocusTaintSwarm () + { + this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setUnlocalizedName("ItemFocusTaintSwarm"); + } - @SideOnly (Side.CLIENT) - public void registerIcons (IIconRegister ir) - { - this.icon = ir.registerIcon("taintedmagic:ItemFocusTaintSwarm"); - this.depthIcon = ir.registerIcon("taintedmagic:ItemFocusTaintSwarm_depth"); - this.ornIcon = ir.registerIcon("thaumcraft:focus_whatever_orn"); - } + @SideOnly (Side.CLIENT) + public void registerIcons (IIconRegister ir) + { + this.icon = ir.registerIcon("taintedmagic:ItemFocusTaintSwarm"); + this.depthIcon = ir.registerIcon("taintedmagic:ItemFocusTaintSwarm_depth"); + this.ornIcon = ir.registerIcon("thaumcraft:focus_whatever_orn"); + } - public IIcon getFocusDepthLayerIcon (ItemStack s) - { - return this.depthIcon; - } + public IIcon getFocusDepthLayerIcon (ItemStack stack) + { + return this.depthIcon; + } - public IIcon getOrnament (ItemStack s) - { - return this.ornIcon; - } + public IIcon getOrnament (ItemStack stack) + { + return this.ornIcon; + } - @SideOnly (Side.CLIENT) - public boolean requiresMultipleRenderPasses () - { - return true; - } + @SideOnly (Side.CLIENT) + public boolean requiresMultipleRenderPasses () + { + return true; + } - @SideOnly (Side.CLIENT) - public int getRenderPasses (int m) - { - return 2; - } + @SideOnly (Side.CLIENT) + public int getRenderPasses (int meta) + { + return 2; + } - @Override - @SideOnly (Side.CLIENT) - public IIcon getIconFromDamageForRenderPass (int meta, int pass) - { - return (pass == 0) ? this.ornIcon : this.icon; - } + @Override + @SideOnly (Side.CLIENT) + public IIcon getIconFromDamageForRenderPass (int meta, int pass) + { + return (pass == 0) ? this.ornIcon : this.icon; + } - public String getSortingHelper (ItemStack s) - { - return "TAINT" + super.getSortingHelper(s); - } + public String getSortingHelper (ItemStack stack) + { + return "TAINT" + super.getSortingHelper(stack); + } - public int getFocusColor (ItemStack s) - { - return 0x9929BD; - } + public int getFocusColor (ItemStack stack) + { + return 0x9929BD; + } - public AspectList getVisCost (ItemStack s) - { - return isUpgradedWith(s, FocusUpgrades.antibody) ? costAntibody : cost; - } + public AspectList getVisCost (ItemStack stack) + { + return isUpgradedWith(stack, TMFocusUpgrades.antibody) ? COST_ANTIBODY : COST; + } - public int getActivationCooldown (ItemStack s) - { - return 3000; - } + public int getActivationCooldown (ItemStack stack) + { + return 3000; + } - public boolean isVisCostPerTick (ItemStack s) - { - return false; - } + public boolean isVisCostPerTick (ItemStack stack) + { + return false; + } - public ItemFocusBasic.WandFocusAnimation getAnimation (ItemStack s) - { - return ItemFocusBasic.WandFocusAnimation.WAVE; - } + public ItemFocusBasic.WandFocusAnimation getAnimation (ItemStack stack) + { + return ItemFocusBasic.WandFocusAnimation.WAVE; + } - public ItemStack onFocusRightClick (ItemStack s, World w, EntityPlayer p, MovingObjectPosition mop) - { - ItemWandCasting wand = (ItemWandCasting) s.getItem(); + public ItemStack onFocusRightClick (ItemStack stack, World world, EntityPlayer player, MovingObjectPosition mop) + { + ItemWandCasting wand = (ItemWandCasting) stack.getItem(); - Entity look = EntityUtils.getPointedEntity(w, p, 0.0D, 32.0D, 1.1F); + Entity target = EntityUtils.getPointedEntity(world, player, 0.0D, 32.0D, 1.1F); - if (look != null && look instanceof EntityLivingBase) - { - if (wand.consumeAllVis(s, p, getVisCost(s), true, false)) - { - EntityTaintSwarm e = new EntityTaintSwarm(w); - Vec3 v = p.getLookVec(); - e.setLocationAndAngles(p.posX + v.xCoord / 2.0D, p.posY + p.getEyeHeight() + v.yCoord / 2.0D, p.posZ + v.zCoord / 2.0D, p.rotationYaw, p.rotationPitch); + if (target != null && target instanceof EntityLivingBase) + { + if (wand.consumeAllVis(stack, player, getVisCost(stack), true, false)) + { + EntityTaintSwarm swarm = new EntityTaintSwarm(world); - e.getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(5.0D + wand.getFocusPotency(s)); - e.setTarget(look); - e.setIsSummoned(true); + Vec3 look = player.getLookVec(); + swarm.setLocationAndAngles(player.posX + look.xCoord / 2.0D, + player.posY + player.getEyeHeight() + look.yCoord / 2.0D, player.posZ + look.zCoord / 2.0D, + player.rotationYaw, player.rotationPitch); - if (!w.isRemote) w.spawnEntityInWorld(e); + swarm.getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(5.0D + wand.getFocusPotency(stack)); + swarm.setTarget(target); + swarm.setIsSummoned(true); - if (!isUpgradedWith(wand.getFocusItem(s), FocusUpgrades.antibody)) - { - if (p.worldObj.rand.nextInt(3) == 0) - { - try - { - p.addPotionEffect(new PotionEffect(Config.potionTaintPoisonID, 40, 2)); - } - catch (Exception err) - { - err.printStackTrace(); - } - } - } - } - p.swingItem(); - } - return s; - } + if (!world.isRemote) world.spawnEntityInWorld(swarm); - public void onPlayerStoppedUsingFocus (ItemStack s, World w, EntityPlayer p, int count) - { - } + if (!isUpgradedWith(wand.getFocusItem(stack), TMFocusUpgrades.antibody) && player.worldObj.rand.nextInt(3) == 0) + { + try + { + player.addPotionEffect(new PotionEffect(Config.potionTaintPoisonID, 40, 2)); + } + catch (Exception e) + { + } + } + } + player.swingItem(); + } + return stack; + } - public void onUsingFocusTick (ItemStack s, EntityPlayer p, int count) - { - } - - public FocusUpgradeType[] getPossibleUpgradesByRank (ItemStack s, int rank) - { - switch (rank) - { - case 1 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; - case 2 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; - case 3 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency, FocusUpgrades.antibody }; - case 4 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; - case 5 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; - } - return null; - } + public FocusUpgradeType[] getPossibleUpgradesByRank (ItemStack stack, int rank) + { + switch (rank) + { + case 1 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; + case 2 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; + case 3 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency, TMFocusUpgrades.antibody }; + case 4 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; + case 5 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; + } + return null; + } } diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusVisShard.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusVisShard.java index 8a83071..317588c 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusVisShard.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusVisShard.java @@ -21,97 +21,99 @@ import thaumcraft.common.items.wands.ItemWandCasting; import thaumcraft.common.lib.utils.EntityUtils; /** - * this class is based off of ItemFocusShard.class created by as part - * of Thaumcraft 5 + * This class is based off of ItemFocusShard.class created by as part of Thaumcraft 5. */ public class ItemFocusVisShard extends ItemFocusBasic { - private static final AspectList cost = new AspectList().add(Aspect.FIRE, 100).add(Aspect.ENTROPY, 100).add(Aspect.AIR, 100); - private static final AspectList costPersistent = new AspectList().add(Aspect.FIRE, 100).add(Aspect.ENTROPY, 100).add(Aspect.WATER, 100).add(Aspect.AIR, 100); + private static final AspectList COST = new AspectList().add(Aspect.FIRE, 10).add(Aspect.ENTROPY, 10).add(Aspect.AIR, 10); + private static final AspectList COST_PERSISTENT = COST.copy().add(Aspect.WATER, 10); - public ItemFocusVisShard () - { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); - this.setUnlocalizedName("ItemFocusVisShard"); - } + public ItemFocusVisShard () + { + this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setUnlocalizedName("ItemFocusVisShard"); + } - @SideOnly (Side.CLIENT) - public void registerIcons (IIconRegister ir) - { - this.icon = ir.registerIcon("taintedmagic:ItemFocusVisShard"); - } + @SideOnly (Side.CLIENT) + public void registerIcons (IIconRegister ir) + { + this.icon = ir.registerIcon("taintedmagic:ItemFocusVisShard"); + } - public String getSortingHelper (ItemStack s) - { - return "SHARD" + super.getSortingHelper(s); - } + public String getSortingHelper (ItemStack stack) + { + return "SHARD" + super.getSortingHelper(stack); + } - public int getFocusColor (ItemStack s) - { - return 0x9929BD; - } + public int getFocusColor (ItemStack stack) + { + return 0x9929BD; + } - public int getActivationCooldown (ItemStack s) - { - return 300; - } + public int getActivationCooldown (ItemStack stack) + { + return 300; + } - public ItemFocusBasic.WandFocusAnimation getAnimation (ItemStack s) - { - return ItemFocusBasic.WandFocusAnimation.WAVE; - } + public ItemFocusBasic.WandFocusAnimation getAnimation (ItemStack stack) + { + return ItemFocusBasic.WandFocusAnimation.WAVE; + } - public ItemStack onFocusRightClick (ItemStack s, World w, EntityPlayer p, MovingObjectPosition mop) - { - ItemWandCasting wand = (ItemWandCasting) s.getItem(); + public ItemStack onFocusRightClick (ItemStack stack, World world, EntityPlayer player, MovingObjectPosition mop) + { + ItemWandCasting wand = (ItemWandCasting) stack.getItem(); + Entity look = EntityUtils.getPointedEntity(player.worldObj, player, 0.0D, 32.0D, 1.1F); - Entity look = EntityUtils.getPointedEntity(p.worldObj, p, 0.0D, 32.0D, 1.1F); - if (look != null && look instanceof EntityLivingBase) - { - if (wand.consumeAllVis(s, p, getVisCost(s), true, false)) - { - EntityHomingShard shard = new EntityHomingShard(w, p, (EntityLivingBase) look, wand.getFocusPotency(s), isUpgradedWith(wand.getFocusItem(s), FocusUpgrades.persistent)); - if (!w.isRemote) w.spawnEntityInWorld(shard); - w.playSoundAtEntity(shard, "taintedmagic:shard", 0.3F, 1.1F + w.rand.nextFloat() * 0.1F); + if (look != null && look instanceof EntityLivingBase) + { + if (wand.consumeAllVis(stack, player, getVisCost(stack), true, false)) + { + EntityHomingShard shard = new EntityHomingShard(world, player, (EntityLivingBase) look, + wand.getFocusPotency(stack), isUpgradedWith(wand.getFocusItem(stack), TMFocusUpgrades.persistent)); + if (!world.isRemote) world.spawnEntityInWorld(shard); - for (int a = 0; a < 18; a++) - { - if (w.isRemote) spawnParticles(w, shard.posX, shard.posY, shard.posZ); - } - } - p.swingItem(); - } - return s; - } + world.playSoundAtEntity(shard, "taintedmagic:shard", 0.3F, 1.1F + world.rand.nextFloat() * 0.1F); - @SideOnly (Side.CLIENT) - void spawnParticles (World w, double x, double y, double z) - { - FXSparkle fx = new FXSparkle(w, x + w.rand.nextFloat(), y + w.rand.nextFloat(), z + w.rand.nextFloat(), 1.75F, 0, 3 + w.rand.nextInt(3)); - fx.setGravity(0.1F); - ParticleEngine.instance.addEffect(w, fx); - } + if (world.isRemote) spawnParticles(world, shard.posX, shard.posY, shard.posZ); + } + player.swingItem(); + } + return stack; + } - public AspectList getVisCost (ItemStack s) - { - return isUpgradedWith(s, FocusUpgrades.persistent) ? costPersistent : cost; - } + @SideOnly (Side.CLIENT) + void spawnParticles (World world, double x, double y, double z) + { + for (int a = 0; a < 18; a++) + { + FXSparkle fx = new FXSparkle(world, x + world.rand.nextFloat(), y + world.rand.nextFloat(), + z + world.rand.nextFloat(), 1.75F, 0, 3 + world.rand.nextInt(3)); + fx.setGravity(0.1F); + ParticleEngine.instance.addEffect(world, fx); + } + } - public FocusUpgradeType[] getPossibleUpgradesByRank (ItemStack s, int r) - { - switch (r) - { - case 1 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; - case 2 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; - case 3 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; - case 4 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; - case 5 : - return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency, FocusUpgrades.persistent }; - } - return null; - } + public AspectList getVisCost (ItemStack stack) + { + return isUpgradedWith(stack, TMFocusUpgrades.persistent) ? COST_PERSISTENT : COST; + } + + public FocusUpgradeType[] getPossibleUpgradesByRank (ItemStack stack, int rank) + { + switch (rank) + { + case 1 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; + case 2 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; + case 3 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; + case 4 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency }; + case 5 : + return new FocusUpgradeType[]{ FocusUpgradeType.frugal, FocusUpgradeType.potency, TMFocusUpgrades.persistent }; + } + return null; + } }