diff --git a/src/main/java/emt/item/focus/ItemBaseFocus.java b/src/main/java/emt/item/focus/ItemBaseFocus.java index 30dd27b..7bcde5a 100644 --- a/src/main/java/emt/item/focus/ItemBaseFocus.java +++ b/src/main/java/emt/item/focus/ItemBaseFocus.java @@ -34,20 +34,6 @@ public abstract class ItemBaseFocus extends ItemFocusBasic { this.icon = ir.registerIcon(EMT.TEXTURE_PATH + ":" + "focus_" + textureName); } - boolean hasDepth() { - return false; - } - - @Override - public int getFocusColor(ItemStack stack) { - return 0; - } - - @Override - public boolean isItemTool(ItemStack par1ItemStack) { - return true; - } - @Override public EnumRarity getRarity(ItemStack itemstack) { return EnumRarity.rare; @@ -63,18 +49,10 @@ public abstract class ItemBaseFocus extends ItemFocusBasic { return new AspectList(); } - public boolean isUseItem(ItemStack stack) { - return isVisCostPerTick(stack); - } - - public boolean isVisCostPerTick() { - return false; - } - @Override public ItemStack onFocusRightClick(ItemStack paramItemStack, World paramWorld, EntityPlayer paramEntityPlayer, MovingObjectPosition paramMovingObjectPosition) { - if (isUseItem(paramItemStack)) paramEntityPlayer.setItemInUse(paramItemStack, Integer.MAX_VALUE); + if (isVisCostPerTick(paramItemStack)) paramEntityPlayer.setItemInUse(paramItemStack, Integer.MAX_VALUE); return paramItemStack; } @@ -84,19 +62,9 @@ public abstract class ItemBaseFocus extends ItemFocusBasic { @Override public void onPlayerStoppedUsingFocus(ItemStack itemstack, World world, EntityPlayer player, int count) {} - @Override - public String getSortingHelper(ItemStack itemstack) { - return "00"; - } - @Override public boolean onFocusBlockStartBreak(ItemStack itemstack, int x, int y, int z, EntityPlayer player) { return false; } - @Override - public int getItemEnchantability() { - return 5; - } - } diff --git a/src/main/java/emt/item/focus/ItemChargeFocus.java b/src/main/java/emt/item/focus/ItemChargeFocus.java index 2a01cf3..3994a73 100644 --- a/src/main/java/emt/item/focus/ItemChargeFocus.java +++ b/src/main/java/emt/item/focus/ItemChargeFocus.java @@ -1,10 +1,12 @@ package emt.item.focus; +import java.util.List; import java.util.Map.Entry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import emt.util.EMTConfigHandler; @@ -35,32 +37,27 @@ public class ItemChargeFocus extends ItemBaseFocus { for (Entry e : visCost.aspects.entrySet()) actualCost.add( e.getKey(), (int) (e.getValue() * Math.pow(1.1, getUpgradeLevel(stack, FocusUpgradeType.potency)))); - return visCost; + return actualCost; } @Override public String getSortingHelper(ItemStack itemstack) { - return "WANDCHARGING"; + return "WANDCHARGING" + super.getSortingHelper(itemstack); } public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack focusstack, int rank) { return new FocusUpgradeType[] { FocusUpgradeType.potency, FocusUpgradeType.frugal }; } - public boolean canApplyUpgrade(ItemStack focusstack, EntityPlayer player, FocusUpgradeType type, int rank) { - return true; - } - @Override public ItemStack onFocusRightClick(ItemStack itemstack, World world, EntityPlayer player, MovingObjectPosition movingobjectposition) { ItemWandCasting wand = (ItemWandCasting) itemstack.getItem(); if (player.capabilities.isCreativeMode - || wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, true)) { + || wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, false)) { if (!world.isRemote) { - int energyLeft = (int) (EMTConfigHandler.chargeFocusProduction - * Math.pow(1.1, getUpgradeLevel(itemstack, FocusUpgradeType.potency))); + int energyLeft = getChargeRate(itemstack); for (int i = 0; i < player.inventory.armorInventory.length; i++) { if (energyLeft > 0) { if ((player.inventory.armorInventory[i] != null) @@ -89,4 +86,16 @@ public class ItemChargeFocus extends ItemBaseFocus { } return itemstack; } + + private int getChargeRate(ItemStack itemstack) { + return (int) (EMTConfigHandler.chargeFocusProduction + * Math.pow(1.1, getUpgradeLevel(itemstack, FocusUpgradeType.potency))); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + list.add(StatCollector.translateToLocal("item.EMT.focus.EU.cost.info")); + list.add(StatCollector.translateToLocalFormatted("item.EMT.focus.EU.cost.once", getChargeRate(stack))); + super.addInformation(stack, player, list, par4); + } } diff --git a/src/main/java/emt/item/focus/ItemChristmasFocus.java b/src/main/java/emt/item/focus/ItemChristmasFocus.java index 228e624..06b218c 100644 --- a/src/main/java/emt/item/focus/ItemChristmasFocus.java +++ b/src/main/java/emt/item/focus/ItemChristmasFocus.java @@ -8,6 +8,7 @@ import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.wands.FocusUpgradeType; import thaumcraft.common.items.wands.ItemWandCasting; public class ItemChristmasFocus extends ItemBaseFocus { @@ -30,7 +31,12 @@ public class ItemChristmasFocus extends ItemBaseFocus { @Override public String getSortingHelper(ItemStack itemstack) { - return "CHRISTMAS"; + return "CHRISTMAS" + super.getSortingHelper(itemstack); + } + + @Override + public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack focusstack, int rank) { + return new FocusUpgradeType[] { FocusUpgradeType.frugal }; } @Override @@ -42,7 +48,7 @@ public class ItemChristmasFocus extends ItemBaseFocus { int y = mop.blockY + 1; int z = mop.blockZ; if (player.capabilities.isCreativeMode - || wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, true)) { + || wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, false)) { if (!world.isRemote) { EntitySnowman snowman; snowman = new EntitySnowman(world); diff --git a/src/main/java/emt/item/focus/ItemEnergyBallFocus.java b/src/main/java/emt/item/focus/ItemEnergyBallFocus.java index 0287366..bf5b231 100644 --- a/src/main/java/emt/item/focus/ItemEnergyBallFocus.java +++ b/src/main/java/emt/item/focus/ItemEnergyBallFocus.java @@ -1,13 +1,17 @@ package emt.item.focus; +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import emt.entity.EntityEnergyBall; import ic2.api.item.ElectricItem; +import thaumcraft.api.wands.FocusUpgradeType; public class ItemEnergyBallFocus extends ItemBaseFocus { @@ -22,7 +26,12 @@ public class ItemEnergyBallFocus extends ItemBaseFocus { @Override public String getSortingHelper(ItemStack itemstack) { - return "ENERGYBALL"; + return "ENERGYBALL" + super.getSortingHelper(itemstack); + } + + @Override + public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack focusstack, int rank) { + return new FocusUpgradeType[] { FocusUpgradeType.frugal }; } @Override @@ -36,9 +45,10 @@ public class ItemEnergyBallFocus extends ItemBaseFocus { return stack; } - double val = ElectricItem.manager.discharge(armor, 5120, 4, true, false, false); + int cost = getCost(stack); + double val = ElectricItem.manager.discharge(armor, cost, 4, true, false, false); - if (val < 5120) { + if (val < cost) { return stack; } @@ -51,4 +61,18 @@ public class ItemEnergyBallFocus extends ItemBaseFocus { return stack; } + + /** + * Base cost of 5120 with a 10% discount per level of frugal. + */ + private int getCost(ItemStack stack) { + return (int) (5120 * (1.0 - (0.1 * getUpgradeLevel(stack, FocusUpgradeType.frugal)))); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + list.add(StatCollector.translateToLocal("item.EMT.focus.EU.cost.info")); + list.add(StatCollector.translateToLocalFormatted("item.EMT.focus.EU.cost.once", getCost(stack))); + this.addFocusInformation(stack, player, list, par4); + } } diff --git a/src/main/java/emt/item/focus/ItemExplosionFocus.java b/src/main/java/emt/item/focus/ItemExplosionFocus.java index da0a584..bdc443a 100644 --- a/src/main/java/emt/item/focus/ItemExplosionFocus.java +++ b/src/main/java/emt/item/focus/ItemExplosionFocus.java @@ -31,7 +31,7 @@ public class ItemExplosionFocus extends ItemBaseFocus { @Override public String getSortingHelper(ItemStack itemstack) { - return "EXPLOSION"; + return "EXPLOSION" + super.getSortingHelper(itemstack); } @Override @@ -39,7 +39,7 @@ public class ItemExplosionFocus extends ItemBaseFocus { MovingObjectPosition movingobjectposition) { ItemWandCasting wand = (ItemWandCasting) itemstack.getItem(); if (player.capabilities.isCreativeMode - || wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, true)) { + || wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, false)) { if (!world.isRemote) { EntityLaser laser; laser = new EntityLaser(world, player, 1); @@ -54,12 +54,4 @@ public class ItemExplosionFocus extends ItemBaseFocus { return new FocusUpgradeType[] { FocusUpgradeType.potency, FocusUpgradeType.frugal }; } - /** - * Use this method to define custom logic about which upgrades can be applied. This can be used to set up upgrade - * "trees" that make certain upgrades available only when others are unlocked first, when certain research is - * completed, or similar logic. - */ - public boolean canApplyUpgrade(ItemStack focusstack, EntityPlayer player, FocusUpgradeType type, int rank) { - return true; - } } diff --git a/src/main/java/emt/item/focus/ItemMaintenanceFocus.java b/src/main/java/emt/item/focus/ItemMaintenanceFocus.java index 8316263..6c0c7ad 100644 --- a/src/main/java/emt/item/focus/ItemMaintenanceFocus.java +++ b/src/main/java/emt/item/focus/ItemMaintenanceFocus.java @@ -35,7 +35,7 @@ public class ItemMaintenanceFocus extends ItemBaseFocus { @Override public String getSortingHelper(ItemStack itemstack) { - return "MAINTENANCE"; + return "MAINTENANCE" + super.getSortingHelper(itemstack); } @Override @@ -60,7 +60,7 @@ public class ItemMaintenanceFocus extends ItemBaseFocus { if (hatchCandidateMetaTile instanceof MTEHatchMaintenance) { MTEHatchMaintenance hatch = (MTEHatchMaintenance) hatchCandidateMetaTile; if (player.capabilities.isCreativeMode - || wand.consumeAllVis(itemStack, player, getVisCost(itemStack), true, true)) { + || wand.consumeAllVis(itemStack, player, getVisCost(itemStack), true, false)) { hatch.mCrowbar = true; hatch.mScrewdriver = true; hatch.mHardHammer = true; diff --git a/src/main/java/emt/item/focus/ItemShieldFocus.java b/src/main/java/emt/item/focus/ItemShieldFocus.java index e648ede..ae74542 100644 --- a/src/main/java/emt/item/focus/ItemShieldFocus.java +++ b/src/main/java/emt/item/focus/ItemShieldFocus.java @@ -1,7 +1,5 @@ package emt.item.focus; -import java.util.LinkedList; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; @@ -12,6 +10,7 @@ import emt.entity.EntityShield; import ic2.core.IC2; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.wands.FocusUpgradeType; import thaumcraft.common.items.wands.ItemWandCasting; public class ItemShieldFocus extends ItemBaseFocus { @@ -35,22 +34,27 @@ public class ItemShieldFocus extends ItemBaseFocus { @Override public String getSortingHelper(ItemStack itemstack) { - return "SHIELD"; + return "SHIELD" + super.getSortingHelper(itemstack); } @Override - public boolean isUseItem(ItemStack stack) { + public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack focusstack, int rank) { + return new FocusUpgradeType[] { FocusUpgradeType.frugal }; + } + + @Override + public boolean isVisCostPerTick(ItemStack stack) { return true; } @Override public void onUsingFocusTick(ItemStack itemstack, EntityPlayer player, int count) { ItemWandCasting wand = (ItemWandCasting) itemstack.getItem(); - for (PotionEffect effect : new LinkedList(player.getActivePotionEffects())) { + for (PotionEffect effect : player.getActivePotionEffects()) { IC2.platform.removePotion(player, effect.getPotionID()); } if (!player.capabilities.isCreativeMode - && !wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, true)) { + && !wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, false)) { player.stopUsingItem(); } } @@ -61,7 +65,7 @@ public class ItemShieldFocus extends ItemBaseFocus { ItemWandCasting wand = (ItemWandCasting) itemstack.getItem(); player.setItemInUse(itemstack, Integer.MAX_VALUE); if (!world.isRemote && (player.capabilities.isCreativeMode - || wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, true))) { + || wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, false))) { EntityShield shield = new EntityShield(world, player); world.spawnEntityInWorld(shield); } diff --git a/src/main/java/emt/item/focus/ItemWandChargingFocus.java b/src/main/java/emt/item/focus/ItemWandChargingFocus.java index c290d92..873e332 100644 --- a/src/main/java/emt/item/focus/ItemWandChargingFocus.java +++ b/src/main/java/emt/item/focus/ItemWandChargingFocus.java @@ -1,9 +1,11 @@ package emt.item.focus; +import java.util.List; import java.util.Map.Entry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; @@ -28,7 +30,7 @@ public class ItemWandChargingFocus extends ItemBaseFocus { @Override public String getSortingHelper(ItemStack itemstack) { - return "ELECTRICCHARGING"; + return "ELECTRICCHARGING" + super.getSortingHelper(itemstack); } @Override @@ -42,38 +44,63 @@ public class ItemWandChargingFocus extends ItemBaseFocus { for (Entry e : visCost.aspects.entrySet()) actualCost.add( e.getKey(), (int) (e.getValue() * Math.pow(1.1, getUpgradeLevel(stack, FocusUpgradeType.potency)))); - return visCost; + return actualCost; } public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack focusstack, int rank) { return new FocusUpgradeType[] { FocusUpgradeType.potency, FocusUpgradeType.frugal }; } - public boolean canApplyUpgrade(ItemStack focusstack, EntityPlayer player, FocusUpgradeType type, int rank) { - return true; - } - @Override public void onUsingFocusTick(ItemStack itemstack, EntityPlayer player, int integer) { if (!player.worldObj.isRemote) { ItemWandCasting wandItem = (ItemWandCasting) itemstack.getItem(); + if (wandIsFull(itemstack, wandItem)) { + return; + } - ItemStack armor = player.inventory.armorInventory[1]; - if (armor != null) { - if ((ElectricItem.manager.use(armor, EMTConfigHandler.wandChargeFocusCost / 4, player) - && (ElectricItem.manager.use(armor, EMTConfigHandler.wandChargeFocusCost / 4, player)) - && (ElectricItem.manager.use(armor, EMTConfigHandler.wandChargeFocusCost / 4, player)) - && (ElectricItem.manager.use(armor, EMTConfigHandler.wandChargeFocusCost / 4, player)))) { - int amount = (int) (100 * Math.pow(1.1, getUpgradeLevel(itemstack, FocusUpgradeType.potency))); - wandItem.addRealVis(itemstack, Aspect.ORDER, amount, true); - wandItem.addRealVis(itemstack, Aspect.FIRE, amount, true); - wandItem.addRealVis(itemstack, Aspect.ENTROPY, amount, true); - wandItem.addRealVis(itemstack, Aspect.WATER, amount, true); - wandItem.addRealVis(itemstack, Aspect.EARTH, amount, true); - wandItem.addRealVis(itemstack, Aspect.AIR, amount, true); + int cost = getCost(itemstack) / 4; + for (ItemStack stack : player.inventory.armorInventory) { + if (stack == null || ElectricItem.manager.getCharge(stack) < cost) { + return; } } + for (ItemStack stack : player.inventory.armorInventory) { + ElectricItem.manager.use(stack, cost, player); + } + int amount = (int) (100 * Math.pow(1.1, getUpgradeLevel(itemstack, FocusUpgradeType.potency))); + wandItem.addRealVis(itemstack, Aspect.ORDER, amount, true); + wandItem.addRealVis(itemstack, Aspect.FIRE, amount, true); + wandItem.addRealVis(itemstack, Aspect.ENTROPY, amount, true); + wandItem.addRealVis(itemstack, Aspect.WATER, amount, true); + wandItem.addRealVis(itemstack, Aspect.EARTH, amount, true); + wandItem.addRealVis(itemstack, Aspect.AIR, amount, true); } } + + private boolean wandIsFull(ItemStack itemstack, ItemWandCasting wandItem) { + int size = wandItem.getMaxVis(itemstack); + for (Aspect a : Aspect.getPrimalAspects()) { + if (wandItem.getVis(itemstack, a) < size) { + return false; + } + } + return true; + } + + /** + * Base cost from config with a 10% discount per level of frugal. + */ + private int getCost(ItemStack stack) { + return (int) (EMTConfigHandler.wandChargeFocusCost + * (1.0 - (0.1 * getUpgradeLevel(stack, FocusUpgradeType.frugal)))); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + list.add(StatCollector.translateToLocal("item.EMT.focus.EU.cost.info")); + list.add(StatCollector.translateToLocalFormatted("item.EMT.focus.EU.cost.tick", getCost(stack))); + super.addInformation(stack, player, list, par4); + } } diff --git a/src/main/resources/assets/emt/lang/de_DE.lang b/src/main/resources/assets/emt/lang/de_DE.lang index 117f8e0..59c553e 100644 --- a/src/main/resources/assets/emt/lang/de_DE.lang +++ b/src/main/resources/assets/emt/lang/de_DE.lang @@ -13,9 +13,9 @@ gui.EMT.book.aspect.output.eu.title=Essentia Ausgabe Buch gui.EMT.book.aspect.output.essentia.eu=EU Leistung per Essentia gui.EMT.key.unequip=Ausziehen emt.Output=Ausgabe: -emt.Storage=Speicher: +emt.Storage=Speicher: emt.PressShift= -emt.Generating=Erzeugt: +emt.Generating=Erzeugt: emt.Fuel=Brennstoff #=============Tooltips============= @@ -100,6 +100,9 @@ item.EMT.focus.charge.name=Stab Fokus: Aufladung item.EMT.focus.chargeWand.name=Stab Fokus: Stabs Aufladung item.EMT.focus.electricCloud.name=Electrische Wolke item.EMT.focus.energyBall.name=Energie Ball Fokus +item.EMT.focus.EU.cost.info=EU pro Zauber +item.EMT.focus.EU.cost.once= §r%s §eEU§0 +item.EMT.focus.EU.cost.tick= §r%s §eEU/t§0 #=============Block Names============= tile.EMT.electricCloud.name=Electrische Wolke diff --git a/src/main/resources/assets/emt/lang/en_US.lang b/src/main/resources/assets/emt/lang/en_US.lang index b53b773..1e45d45 100644 --- a/src/main/resources/assets/emt/lang/en_US.lang +++ b/src/main/resources/assets/emt/lang/en_US.lang @@ -109,6 +109,9 @@ item.EMT.focus.chargeWand.name=Wand Focus: Wand Charging item.EMT.focus.maintenance.name=Wand Focus: Maintenance item.EMT.focus.electricCloud.name=Electric Cloud item.EMT.focus.energyBall.name=Energy Ball Focus +item.EMT.focus.EU.cost.info=EU per cast +item.EMT.focus.EU.cost.once= §r%s §eEU§0 +item.EMT.focus.EU.cost.tick= §r%s §eEU/t§0 #=============Block Names============= tile.EMT.electricCloud.name=Electric Cloud diff --git a/src/main/resources/assets/emt/lang/ru_RU.lang b/src/main/resources/assets/emt/lang/ru_RU.lang index 35ff603..5003101 100644 --- a/src/main/resources/assets/emt/lang/ru_RU.lang +++ b/src/main/resources/assets/emt/lang/ru_RU.lang @@ -102,6 +102,9 @@ item.EMT.focus.chargeWand.name=Набалдашник: Зарядка жезла item.EMT.focus.maintenance.name=Набалдашник: Обслуживание item.EMT.focus.electricCloud.name=Электризованное облако item.EMT.focus.energyBall.name=Набалдашник: Наэлектризованное облако +item.EMT.focus.EU.cost.info=EU за использование +item.EMT.focus.EU.cost.once= §r%s §eEU§0 +item.EMT.focus.EU.cost.tick= §r%s §eEU/тик§0 #=============Block Names============= tile.EMT.electricCloud.name=Наэлектризованное облако diff --git a/src/main/resources/assets/emt/lang/zh_CN.lang b/src/main/resources/assets/emt/lang/zh_CN.lang index 91741af..367b5ae 100644 --- a/src/main/resources/assets/emt/lang/zh_CN.lang +++ b/src/main/resources/assets/emt/lang/zh_CN.lang @@ -102,6 +102,9 @@ item.EMT.focus.charge.name=法杖核心:充电 item.EMT.focus.chargeWand.name=法杖核心:化魔 item.EMT.focus.electricCloud.name=雷云之光 item.EMT.focus.energyBall.name=法杖核心:能量球 +item.EMT.focus.EU.cost.info=EU/每次施法 +item.EMT.focus.EU.cost.once= §r%s §eEU§0 +item.EMT.focus.EU.cost.tick= §r%s §eEU/t§0 #=============Block Names============= tile.EMT.electricCloud.name=雷云之光