diff --git a/src/main/java/com/arc/bloodarsenal/common/items/orb/TransparentOrb.java b/src/main/java/com/arc/bloodarsenal/common/items/orb/TransparentOrb.java index 80e819c..65a6676 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/orb/TransparentOrb.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/orb/TransparentOrb.java @@ -18,7 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class TransparentOrb extends EnergyBattery { - IIcon[] icons = new IIcon[45]; + IIcon[] icons = new IIcon[4]; public TransparentOrb(int damage) { super(damage); @@ -54,12 +54,12 @@ public class TransparentOrb extends EnergyBattery { int maxEssence = SoulNetworkHandler .getMaximumForOrbTier(SoulNetworkHandler.getCurrentMaxOrb(SoulNetworkHandler.getOwnerName(itemStack))); - int section = maxEssence / 44; + int section = maxEssence / (icons.length - 1); int currentEssence = SoulNetworkHandler.getCurrentEssence(SoulNetworkHandler.getOwnerName(itemStack)); int fillLevel = 0; if (currentEssence > 0) { - if (section > 0) fillLevel = Math.min((currentEssence / section), 44); + if (section > 0) fillLevel = Math.min((currentEssence / section), (icons.length - 1)); } // For save conversion - old versions tracked using metadata instead of NBT diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_0.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_0.png index 93e22b1..14a0a31 100644 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_0.png and b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_0.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_1.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_1.png index 51d6b39..e6d5f92 100644 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_1.png and b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_1.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_10.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_10.png deleted file mode 100644 index ab8a9a0..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_10.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_11.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_11.png deleted file mode 100644 index a651037..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_11.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_12.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_12.png deleted file mode 100644 index e69c7f3..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_12.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_13.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_13.png deleted file mode 100644 index 51dea66..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_13.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_14.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_14.png deleted file mode 100644 index 985ab22..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_14.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_15.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_15.png deleted file mode 100644 index bb13168..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_15.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_16.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_16.png deleted file mode 100644 index 3a53231..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_16.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_17.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_17.png deleted file mode 100644 index 8404525..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_17.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_18.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_18.png deleted file mode 100644 index 146c5b2..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_18.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_19.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_19.png deleted file mode 100644 index d1ff6c3..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_19.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_2.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_2.png index f8a722e..8b03bf9 100644 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_2.png and b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_2.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_20.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_20.png deleted file mode 100644 index 63d4455..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_20.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_21.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_21.png deleted file mode 100644 index 61b38c7..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_21.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_22.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_22.png deleted file mode 100644 index 26728d4..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_22.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_23.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_23.png deleted file mode 100644 index 4770793..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_23.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_24.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_24.png deleted file mode 100644 index c734ce4..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_24.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_25.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_25.png deleted file mode 100644 index aefa780..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_25.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_26.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_26.png deleted file mode 100644 index 930b14d..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_26.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_27.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_27.png deleted file mode 100644 index 894a5eb..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_27.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_28.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_28.png deleted file mode 100644 index a57ef6b..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_28.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_29.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_29.png deleted file mode 100644 index 044704d..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_29.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_3.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_3.png index a379aef..04dc774 100644 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_3.png and b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_3.png differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_30.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_30.png deleted file mode 100644 index aaf16d3..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_30.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_31.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_31.png deleted file mode 100644 index 5b15c03..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_31.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_32.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_32.png deleted file mode 100644 index e1e0cf0..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_32.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_33.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_33.png deleted file mode 100644 index 44cf6a5..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_33.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_34.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_34.png deleted file mode 100644 index 0b9e655..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_34.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_35.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_35.png deleted file mode 100644 index 186ba5e..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_35.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_36.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_36.png deleted file mode 100644 index 7b0b14b..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_36.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_37.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_37.png deleted file mode 100644 index 3c555bb..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_37.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_38.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_38.png deleted file mode 100644 index 5689fd5..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_38.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_39.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_39.png deleted file mode 100644 index b50e6ed..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_39.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_4.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_4.png deleted file mode 100644 index 4c551e1..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_4.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_40.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_40.png deleted file mode 100644 index 10c00e4..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_40.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_41.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_41.png deleted file mode 100644 index de91de0..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_41.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_42.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_42.png deleted file mode 100644 index 62cf4b9..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_42.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_43.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_43.png deleted file mode 100644 index e29e27e..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_43.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_44.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_44.png deleted file mode 100644 index cd49d39..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_44.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_5.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_5.png deleted file mode 100644 index 336c315..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_5.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_6.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_6.png deleted file mode 100644 index b7902bb..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_6.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_7.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_7.png deleted file mode 100644 index affedcc..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_7.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_8.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_8.png deleted file mode 100644 index 341d4f7..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_8.png and /dev/null differ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_9.png b/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_9.png deleted file mode 100644 index 31ee87a..0000000 Binary files a/src/main/resources/assets/bloodarsenal/textures/items/orb/orb_9.png and /dev/null differ