diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIUpgradeModifier.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIUpgradeModifier.java index f6ac2ff4..4a56f1c6 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIUpgradeModifier.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIUpgradeModifier.java @@ -1,5 +1,8 @@ package com.brandon3055.draconicevolution.client.gui; +import java.util.ArrayList; +import java.util.List; + import com.brandon3055.brandonscore.client.utills.GuiHelper; import com.brandon3055.draconicevolution.client.handler.ResourceHandler; import com.brandon3055.draconicevolution.common.ModItems; @@ -20,9 +23,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; -import java.util.ArrayList; -import java.util.List; - @SideOnly(Side.CLIENT) public class GUIUpgradeModifier extends GuiContainer { @@ -159,13 +159,12 @@ public class GUIUpgradeModifier extends GuiContainer { int xPos = guiLeft + (xIndex * spacing) + ((spacing - 23) / 2) + 4; int yPos = guiTop + 90; - int[] appliedCores = upgrade.getCoresApplied(tile.getStackInSlot(0)); for (int i = 0; i <= coreTier; i++) { //Check + buttons - if (coreInInventory[i] && coreSlots > usedSlots && GuiHelper.isInRect(xPos, yPos+33 + i*18, 8, 8, x, y) && upgrade.getUpgradePoints(stack) < upgradableItem.getMaxUpgradePoints(upgrade.index)){ + if (coreInInventory[i] && coreSlots > usedSlots && GuiHelper.isInRect(xPos, yPos+33 + i*18, 8, 8, x, y) && upgrade.getUpgradePoints(stack) < upgradableItem.getMaxUpgradePoints(upgrade.index, stack)){ containerEM.sendObjectToServer(null, upgrade.index, i*2); Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(ResourceHandler.getResourceWOP("gui.button.press"), 1.0F)); } @@ -209,7 +208,7 @@ public class GUIUpgradeModifier extends GuiContainer { GL11.glDisable(GL11.GL_BLEND); //Draw + buttons - if (coreSlots > usedSlots && upgrade.getUpgradePoints(stack) < upgradableItem.getMaxUpgradePoints(upgrade.index)){ + if (coreSlots > usedSlots && upgrade.getUpgradePoints(stack) < upgradableItem.getMaxUpgradePoints(upgrade.index, stack)){ boolean hovering = GuiHelper.isInRect(xPos, yPos+33 + i*18, 8, 8, x, y); if (!coreInInventory[i]) drawTexturedModalRect(xPos, yPos+33 + i*18, 24, 208, 8, 8); else drawTexturedModalRect(xPos, yPos+33 + i*18, 32 + (hovering ? 8 : 0), 208, 8, 8); @@ -260,7 +259,7 @@ public class GUIUpgradeModifier extends GuiContainer { if (GuiHelper.isInRect(xPos+3, yPos-9, 18, 8, x, y)){ List list = new ArrayList(); list.add(StatCollector.translateToLocal("gui.de.basePoints.txt")+": "+upgradableItem.getBaseUpgradePoints(upgrade.index)); - list.add(StatCollector.translateToLocal("gui.de.maxPoints.txt")+": "+upgradableItem.getMaxUpgradePoints(upgrade.index)); + list.add(StatCollector.translateToLocal("gui.de.maxPoints.txt")+": "+upgradableItem.getMaxUpgradePoints(upgrade.index, stack)); list.add(StatCollector.translateToLocal("gui.de.pointCost.txt")+": "+upgrade.pointConversion); drawHoveringText(list, x, y, fontRendererObj); } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerUpgradeModifier.java b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerUpgradeModifier.java index eee6824f..bb9e1643 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerUpgradeModifier.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerUpgradeModifier.java @@ -75,7 +75,7 @@ public class ContainerUpgradeModifier extends ContainerDataSync { return tile.isUseableByPlayer(player); } - + @Override public ItemStack transferStackInSlot(EntityPlayer player, int i) { @@ -132,7 +132,7 @@ public class ContainerUpgradeModifier extends ContainerDataSync if (addCoreElseRemove) { - if (!player.inventory.hasItem(CORES_INDEX[coreTier]) || totalCores >= coreSlots || upgrade.getUpgradePoints(stack) >= upgradableItem.getMaxUpgradePoints(upgrade.index)) return; + if (!player.inventory.hasItem(CORES_INDEX[coreTier]) || totalCores >= coreSlots || upgrade.getUpgradePoints(stack) >= upgradableItem.getMaxUpgradePoints(upgrade.index, stack)) return; coresApplied[coreTier]++; player.inventory.consumeInventoryItem(CORES_INDEX[coreTier]); upgrade.setCoresApplied(stack, coresApplied); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/handler/BalanceConfigHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/handler/BalanceConfigHandler.java index be9d2449..ade0422c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/BalanceConfigHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/BalanceConfigHandler.java @@ -130,9 +130,12 @@ public class BalanceConfigHandler public static int draconicStaffMaxCapacityUpgradePoints = 50; public static int draconicStaffMaxUpgrades = 12; public static int draconicStaffMaxUpgradePoints = 50; + public static int wyvernCapacitorMaxUpgradePoints = 50; + public static int wyvernCapacitorMaxCapacityUpgradePoints = 50; public static int wyvernCapacitorMaxUpgrades = 3; + public static int draconicCapacitorMaxUpgradePoints = 50; + public static int draconicCapacitorMaxCapacityUpgradePoints = 50; public static int draconicCapacitorMaxUpgrades = 6; - public static int fluxCapacitorMaxUpgradePoints = 50; public static Block energyStorageStructureBlock = null; public static int energyStorageStructureBlockMetadata = 0; public static boolean grinderShouldUseLooting = false; @@ -319,14 +322,8 @@ public class BalanceConfigHandler wyvernToolsMaxUpgradePoints = getInteger("tweaks.tools", "Wyvern Tools: Maximum amount of upgrade points", wyvernToolsMaxUpgradePoints, wyvernToolsMaxUpgrades, Integer.MAX_VALUE); - wyvernToolsMaxCapacityUpgradePoints = Math.max(Math.min(wyvernToolsMaxUpgradePoints - - (wyvernToolsMaxDigAOEUpgradePoints - - wyvernToolsMinDigAOEUpgradePoints) * - EnumUpgrade.DIG_AOE.pointConversion - - (wyvernToolsMaxDigSpeedUpgradePoints - - wyvernToolsMinDigSpeedUpgradePoints) * - EnumUpgrade.DIG_SPEED.pointConversion, - wyvernToolsMaxCapacityUpgradePoints), 0); + wyvernToolsMaxCapacityUpgradePoints = + Math.max(Math.min(wyvernToolsMaxUpgradePoints, wyvernToolsMaxCapacityUpgradePoints), 0); draconicToolsMaxCapacityUpgradePoints = (int) Math.floor( (double) (Integer.MAX_VALUE - draconicToolsBaseStorage) / (double) Math.max(draconicToolsStoragePerUpgrade, 1)) * EnumUpgrade.RF_CAPACITY.pointConversion; @@ -341,17 +338,8 @@ public class BalanceConfigHandler draconicToolsMaxUpgradePoints = getInteger("tweaks.tools", "Draconic Tools: Maximum amount of upgrade points", draconicToolsMaxUpgradePoints, draconicToolsMaxUpgrades, Integer.MAX_VALUE); - draconicToolsMaxCapacityUpgradePoints = Math.max(Math.min(draconicToolsMaxUpgradePoints - - (draconicToolsMaxDigAOEUpgradePoints - - draconicToolsMinDigAOEUpgradePoints) * - EnumUpgrade.DIG_AOE.pointConversion - - (draconicToolsMaxDigSpeedUpgradePoints - - draconicToolsMinDigSpeedUpgradePoints) * - EnumUpgrade.DIG_SPEED.pointConversion - - (draconicToolsMaxDigDepthUpgradePoints - - draconicToolsMinDigDepthUpgradePoints) * - EnumUpgrade.DIG_DEPTH.pointConversion, - draconicToolsMaxCapacityUpgradePoints), 0); + draconicToolsMaxCapacityUpgradePoints = + Math.max(Math.min(draconicToolsMaxUpgradePoints, draconicToolsMaxCapacityUpgradePoints), 0); wyvernWeaponsMaxCapacityUpgradePoints = (int) Math.floor( (double) (Integer.MAX_VALUE - wyvernWeaponsBaseStorage) / (double) Math.max(wyvernWeaponsStoragePerUpgrade, 1)) * EnumUpgrade.RF_CAPACITY.pointConversion; @@ -364,14 +352,8 @@ public class BalanceConfigHandler wyvernWeaponsMaxUpgradePoints = getInteger("tweaks.weapons", "Wyvern Weapons: Maximum amount of upgrade points", wyvernWeaponsMaxUpgradePoints, wyvernWeaponsMaxUpgrades, Integer.MAX_VALUE); - wyvernWeaponsMaxCapacityUpgradePoints = Math.max(Math.min(wyvernWeaponsMaxUpgradePoints - - (wyvernWeaponsMaxAttackAOEUpgradePoints - - wyvernWeaponsMinAttackAOEUpgradePoints) * - EnumUpgrade.ATTACK_AOE.pointConversion - - (wyvernWeaponsMaxAttackDamageUpgradePoints - - wyvernWeaponsMinAttackDamageUpgradePoints) * - EnumUpgrade.ARROW_DAMAGE.pointConversion, - wyvernWeaponsMaxCapacityUpgradePoints), 0); + wyvernWeaponsMaxCapacityUpgradePoints = + Math.max(Math.min(wyvernWeaponsMaxUpgradePoints, wyvernWeaponsMaxCapacityUpgradePoints), 0); draconicWeaponsMaxCapacityUpgradePoints = (int) Math.floor( (double) (Integer.MAX_VALUE - draconicWeaponsBaseStorage) / (double) Math.max(draconicWeaponsStoragePerUpgrade, 1)) * EnumUpgrade.RF_CAPACITY.pointConversion; @@ -384,14 +366,8 @@ public class BalanceConfigHandler draconicWeaponsMaxUpgradePoints = getInteger("tweaks.weapons", "Draconic Weapons: Maximum amount of upgrade points", draconicWeaponsMaxUpgradePoints, draconicWeaponsMaxUpgrades, Integer.MAX_VALUE); - draconicWeaponsMaxCapacityUpgradePoints = Math.max(Math.min(draconicWeaponsMaxUpgradePoints - - (draconicWeaponsMaxAttackAOEUpgradePoints - - draconicWeaponsMinAttackAOEUpgradePoints) * - EnumUpgrade.ATTACK_AOE.pointConversion - - (draconicWeaponsMaxAttackDamageUpgradePoints - - draconicWeaponsMinAttackDamageUpgradePoints) * - EnumUpgrade.ARROW_DAMAGE.pointConversion, - draconicWeaponsMaxCapacityUpgradePoints), 0); + draconicWeaponsMaxCapacityUpgradePoints = + Math.max(Math.min(draconicWeaponsMaxUpgradePoints, draconicWeaponsMaxCapacityUpgradePoints), 0); wyvernBowMaxCapacityUpgradePoints = (int) Math.floor((double) (Integer.MAX_VALUE - wyvernWeaponsBaseStorage) / (double) Math.max(wyvernWeaponsStoragePerUpgrade, 1)) * EnumUpgrade.RF_CAPACITY.pointConversion; @@ -406,17 +382,8 @@ public class BalanceConfigHandler wyvernBowMaxUpgradePoints = getInteger("tweaks.weapons", "Wyvern Bow: Maximum amount of upgrade points", wyvernBowMaxUpgradePoints, wyvernBowMaxUpgrades, Integer.MAX_VALUE); - wyvernBowMaxCapacityUpgradePoints = Math.max(Math.min(wyvernBowMaxUpgradePoints - - (wyvernBowMaxDrawSpeedUpgradePoints - - wyvernBowMinDrawSpeedUpgradePoints) * - EnumUpgrade.DRAW_SPEED.pointConversion - - (wyvernBowMaxArrowSpeedUpgradePoints - - wyvernBowMinArrowSpeedUpgradePoints) * - EnumUpgrade.ARROW_SPEED.pointConversion - - (wyvernBowMaxArrowDamageUpgradePoints - - wyvernBowMinArrowDamageUpgradePoints) * - EnumUpgrade.ARROW_DAMAGE.pointConversion, - wyvernBowMaxCapacityUpgradePoints), 0); + wyvernBowMaxCapacityUpgradePoints = + Math.max(Math.min(wyvernBowMaxUpgradePoints, wyvernBowMaxCapacityUpgradePoints), 0); draconicBowMaxCapacityUpgradePoints = (int) Math.floor( (double) (Integer.MAX_VALUE - draconicWeaponsBaseStorage) / (double) Math.max(draconicWeaponsStoragePerUpgrade, 1)) * EnumUpgrade.RF_CAPACITY.pointConversion; @@ -431,52 +398,38 @@ public class BalanceConfigHandler draconicBowMaxUpgradePoints = getInteger("tweaks.weapons", "Draconic Bow: Maximum amount of upgrade points", draconicBowMaxUpgradePoints, draconicBowMaxUpgrades, Integer.MAX_VALUE); - draconicBowMaxCapacityUpgradePoints = Math.max(Math.min(draconicBowMaxUpgradePoints - - (draconicBowMaxDrawSpeedUpgradePoints - - draconicBowMinDrawSpeedUpgradePoints) * - EnumUpgrade.DIG_SPEED.pointConversion - - (draconicBowMaxArrowSpeedUpgradePoints - - draconicBowMinArrowSpeedUpgradePoints) * - EnumUpgrade.ARROW_SPEED.pointConversion - - (draconicBowMaxArrowDamageUpgradePoints - - draconicBowMinArrowDamageUpgradePoints) * - EnumUpgrade.ARROW_DAMAGE.pointConversion, - draconicBowMaxCapacityUpgradePoints), 0); + draconicBowMaxCapacityUpgradePoints = + Math.max(Math.min(draconicBowMaxUpgradePoints, draconicBowMaxCapacityUpgradePoints), 0); draconicStaffMaxCapacityUpgradePoints = (int) Math.floor( (double) (Integer.MAX_VALUE - draconicToolsBaseStorage * 2 - draconicWeaponsBaseStorage) / (double) Math.max(draconicToolsStoragePerUpgrade + draconicWeaponsStoragePerUpgrade, 1)) * EnumUpgrade.RF_CAPACITY.pointConversion; draconicStaffMaxUpgrades = draconicToolsMaxUpgrades + draconicWeaponsMaxUpgrades; draconicStaffMaxUpgradePoints = draconicToolsMaxUpgradePoints + draconicWeaponsMaxUpgradePoints; - draconicStaffMaxCapacityUpgradePoints = Math.max(Math.min(draconicStaffMaxUpgradePoints - - (draconicStaffMaxDigAOEUpgradePoints - - draconicStaffMinDigAOEUpgradePoints) * - EnumUpgrade.DIG_AOE.pointConversion - - (draconicStaffMaxDigDepthUpgradePoints - - draconicStaffMinDigDepthUpgradePoints) * - EnumUpgrade.DIG_DEPTH.pointConversion - - (draconicStaffMaxAttackAOEUpgradePoints - - draconicStaffMinAttackAOEUpgradePoints) * - EnumUpgrade.ATTACK_AOE.pointConversion - - (draconicStaffMaxAttackDamageUpgradePoints - - draconicStaffMinAttackDamageUpgradePoints) * - EnumUpgrade.ATTACK_DAMAGE.pointConversion, - draconicStaffMaxCapacityUpgradePoints), 0); - int wyvernCapacitorUpgradesLimit = (int) Math.floor((double) (Integer.MAX_VALUE - wyvernCapacitorBaseStorage) / - (double) Math.max(wyvernCapacitorStoragePerUpgrade, 1) / - 2D); - int draconicCapacitorUpgradesLimit = - (int) Math.floor((double) (Integer.MAX_VALUE - draconicCapacitorBaseStorage) / - (double) Math.max(draconicCapacitorStoragePerUpgrade, 1) / 4D); + draconicStaffMaxCapacityUpgradePoints = + Math.max(Math.min(draconicStaffMaxUpgradePoints, draconicStaffMaxCapacityUpgradePoints), 0); + wyvernCapacitorMaxCapacityUpgradePoints = (int) Math.floor( + (double) (Integer.MAX_VALUE - wyvernCapacitorBaseStorage) / + (double) Math.max(wyvernCapacitorStoragePerUpgrade, 1)) * EnumUpgrade.RF_CAPACITY.pointConversion; wyvernCapacitorMaxUpgrades = getInteger("tweaks.tools", "Wyvern Flux Capacitor: Maximum amount of upgrades", wyvernCapacitorMaxUpgrades, - 0, wyvernCapacitorUpgradesLimit); + 0, wyvernCapacitorMaxCapacityUpgradePoints); + wyvernCapacitorMaxUpgradePoints = + getInteger("tweaks.tools", "Wyvern Flux Capacitor: Maximum amount of upgrade points", + wyvernCapacitorMaxUpgradePoints, wyvernCapacitorMaxUpgrades, Integer.MAX_VALUE); + wyvernCapacitorMaxCapacityUpgradePoints = + Math.max(Math.min(wyvernCapacitorMaxUpgradePoints, wyvernCapacitorMaxCapacityUpgradePoints), 0); + draconicCapacitorMaxCapacityUpgradePoints = (int) Math.floor( + (double) (Integer.MAX_VALUE - draconicCapacitorBaseStorage) / + (double) Math.max(draconicCapacitorStoragePerUpgrade, 1)) * EnumUpgrade.RF_CAPACITY.pointConversion; draconicCapacitorMaxUpgrades = getInteger("tweaks.tools", "Draconic Flux Capacitor: Maximum amount of upgrades", - draconicCapacitorMaxUpgrades, 0, draconicCapacitorUpgradesLimit); - fluxCapacitorMaxUpgradePoints = getInteger("tweaks.tools", "Flux Capacitor: Maximum amount of upgrade points", - fluxCapacitorMaxUpgradePoints, - Math.max(wyvernCapacitorMaxUpgrades, draconicCapacitorMaxUpgrades) * - 4, Integer.MAX_VALUE); + draconicCapacitorMaxUpgrades, 0, + draconicCapacitorMaxCapacityUpgradePoints); + draconicCapacitorMaxUpgradePoints = + getInteger("tweaks.tools", "Draconic Flux Capacitor: Maximum amount of upgrade points", + draconicCapacitorMaxUpgradePoints, draconicCapacitorMaxUpgrades, Integer.MAX_VALUE); + draconicCapacitorMaxCapacityUpgradePoints = + Math.max(Math.min(draconicCapacitorMaxUpgradePoints, draconicCapacitorMaxCapacityUpgradePoints), 0); grinderShouldUseLooting = getBoolean("tweaks.machines", "Mob Grinder: Use Looting enchantment", grinderShouldUseLooting); if (config.hasChanged()) diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java index e126746b..c09ce5ff 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java @@ -455,6 +455,12 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IConfigur return BalanceConfigHandler.draconicArmorMaxUpgradePoints; } + @Override + public int getMaxUpgradePoints(int upgradeIndex, ItemStack stack) + { + return getMaxUpgradePoints(upgradeIndex); + } + @Override public int getBaseUpgradePoints(int upgradeIndex) { if (upgradeIndex == EnumUpgrade.SHIELD_CAPACITY.index) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java index ea14b990..b858de1c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java @@ -365,6 +365,12 @@ public class WyvernArmor extends ItemArmor implements ISpecialArmor, IConfigurab return BalanceConfigHandler.wyvernArmorMaxUpgradePoints; } + @Override + public int getMaxUpgradePoints(int upgradeIndex, ItemStack stack) + { + return getMaxUpgradePoints(upgradeIndex); + } + @Override public int getBaseUpgradePoints(int upgradeIndex) { if (upgradeIndex == EnumUpgrade.SHIELD_CAPACITY.index) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java index 8d5ad58a..ee460c80 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java @@ -307,6 +307,12 @@ public class DraconicHoe extends ItemHoe implements IEnergyContainerItem, IRende return BalanceConfigHandler.draconicToolsMaxUpgradePoints; } + @Override + public int getMaxUpgradePoints(int upgradeIndex, ItemStack stack) + { + return getMaxUpgradePoints(upgradeIndex); + } + @Override public int getBaseUpgradePoints(int upgradeIndex) { if (upgradeIndex == EnumUpgrade.DIG_AOE.index) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconiumFluxCapacitor.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconiumFluxCapacitor.java index 5410788c..7d5de03b 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconiumFluxCapacitor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconiumFluxCapacitor.java @@ -190,7 +190,28 @@ public class DraconiumFluxCapacitor extends RFItemBase implements IUpgradableIte @Override public int getMaxUpgradePoints(int upgradeIndex) { - return BalanceConfigHandler.fluxCapacitorMaxUpgradePoints; + return Math.max(BalanceConfigHandler.wyvernCapacitorMaxUpgradePoints, BalanceConfigHandler.draconicCapacitorMaxUpgradePoints); + } + + @Override + public int getMaxUpgradePoints(int upgradeIndex, ItemStack stack) + { + if (stack == null) + { + return getMaxUpgradePoints(upgradeIndex); + } + if (upgradeIndex == EnumUpgrade.RF_CAPACITY.index) { + return stack.getItemDamage() == 0 ? + BalanceConfigHandler.wyvernCapacitorMaxCapacityUpgradePoints : + stack.getItemDamage() == 1 ? + BalanceConfigHandler.draconicCapacitorMaxCapacityUpgradePoints : + getMaxUpgradePoints(upgradeIndex); + } + return stack.getItemDamage() == 0 ? + BalanceConfigHandler.wyvernCapacitorMaxUpgradePoints : + stack.getItemDamage() == 1 ? + BalanceConfigHandler.draconicCapacitorMaxUpgradePoints : + getMaxUpgradePoints(upgradeIndex); } @Override diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/MiningTool.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/MiningTool.java index b28934c7..ca951076 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/MiningTool.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/MiningTool.java @@ -293,6 +293,12 @@ public abstract class MiningTool extends ToolBase implements IUpgradableItem { }}; } + @Override + public int getMaxUpgradePoints(int upgradeIndex, ItemStack stack) + { + return getMaxUpgradePoints(upgradeIndex); + } + @Override public float getEfficiency(ItemStack stack) { int i = EnumUpgrade.DIG_SPEED.getUpgradePoints(stack); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java index f5ac10f7..858557b1 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java @@ -254,6 +254,12 @@ public class DraconicBow extends ItemBow implements IInventoryTool, IUpgradableI return BalanceConfigHandler.draconicBowMaxUpgradePoints; } + @Override + public int getMaxUpgradePoints(int upgradeIndex, ItemStack stack) + { + return getMaxUpgradePoints(upgradeIndex); + } + @Override public int getBaseUpgradePoints(int upgradeIndex) { if (upgradeIndex == EnumUpgrade.DRAW_SPEED.index) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicSword.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicSword.java index 8a724918..94a8e9cd 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicSword.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicSword.java @@ -264,6 +264,12 @@ public class DraconicSword extends ItemSword implements IEnergyContainerWeaponIt return BalanceConfigHandler.draconicWeaponsMaxUpgradePoints; } + @Override + public int getMaxUpgradePoints(int upgradeIndex, ItemStack stack) + { + return getMaxUpgradePoints(upgradeIndex); + } + @Override public int getBaseUpgradePoints(int upgradeIndex) { if (upgradeIndex == EnumUpgrade.ATTACK_AOE.index) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java index 98293600..c127f821 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java @@ -255,6 +255,12 @@ public class WyvernBow extends ItemBow implements IInventoryTool, IUpgradableIte return BalanceConfigHandler.wyvernBowMaxUpgradePoints; } + @Override + public int getMaxUpgradePoints(int upgradeIndex, ItemStack stack) + { + return getMaxUpgradePoints(upgradeIndex); + } + @Override public int getBaseUpgradePoints(int upgradeIndex) { if (upgradeIndex == EnumUpgrade.DRAW_SPEED.index) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernSword.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernSword.java index 1c903e35..7611b6d3 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernSword.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernSword.java @@ -270,6 +270,12 @@ public class WyvernSword extends ItemSword implements IEnergyContainerWeaponItem return BalanceConfigHandler.wyvernWeaponsMaxUpgradePoints; } + @Override + public int getMaxUpgradePoints(int upgradeIndex, ItemStack stack) + { + return getMaxUpgradePoints(upgradeIndex); + } + @Override public int getBaseUpgradePoints(int upgradeIndex) { if (upgradeIndex == EnumUpgrade.ATTACK_AOE.index) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/utills/IUpgradableItem.java b/src/main/java/com/brandon3055/draconicevolution/common/utills/IUpgradableItem.java index 1e4e242e..ec7a1f22 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/utills/IUpgradableItem.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/utills/IUpgradableItem.java @@ -1,5 +1,7 @@ package com.brandon3055.draconicevolution.common.utills; +import java.util.List; + import cofh.api.energy.IEnergyContainerItem; import com.brandon3055.brandonscore.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.common.lib.References; @@ -7,8 +9,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; -import java.util.List; - /** * Created by brandon3055 on 23/12/2015. */ @@ -29,6 +29,8 @@ public interface IUpgradableItem { public int getMaxUpgradePoints(int upgradeIndex); + public int getMaxUpgradePoints(int upgradeIndex, ItemStack stack); + public int getBaseUpgradePoints(int upgradeIndex); public List getUpgradeStats(ItemStack itemstack); @@ -174,7 +176,7 @@ public interface IUpgradableItem { int totalPoints = applied[0] + (applied[1] * 2) + (applied[2] * 4) + (applied[3] * 8); if (itemStack != null && itemStack.getItem() instanceof IUpgradableItem){ int points = ((IUpgradableItem)itemStack.getItem()).getBaseUpgradePoints(index) + (totalPoints / pointConversion); - return Math.min(points, ((IUpgradableItem)itemStack.getItem()).getMaxUpgradePoints(index)); + return Math.min(points, ((IUpgradableItem)itemStack.getItem()).getMaxUpgradePoints(index, itemStack)); } return 0; }