diff --git a/build.properties b/build.properties index e639e87..4966406 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ # -#Sat Sep 27 14:31:53 PDT 2014 +#Wed Feb 24 14:31:53 PDT 2015 package_group=com.tombenpotter.emt mc_version=1.7.10 forge_version=10.13.2.1307 -mod_version=2.0.0Alpha +mod_version=2.0.0Alpha2 mod_name=ElectroMagicTools diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemBaseFocus.java b/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemBaseFocus.java index 6192f41..5a793b0 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemBaseFocus.java +++ b/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemBaseFocus.java @@ -1,5 +1,6 @@ package tombenpotter.emt.common.modules.base.items.foci; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; @@ -11,36 +12,46 @@ import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.IWandFocus; +import thaumcraft.api.wands.ItemFocusBasic; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; import java.util.List; -public abstract class ItemBaseFocus extends Item implements IWandFocus { +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public abstract class ItemBaseFocus extends ItemFocusBasic { private IIcon ornament, depth; + String t = null; public ItemBaseFocus(String unlocName, String textureName) { super(); setUnlocalizedName(ModInformation.modid + ".module." + unlocName); - setTextureName(ModInformation.texturePath + ":" + textureName); setCreativeTab(ElectroMagicTools.tabEMT); setMaxDamage(1); setNoRepair(); setMaxStackSize(1); + t = textureName; } boolean hasOrnament() { return false; } + + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister ir) { + this.icon = ir.registerIcon(ModInformation.texturePath + ":" + t); + } boolean hasDepth() { return false; } @Override - public int getFocusColor() { + public int getFocusColor(ItemStack stack) { return 0; } @@ -54,38 +65,33 @@ public abstract class ItemBaseFocus extends Item implements IWandFocus { return EnumRarity.rare; } - @Override public IIcon getFocusDepthLayerIcon() { return depth; } - @Override - public IIcon getOrnament() { + public IIcon getOrnament(ItemStack focusstack) { return ornament; } - @Override public WandFocusAnimation getAnimation() { return WandFocusAnimation.WAVE; } - @Override public AspectList getVisCost() { return null; } - public boolean isUseItem() { - return isVisCostPerTick(); - } + public boolean isUseItem(ItemStack stack) { + return isVisCostPerTick(stack); + } - @Override public boolean isVisCostPerTick() { return false; } @Override public ItemStack onFocusRightClick(ItemStack paramItemStack, World paramWorld, EntityPlayer paramEntityPlayer, MovingObjectPosition paramMovingObjectPosition) { - if (isUseItem()) + if (isUseItem(paramItemStack)) paramEntityPlayer.setItemInUse(paramItemStack, Integer.MAX_VALUE); return paramItemStack; } @@ -109,7 +115,6 @@ public abstract class ItemBaseFocus extends Item implements IWandFocus { return false; } - @Override public boolean acceptsEnchant(int id) { return false; } diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemChristmasFocus.java b/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemChristmasFocus.java index 772fa08..4a55290 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemChristmasFocus.java +++ b/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemChristmasFocus.java @@ -12,30 +12,38 @@ package tombenpotter.emt.common.modules.base.items.foci; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.monster.EntitySnowman; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.wands.ItemFocusBasic; import thaumcraft.common.items.wands.ItemWandCasting; +import tombenpotter.emt.ElectroMagicTools; +import tombenpotter.emt.ModInformation; public class ItemChristmasFocus extends ItemBaseFocus { private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 500).add(Aspect.AIR, 500); public ItemChristmasFocus() { - super("base.focus.christmas", "focus_christmas"); + super("base.focus.christmas.name", "focus_christmas" ); + setCreativeTab(ElectroMagicTools.tabEMT); } @Override - public int getFocusColor() { - return 99999999; + public int getFocusColor(ItemStack stack) { + return 0x00FFFF; } @Override - public AspectList getVisCost() { + public AspectList getVisCost(ItemStack stack) { return visCost; } @@ -51,7 +59,7 @@ public class ItemChristmasFocus extends ItemBaseFocus { int x = mop.blockX; int y = mop.blockY + 1; int z = mop.blockZ; - if (wand.consumeAllVis(itemstack, player, getVisCost(), true, true)) { + if (wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, true)) { if (!world.isRemote) { EntitySnowman snowman; snowman = new EntitySnowman(world); diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemExplosionFocus.java b/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemExplosionFocus.java index 8578cab..b68f5c4 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemExplosionFocus.java +++ b/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemExplosionFocus.java @@ -14,6 +14,7 @@ package tombenpotter.emt.common.modules.base.items.foci; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; @@ -22,7 +23,7 @@ import thaumcraft.common.items.wands.ItemWandCasting; import tombenpotter.emt.common.modules.base.entities.EntityLaser; public class ItemExplosionFocus extends ItemBaseFocus { - + private static final AspectList visCost = new AspectList().add(Aspect.FIRE, 200).add(Aspect.ENTROPY, 200); public ItemExplosionFocus() { @@ -30,12 +31,12 @@ public class ItemExplosionFocus extends ItemBaseFocus { } @Override - public int getFocusColor() { - return 9990; + public int getFocusColor(ItemStack stack) { + return 0x8B0000; } @Override - public AspectList getVisCost() { + public AspectList getVisCost(ItemStack focusstack) { return visCost; } @@ -47,7 +48,7 @@ public class ItemExplosionFocus extends ItemBaseFocus { @Override public ItemStack onFocusRightClick(ItemStack itemstack, World world, EntityPlayer player, MovingObjectPosition movingobjectposition) { ItemWandCasting wand = (ItemWandCasting) itemstack.getItem(); - if (wand.consumeAllVis(itemstack, player, getVisCost(), true, true)) { + if (wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, true)) { if (!world.isRemote) { EntityLaser laser; laser = new EntityLaser(world, player, 2); diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemShieldFocus.java b/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemShieldFocus.java index a359fae..5deec24 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemShieldFocus.java +++ b/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemShieldFocus.java @@ -15,14 +15,18 @@ package tombenpotter.emt.common.modules.base.items.foci; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; +import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; public class ItemShieldFocus extends ItemBaseFocus { + private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10); @@ -31,17 +35,12 @@ public class ItemShieldFocus extends ItemBaseFocus { } @Override - public int getFocusColor() { - return 555555555; + public int getFocusColor(ItemStack stack) { + return 0x1E90FF; } @Override - public boolean isUseItem() { - return true; - } - - @Override - public AspectList getVisCost() { + public AspectList getVisCost(ItemStack stack) { return visCost; } @@ -49,18 +48,26 @@ public class ItemShieldFocus extends ItemBaseFocus { public String getSortingHelper(ItemStack itemstack) { return "SHIELD"; } + + @Override + public boolean isUseItem(ItemStack stack) { + return true; + } @Override - public void onUsingFocusTick(ItemStack itemstack, EntityPlayer player, int time) { + public void onUsingFocusTick(ItemStack itemstack, EntityPlayer player, int count) { player.motionX = 0.0D; player.motionY = 0.0D; player.motionZ = 0.0D; ItemWandCasting wand = (ItemWandCasting) itemstack.getItem(); - if (wand.consumeAllVis(itemstack, player, getVisCost(), true, true)) { + if (wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, true)) { int x = MathHelper.floor_double(player.posX); int y = MathHelper.floor_double(player.posY); int z = MathHelper.floor_double(player.posZ); + + ItemStack milk = (new ItemStack(Items.milk_bucket)); + player.curePotionEffects(milk); // Player Level if (player.worldObj.isAirBlock(x + 1, y, z) && player.worldObj.isAirBlock(x - 1, y, z) && player.worldObj.isAirBlock(x, y, z + 1) && player.worldObj.isAirBlock(x, y, z - 1)) { @@ -101,8 +108,5 @@ public class ItemShieldFocus extends ItemBaseFocus { player.worldObj.setBlockToAir(x, y + 1, z + 1); player.worldObj.setBlockToAir(x, y + 1, z - 1); } - - ItemStack milk = (new ItemStack(Items.milk_bucket)); - player.curePotionEffects(milk); } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemChargeFocus.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemChargeFocus.java index 62c763a..c086c42 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemChargeFocus.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemChargeFocus.java @@ -33,12 +33,12 @@ public class ItemChargeFocus extends ItemBaseFocus { } @Override - public int getFocusColor() { + public int getFocusColor(ItemStack stack) { return 0xFFFF00; } @Override - public AspectList getVisCost() { + public AspectList getVisCost(ItemStack stack) { return visCost; } @@ -50,7 +50,7 @@ public class ItemChargeFocus extends ItemBaseFocus { @Override public ItemStack onFocusRightClick(ItemStack itemstack, World world, EntityPlayer player, MovingObjectPosition movingobjectposition) { ItemWandCasting wand = (ItemWandCasting) itemstack.getItem(); - if (wand.consumeAllVis(itemstack, player, getVisCost(), true, true)) { + if (wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, true)) { if (!world.isRemote) { int energyLeft = ConfigHandler.chargeFocusProduction; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemWandChargingFocus.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemWandChargingFocus.java index 8f3883e..13585a9 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemWandChargingFocus.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemWandChargingFocus.java @@ -18,7 +18,7 @@ public class ItemWandChargingFocus extends ItemBaseFocus { } @Override - public int getFocusColor() { + public int getFocusColor(ItemStack stack) { return 0xFFFF450; } @@ -28,12 +28,12 @@ public class ItemWandChargingFocus extends ItemBaseFocus { } @Override - public boolean isVisCostPerTick() { + public boolean isVisCostPerTick(ItemStack focusstack) { return true; } @Override - public AspectList getVisCost() { + public AspectList getVisCost(ItemStack focusstack) { return visCost; }