diff --git a/src/main/java/com/brandon3055/draconicevolution/client/handler/HudHandler.java b/src/main/java/com/brandon3055/draconicevolution/client/handler/HudHandler.java index 95b522c5..99a0d898 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/handler/HudHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/handler/HudHandler.java @@ -1,5 +1,8 @@ package com.brandon3055.draconicevolution.client.handler; +import java.util.ArrayList; +import java.util.List; + import com.brandon3055.brandonscore.client.utills.GuiHelper; import com.brandon3055.brandonscore.common.utills.Utills; import com.brandon3055.draconicevolution.client.gui.GuiHudConfig; @@ -20,9 +23,6 @@ import net.minecraft.util.StatCollector; import net.minecraftforge.client.event.RenderGameOverlayEvent; import org.lwjgl.opengl.GL11; -import java.util.ArrayList; -import java.util.List; - /** * Created by Brandon on 26/01/2015. */ @@ -38,7 +38,7 @@ public class HudHandler { private static float maxShieldPoints = 0F; private static float shieldEntropy = 0F; private static int rfCharge = 0; - private static int rfTotal = 0; + private static long rfTotal = 0; int width; int height; @@ -223,4 +223,4 @@ public class HudHandler { // // ResourceHandler.bindTexture(ResourceHandler.getResourceWOP("minecraft:textures/gui/icons.png")); // GL11.glDisable(GL11.GL_ALPHA_TEST); -// GL11.glPopMatrix(); \ No newline at end of file +// GL11.glPopMatrix(); 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 ade0422c..0b1447cf 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/BalanceConfigHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/BalanceConfigHandler.java @@ -390,7 +390,7 @@ public class BalanceConfigHandler draconicBowMaxUpgrades = getInteger("tweaks.weapons", "Draconic Bow: Maximum amount of upgrades", draconicBowMaxUpgrades, 0, (draconicBowMaxDrawSpeedUpgradePoints - draconicBowMinDrawSpeedUpgradePoints) * - EnumUpgrade.DIG_SPEED.pointConversion + + EnumUpgrade.DRAW_SPEED.pointConversion + (draconicBowMaxArrowSpeedUpgradePoints - draconicBowMinArrowSpeedUpgradePoints) * EnumUpgrade.ARROW_SPEED.pointConversion + (draconicBowMaxArrowDamageUpgradePoints - draconicBowMinArrowDamageUpgradePoints) * diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/CustomArmorHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/CustomArmorHandler.java index 2eb4b1ea..0da3530f 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/CustomArmorHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/CustomArmorHandler.java @@ -198,7 +198,7 @@ public class CustomArmorHandler { if (stack == null || summery.totalEnergyStored <= 0) continue; float maxForPeace = ((ICustomArmor)stack.getItem()).getProtectionPoints(stack); int energyAmount = ((ICustomArmor)summery.armorStacks[i].getItem()).getEnergyPerProtectionPoint(); - ((IEnergyContainerItem)stack.getItem()).extractEnergy(stack, (int)((summery.energyAllocation[i] / (double)summery.totalEnergyStored) * (totalPointsToAdd * energyAmount)), false); + ((IEnergyContainerItem)stack.getItem()).extractEnergy(stack, (int)(((double)summery.energyAllocation[i] / (double)summery.totalEnergyStored) * (totalPointsToAdd * energyAmount)), false); float pointsForPeace = (summery.pointsDown[i] / Math.max(1, summery.maxProtectionPoints - summery.protectionPoints)) * totalPointsToAdd; summery.allocation[i] += pointsForPeace; if (summery.allocation[i] > maxForPeace || maxForPeace - summery.allocation[i] < 0.1F) summery.allocation[i] = maxForPeace; @@ -354,9 +354,9 @@ public class CustomArmorHandler { /**Mean Recovery Points*/ public int meanRecoveryPoints = 0; /**Total RF stored in the armor*/ - public int totalEnergyStored = 0; + public long totalEnergyStored = 0; /**Total Max RF storage for the armor*/ - public int maxTotalEnergyStorage = 0; + public long maxTotalEnergyStorage = 0; /**RF stored in each armor peace*/ public int[] energyAllocation; /*---- Effects ----*/