aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java')
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java878
1 files changed, 180 insertions, 698 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java
index 4dbe7f94..deef7bdc 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java
@@ -37,6 +37,7 @@ import io.github.moulberry.notenoughupdates.util.ItemUtils;
import io.github.moulberry.notenoughupdates.util.Utils;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.Gui;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.gui.inventory.GuiContainer;
@@ -539,7 +540,8 @@ public class GuiCustomHex extends Gui {
if (enchanterCurrentEnch == null) {
enchanterCurrentEnch = enchantment;
} else if (updateLevel) {
- if (removingEnchantPlayerLevel < 0 && enchantment.level > enchanterCurrentEnch.level && !aboveMaxLevelFromEt) {
+ if (removingEnchantPlayerLevel < 0 && enchantment.level > enchanterCurrentEnch.level &&
+ !aboveMaxLevelFromEt) {
enchanterCurrentEnch = enchantment;
} else if (removingEnchantPlayerLevel >= 0 && enchantment.level < enchanterCurrentEnch.level) {
enchanterCurrentEnch = enchantment;
@@ -1286,14 +1288,15 @@ public class GuiCustomHex extends Gui {
renderBaseTexture();
- Minecraft.getMinecraft().fontRendererObj.drawString("Applicable", guiLeft + 7, guiTop + 7, 0x404040, false);
- Minecraft.getMinecraft().fontRendererObj.drawString("Removable", guiLeft + 247, guiTop + 7, 0x404040, false);
+ FontRenderer fr = Minecraft.getMinecraft().fontRendererObj;
+ fr.drawString("Applicable", guiLeft + 7, guiTop + 7, 0x404040, false);
+ fr.drawString("Removable", guiLeft + 247, guiTop + 7, 0x404040, false);
//Page Text
if (currentState == EnchantState.HAS_ITEM || currentState == EnchantState.ADDING_ENCHANT) {
String pageStr = "Page: " + currentPage + "/" + expectedMaxPage;
- int pageStrLen = Minecraft.getMinecraft().fontRendererObj.getStringWidth(pageStr);
- Utils.drawStringCentered(pageStr, Minecraft.getMinecraft().fontRendererObj,
+ int pageStrLen = fr.getStringWidth(pageStr);
+ Utils.drawStringCentered(pageStr,
guiLeft + X_SIZE / 2, guiTop + 14, false, 0x404040
);
@@ -1318,10 +1321,10 @@ public class GuiCustomHex extends Gui {
//Can't be enchanted text
if (currentState == EnchantState.INVALID_ITEM) {
GlStateManager.disableDepth();
- Utils.drawStringCentered("This item can't", Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered("This item can't",
guiLeft + X_SIZE / 2, guiTop + 88, true, 0xffff5555
);
- Utils.drawStringCentered("be enchanted", Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered("be enchanted",
guiLeft + X_SIZE / 2, guiTop + 98, true, 0xffff5555
);
GlStateManager.enableDepth();
@@ -1332,52 +1335,24 @@ public class GuiCustomHex extends Gui {
//Text if no enchants appear
if (currentState == EnchantState.HAS_ITEM || currentState == EnchantState.ADDING_ENCHANT) {
if (applicable.isEmpty() && removable.isEmpty() && searchRemovedFromApplicable) {
- Utils.drawStringCentered("Can't find that", Minecraft.getMinecraft().fontRendererObj,
- guiLeft + 8 + 48, guiTop + 28, true, 0xffff5555
- );
- Utils.drawStringCentered("enchant, perhaps", Minecraft.getMinecraft().fontRendererObj,
- guiLeft + 8 + 48, guiTop + 38, true, 0xffff5555
- );
- Utils.drawStringCentered("it is on", Minecraft.getMinecraft().fontRendererObj,
- guiLeft + 8 + 48, guiTop + 48, true, 0xffff5555
- );
- Utils.drawStringCentered("another page?", Minecraft.getMinecraft().fontRendererObj,
- guiLeft + 8 + 48, guiTop + 58, true, 0xffff5555
- );
+ Utils.drawStringCentered("Can't find that", guiLeft + 8 + 48, guiTop + 28, true, 0xffff5555);
+ Utils.drawStringCentered("enchant, perhaps", guiLeft + 8 + 48, guiTop + 38, true, 0xffff5555);
+ Utils.drawStringCentered("it is on", guiLeft + 8 + 48, guiTop + 48, true, 0xffff5555);
+ Utils.drawStringCentered("another page?", guiLeft + 8 + 48, guiTop + 58, true, 0xffff5555);
} else if (applicable.isEmpty() && !searchRemovedFromApplicable) {
- Utils.drawStringCentered("No applicable", Minecraft.getMinecraft().fontRendererObj,
- guiLeft + 8 + 48, guiTop + 28, true, 0xffff5555
- );
- Utils.drawStringCentered("enchants on", Minecraft.getMinecraft().fontRendererObj,
- guiLeft + 8 + 48, guiTop + 38, true, 0xffff5555
- );
- Utils.drawStringCentered("this page...", Minecraft.getMinecraft().fontRendererObj,
- guiLeft + 8 + 48, guiTop + 48, true, 0xffff5555
- );
+ Utils.drawStringCentered("No applicable", guiLeft + 8 + 48, guiTop + 28, true, 0xffff5555);
+ Utils.drawStringCentered("enchants on", guiLeft + 8 + 48, guiTop + 38, true, 0xffff5555);
+ Utils.drawStringCentered("this page...", guiLeft + 8 + 48, guiTop + 48, true, 0xffff5555);
}
if (applicable.isEmpty() && removable.isEmpty() && searchRemovedFromRemovable) {
- Utils.drawStringCentered("Can't find that", Minecraft.getMinecraft().fontRendererObj,
- guiLeft + 248 + 48, guiTop + 28, true, 0xffff5555
- );
- Utils.drawStringCentered("enchant, perhaps", Minecraft.getMinecraft().fontRendererObj,
- guiLeft + 248 + 48, guiTop + 38, true, 0xffff5555
- );
- Utils.drawStringCentered("it is on", Minecraft.getMinecraft().fontRendererObj,
- guiLeft + 248 + 48, guiTop + 48, true, 0xffff5555
- );
- Utils.drawStringCentered("another page?", Minecraft.getMinecraft().fontRendererObj,
- guiLeft + 248 + 48, guiTop + 58, true, 0xffff5555
- );
+ Utils.drawStringCentered("Can't find that", guiLeft + 248 + 48, guiTop + 28, true, 0xffff5555);
+ Utils.drawStringCentered("enchant, perhaps", guiLeft + 248 + 48, guiTop + 38, true, 0xffff5555);
+ Utils.drawStringCentered("it is on", guiLeft + 248 + 48, guiTop + 48, true, 0xffff5555);
+ Utils.drawStringCentered("another page?", guiLeft + 248 + 48, guiTop + 58, true, 0xffff5555);
} else if (removable.isEmpty() && !searchRemovedFromRemovable) {
- Utils.drawStringCentered("No removable", Minecraft.getMinecraft().fontRendererObj,
- guiLeft + 248 + 48, guiTop + 28, true, 0xffff5555
- );
- Utils.drawStringCentered("enchants on", Minecraft.getMinecraft().fontRendererObj,
- guiLeft + 248 + 48, guiTop + 38, true, 0xffff5555
- );
- Utils.drawStringCentered("this page...", Minecraft.getMinecraft().fontRendererObj,
- guiLeft + 248 + 48, guiTop + 48, true, 0xffff5555
- );
+ Utils.drawStringCentered("No removable", guiLeft + 248 + 48, guiTop + 28, true, 0xffff5555);
+ Utils.drawStringCentered("enchants on", guiLeft + 248 + 48, guiTop + 38, true, 0xffff5555);
+ Utils.drawStringCentered("this page...", guiLeft + 248 + 48, guiTop + 48, true, 0xffff5555);
}
}
//Available enchants (left)
@@ -1413,50 +1388,14 @@ public class GuiCustomHex extends Gui {
colour = 0xff5555;
}
- int levelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(levelStr);
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 16 - levelWidth / 2 - 1,
- top + 4,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 16 - levelWidth / 2 + 1,
- top + 4,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 16 - levelWidth / 2,
- top + 4 - 1,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 16 - levelWidth / 2,
- top + 4 + 1,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 16 - levelWidth / 2,
- top + 4,
- colour,
- false
- );
+ int levelWidth = fr.getStringWidth(levelStr);
+ fr.drawString(levelStr, guiLeft + 16 - levelWidth / 2 - 1, top + 4, 0x2d2102, false);
+ fr.drawString(levelStr, guiLeft + 16 - levelWidth / 2 + 1, top + 4, 0x2d2102, false);
+ fr.drawString(levelStr, guiLeft + 16 - levelWidth / 2, top + 4 - 1, 0x2d2102, false);
+ fr.drawString(levelStr, guiLeft + 16 - levelWidth / 2, top + 4 + 1, 0x2d2102, false);
+ fr.drawString(levelStr, guiLeft + 16 - levelWidth / 2, top + 4, colour, false);
- Minecraft.getMinecraft().fontRendererObj.drawString(
- ench.enchantName,
- guiLeft + 8 + 16 + 2 + textOffset,
- top + 4 + textOffset,
- 0xffffffdd,
- true
- );
+ fr.drawString(ench.enchantName, guiLeft + 8 + 16 + 2 + textOffset, top + 4 + textOffset, 0xffffffdd, true);
}
GlScissorStack.pop(scaledResolution);
@@ -1493,51 +1432,19 @@ public class GuiCustomHex extends Gui {
colour = 0xff5555;
}
- int levelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(levelStr);
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 256 - levelWidth / 2 - 1,
- top + 4,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 256 - levelWidth / 2 + 1,
- top + 4,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 256 - levelWidth / 2,
- top + 4 - 1,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 256 - levelWidth / 2,
- top + 4 + 1,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 256 - levelWidth / 2,
- top + 4,
- colour,
- false
- );
+ int levelWidth = fr.getStringWidth(levelStr);
+ fr.drawString(levelStr, guiLeft + 256 - levelWidth / 2 - 1, top + 4, 0x2d2102, false);
+ fr.drawString(levelStr, guiLeft + 256 - levelWidth / 2 + 1, top + 4, 0x2d2102, false);
+ fr.drawString(levelStr, guiLeft + 256 - levelWidth / 2, top + 4 - 1, 0x2d2102, false);
+ fr.drawString(levelStr, guiLeft + 256 - levelWidth / 2, top + 4 + 1, 0x2d2102, false);
+ fr.drawString(levelStr, guiLeft + 256 - levelWidth / 2, top + 4, colour, false);
- Minecraft.getMinecraft().fontRendererObj.drawString(ench.enchantName,
- guiLeft + 248 + 16 + 2 + textOffset, top + 4 + textOffset, 0xffffffdd, true
- );
+ fr.drawString(ench.enchantName, guiLeft + 248 + 16 + 2 + textOffset, top + 4 + textOffset, 0xffffffdd, true);
}
GlScissorStack.pop(scaledResolution);
//Player Inventory Items
- Minecraft.getMinecraft().fontRendererObj.drawString(Minecraft.getMinecraft().thePlayer.inventory
+ fr.drawString(Minecraft.getMinecraft().thePlayer.inventory
.getDisplayName()
.getUnformattedText(),
guiLeft + 102, guiTop + Y_SIZE - 96 + 2, 0x404040
@@ -1580,7 +1487,7 @@ public class GuiCustomHex extends Gui {
searchField.setPrependText("\u00a77Search...");
} else {
if (searchField.getFocus()) {
- int len = Minecraft.getMinecraft().fontRendererObj.getStringWidth(searchField.getTextDisplay()) + 10;
+ int len = fr.getStringWidth(searchField.getTextDisplay()) + 10;
searchField.setSize(Math.max(90, len), 14);
} else {
searchField.setSize(90, 14);
@@ -1618,78 +1525,24 @@ public class GuiCustomHex extends Gui {
colour = 0xff5555;
}
- int levelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(levelStr);
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- left + 8 - levelWidth / 2 - 1,
- top + 4,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- left + 8 - levelWidth / 2 + 1,
- top + 4,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- left + 8 - levelWidth / 2,
- top + 4 - 1,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- left + 8 - levelWidth / 2,
- top + 4 + 1,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(levelStr, left + 8 - levelWidth / 2, top + 4, colour, false);
+ int levelWidth = fr.getStringWidth(levelStr);
+ fr.drawString(levelStr, left + 8 - levelWidth / 2 - 1, top + 4, 0x2d2102, false);
+ fr.drawString(levelStr, left + 8 - levelWidth / 2 + 1, top + 4, 0x2d2102, false);
+ fr.drawString(levelStr, left + 8 - levelWidth / 2, top + 4 - 1, 0x2d2102, false);
+ fr.drawString(levelStr, left + 8 - levelWidth / 2, top + 4 + 1, 0x2d2102, false);
+ fr.drawString(levelStr, left + 8 - levelWidth / 2, top + 4, colour, false);
String priceStr = "" + numberFormat.format(enchanterCurrentEnch.price) + " Coins";
if (enchanterCurrentEnch.price < 0) priceStr = "";
- int priceWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(priceStr);
+ int priceWidth = fr.getStringWidth(priceStr);
int priceTop = guiTop + 16;
int x = 180;
int color = 0x2d2102;
- Minecraft.getMinecraft().fontRendererObj.drawString(
- priceStr,
- guiLeft + x - priceWidth / 2 - 1,
- priceTop + 4,
- color,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- priceStr,
- guiLeft + x - priceWidth / 2 + 1,
- priceTop + 4,
- color,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- priceStr,
- guiLeft + x - priceWidth / 2,
- priceTop + 4 - 1,
- color,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- priceStr,
- guiLeft + x - priceWidth / 2,
- priceTop + 4 + 1,
- color,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- priceStr,
- guiLeft + x - priceWidth / 2,
- priceTop + 4,
- 0xfcba03,
- false
- );
+ fr.drawString(priceStr, guiLeft + x - priceWidth / 2 - 1, priceTop + 4, color, false);
+ fr.drawString(priceStr, guiLeft + x - priceWidth / 2 + 1, priceTop + 4, color, false);
+ fr.drawString(priceStr, guiLeft + x - priceWidth / 2, priceTop + 4 - 1, color, false);
+ fr.drawString(priceStr, guiLeft + x - priceWidth / 2, priceTop + 4 + 1, color, false);
+ fr.drawString(priceStr, guiLeft + x - priceWidth / 2, priceTop + 4, 0xfcba03, false);
//Enchant name
String name = WordUtils.capitalizeFully(ItemUtils
@@ -1706,14 +1559,7 @@ public class GuiCustomHex extends Gui {
} else if (name.equalsIgnoreCase("Turbo Mushrooms")) {
name = "Turbo-Mush";
}
- Utils.drawStringCentered(
- name,
- Minecraft.getMinecraft().fontRendererObj,
- guiLeft + X_SIZE / 2,
- top + 8,
- true,
- 0xffffffdd
- );
+ Utils.drawStringCentered(name, guiLeft + X_SIZE / 2, top + 8, true, 0xffffffdd);
if (isChangingEnchLevel) {
Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
@@ -1726,42 +1572,12 @@ public class GuiCustomHex extends Gui {
//Enchant level
levelStr = "" + enchanterCurrentEnch.level;
if (enchanterCurrentEnch.xpCost < 0) levelStr = "?";
- levelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(levelStr);
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- left + 96 + 8 - levelWidth / 2 - 1,
- top + 4,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- left + 96 + 8 - levelWidth / 2 + 1,
- top + 4,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- left + 96 + 8 - levelWidth / 2,
- top + 4 - 1,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- left + 96 + 8 - levelWidth / 2,
- top + 4 + 1,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- left + 96 + 8 - levelWidth / 2,
- top + 4,
- 0xea82ff,
- false
- );
+ levelWidth = fr.getStringWidth(levelStr);
+ fr.drawString(levelStr, left + 96 + 8 - levelWidth / 2 - 1, top + 4, 0x2d2102, false);
+ fr.drawString(levelStr, left + 96 + 8 - levelWidth / 2 + 1, top + 4, 0x2d2102, false);
+ fr.drawString(levelStr, left + 96 + 8 - levelWidth / 2, top + 4 - 1, 0x2d2102, false);
+ fr.drawString(levelStr, left + 96 + 8 - levelWidth / 2, top + 4 + 1, 0x2d2102, false);
+ fr.drawString(levelStr, left + 96 + 8 - levelWidth / 2, top + 4, 0xea82ff, false);
//Confirm button
@@ -1781,7 +1597,7 @@ public class GuiCustomHex extends Gui {
Utils.drawTexturedRect(guiLeft + X_SIZE / 2 - 1 - 48, top + 18, 48, 14,
0, 48 / 512f, 342 / 512f, (342 + 14) / 512f, GL11.GL_NEAREST
);
- Utils.drawStringCentered(confirmText, Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered(confirmText,
guiLeft + X_SIZE / 2 - 1 - 23, top + 18 + 9, false, 0x408040
);
} else {
@@ -1790,7 +1606,7 @@ public class GuiCustomHex extends Gui {
Utils.drawTexturedRect(guiLeft + X_SIZE / 2 - 1 - 48, top + 18, 48, 14,
0, 48 / 512f, 328 / 512f, (328 + 14) / 512f, GL11.GL_NEAREST
);
- Utils.drawStringCentered(confirmText, Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered(confirmText,
guiLeft + X_SIZE / 2 - 1 - 24, top + 18 + 8, false, 0x408040
);
@@ -1806,7 +1622,7 @@ public class GuiCustomHex extends Gui {
Utils.drawTexturedRect(guiLeft + X_SIZE / 2 + 1, top + 18, 48, 14,
0, 48 / 512f, 342 / 512f, (342 + 14) / 512f, GL11.GL_NEAREST
);
- Utils.drawStringCentered("Cancel", Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered("Cancel",
guiLeft + X_SIZE / 2 + 1 + 25, top + 18 + 9, false, 0xa04040
);
} else {
@@ -1815,7 +1631,7 @@ public class GuiCustomHex extends Gui {
Utils.drawTexturedRect(guiLeft + X_SIZE / 2 + 1, top + 18, 48, 14,
0, 48 / 512f, 328 / 512f, (328 + 14) / 512f, GL11.GL_NEAREST
);
- Utils.drawStringCentered("Cancel", Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered("Cancel",
guiLeft + X_SIZE / 2 + 1 + 24, top + 18 + 8, false, 0xa04040
);
}
@@ -1890,42 +1706,12 @@ public class GuiCustomHex extends Gui {
);
levelStr = "" + ench.level;
- levelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(levelStr);
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- left + 96 + 8 - levelWidth / 2 - 1,
- top + 16 * yIndex + 4,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- left + 96 + 8 - levelWidth / 2 + 1,
- top + 16 * yIndex + 4,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- left + 96 + 8 - levelWidth / 2,
- top + 16 * yIndex + 4 - 1,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- left + 96 + 8 - levelWidth / 2,
- top + 16 * yIndex + 4 + 1,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- left + 96 + 8 - levelWidth / 2,
- top + 16 * yIndex + 4,
- 0xea82ff,
- false
- );
+ levelWidth = fr.getStringWidth(levelStr);
+ fr.drawString(levelStr, left + 96 + 8 - levelWidth / 2 - 1, top + 16 * yIndex + 4, 0x2d2102, false);
+ fr.drawString(levelStr, left + 96 + 8 - levelWidth / 2 + 1, top + 16 * yIndex + 4, 0x2d2102, false);
+ fr.drawString(levelStr, left + 96 + 8 - levelWidth / 2, top + 16 * yIndex + 4 - 1, 0x2d2102, false);
+ fr.drawString(levelStr, left + 96 + 8 - levelWidth / 2, top + 16 * yIndex + 4 + 1, 0x2d2102, false);
+ fr.drawString(levelStr, left + 96 + 8 - levelWidth / 2, top + 16 * yIndex + 4, 0xea82ff, false);
}
GlStateManager.enableDepth();
}
@@ -2034,14 +1820,15 @@ public class GuiCustomHex extends Gui {
renderBaseTexture();
- Minecraft.getMinecraft().fontRendererObj.drawString("Applicable", guiLeft + 7, guiTop + 7, 0x404040, false);
- Minecraft.getMinecraft().fontRendererObj.drawString("Applied", guiLeft + 247, guiTop + 7, 0x404040, false);
+ FontRenderer fr = Minecraft.getMinecraft().fontRendererObj;
+ fr.drawString("Applicable", guiLeft + 7, guiTop + 7, 0x404040, false);
+ fr.drawString("Applied", guiLeft + 247, guiTop + 7, 0x404040, false);
//Page Text
/*if (currentState == EnchantState.HAS_ITEM || currentState == EnchantState.ADDING_ENCHANT) {
String pageStr = "Page: " + currentPage + "/" + expectedMaxPage;
int pageStrLen = Minecraft.getMinecraft().fontRendererObj.getStringWidth(pageStr);
- Utils.drawStringCentered(pageStr, Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered(pageStr,
guiLeft + X_SIZE / 2, guiTop + 14, false, 0x404040
);
@@ -2066,10 +1853,10 @@ public class GuiCustomHex extends Gui {
//Can't be enchanted text
/*if (currentState == EnchantState.INVALID_ITEM) {
GlStateManager.disableDepth();
- Utils.drawStringCentered("This item can't", Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered("This item can't",
guiLeft + X_SIZE / 2, guiTop + 88, true, 0xffff5555
);
- Utils.drawStringCentered("be enchanted", Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered("be enchanted",
guiLeft + X_SIZE / 2, guiTop + 98, true, 0xffff5555
);
GlStateManager.enableDepth();
@@ -2081,50 +1868,50 @@ public class GuiCustomHex extends Gui {
if (currentState == EnchantState.HAS_ITEM || currentState == EnchantState.ADDING_ENCHANT ||
currentState == EnchantState.HAS_ITEM_IN_BOOKS || currentState == EnchantState.ADDING_BOOK) {
if (applicableItem.isEmpty() && removableItem.isEmpty() && searchRemovedFromApplicable) {
- Utils.drawStringCentered("Can't find that", Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered("Can't find that",
guiLeft + 8 + 48, guiTop + 28, true, 0xffff5555
);
- Utils.drawStringCentered("enchant, perhaps", Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered("enchant, perhaps",
guiLeft + 8 + 48, guiTop + 38, true, 0xffff5555
);
- Utils.drawStringCentered("it is on", Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered("it is on",
guiLeft + 8 + 48, guiTop + 48, true, 0xffff5555
);
- Utils.drawStringCentered("another page?", Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered("another page?",
guiLeft + 8 + 48, guiTop + 58, true, 0xffff5555
);
} else if (applicableItem.isEmpty() && !searchRemovedFromApplicable) {
- Utils.drawStringCentered("No applicable", Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered("No applicable",
guiLeft + 8 + 48, guiTop + 28, true, 0xffff5555
);
- Utils.drawStringCentered("enchants on", Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered("enchants on",
guiLeft + 8 + 48, guiTop + 38, true, 0xffff5555
);
- Utils.drawStringCentered("this page...", Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered("this page...",
guiLeft + 8 + 48, guiTop + 48, true, 0xffff5555
);
}
if (applicableItem.isEmpty() && removableItem.isEmpty() && searchRemovedFromRemovable) {
- Utils.drawStringCentered("Can't find that", Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered("Can't find that",
guiLeft + 248 + 48, guiTop + 28, true, 0xffff5555
);
- Utils.drawStringCentered("enchant, perhaps", Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered("enchant, perhaps",
guiLeft + 248 + 48, guiTop + 38, true, 0xffff5555
);
- Utils.drawStringCentered("it is on", Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered("it is on",
guiLeft + 248 + 48, guiTop + 48, true, 0xffff5555
);
- Utils.drawStringCentered("another page?", Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered("another page?",
guiLeft + 248 + 48, guiTop + 58, true, 0xffff5555
);
} else if (removableItem.isEmpty() && !searchRemovedFromRemovable) {
- Utils.drawStringCentered("No removable", Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered("No removable",
guiLeft + 248 + 48, guiTop + 28, true, 0xffff5555
);
- Utils.drawStringCentered("enchants on", Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered("enchants on",
guiLeft + 248 + 48, guiTop + 38, true, 0xffff5555
);
- Utils.drawStringCentered("this page...", Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered("this page...",
guiLeft + 248 + 48, guiTop + 48, true, 0xffff5555
);
}
@@ -2162,50 +1949,14 @@ public class GuiCustomHex extends Gui {
colour = 0xff5555;
}
- int levelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(levelStr);
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 16 - levelWidth / 2 - 1,
- top + 4,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 16 - levelWidth / 2 + 1,
- top + 4,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 16 - levelWidth / 2,
- top + 4 - 1,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 16 - levelWidth / 2,
- top + 4 + 1,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 16 - levelWidth / 2,
- top + 4,
- colour,
- false
- );
+ int levelWidth = fr.getStringWidth(levelStr);
+ fr.drawString(levelStr, guiLeft + 16 - levelWidth / 2 - 1, top + 4, 0x2d2102, false);
+ fr.drawString(levelStr, guiLeft + 16 - levelWidth / 2 + 1, top + 4, 0x2d2102, false);
+ fr.drawString(levelStr, guiLeft + 16 - levelWidth / 2, top + 4 - 1, 0x2d2102, false);
+ fr.drawString(levelStr, guiLeft + 16 - levelWidth / 2, top + 4 + 1, 0x2d2102, false);
+ fr.drawString(levelStr, guiLeft + 16 - levelWidth / 2, top + 4, colour, false);
- Minecraft.getMinecraft().fontRendererObj.drawString(
- item.itemName,
- guiLeft + 8 + 16 + 2 + textOffset,
- top + 4 + textOffset,
- 0xffffffdd,
- true
- );
+ fr.drawString(item.itemName, guiLeft + 8 + 16 + 2 + textOffset, top + 4 + textOffset, 0xffffffdd, true);
}
GlScissorStack.pop(scaledResolution);
@@ -2241,51 +1992,19 @@ public class GuiCustomHex extends Gui {
colour = 0xff5555;
}*/
- int levelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(levelStr);
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 256 - levelWidth / 2 - 1,
- top + 4,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 256 - levelWidth / 2 + 1,
- top + 4,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 256 - levelWidth / 2,
- top + 4 - 1,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 256 - levelWidth / 2,
- top + 4 + 1,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 256 - levelWidth / 2,
- top + 4,
- colour,
- false
- );
+ int levelWidth = fr.getStringWidth(levelStr);
+ fr.drawString(levelStr, guiLeft + 256 - levelWidth / 2 - 1, top + 4, 0x2d2102, false);
+ fr.drawString(levelStr, guiLeft + 256 - levelWidth / 2 + 1, top + 4, 0x2d2102, false);
+ fr.drawString(levelStr, guiLeft + 256 - levelWidth / 2, top + 4 - 1, 0x2d2102, false);
+ fr.drawString(levelStr, guiLeft + 256 - levelWidth / 2, top + 4 + 1, 0x2d2102, false);
+ fr.drawString(levelStr, guiLeft + 256 - levelWidth / 2, top + 4, colour, false);
- Minecraft.getMinecraft().fontRendererObj.drawString(item.itemName,
- guiLeft + 248 + 16 + 2 + textOffset, top + 4 + textOffset, 0xffffffdd, true
- );
+ fr.drawString(item.itemName, guiLeft + 248 + 16 + 2 + textOffset, top + 4 + textOffset, 0xffffffdd, true);
}
GlScissorStack.pop(scaledResolution);
//Player Inventory Items
- Minecraft.getMinecraft().fontRendererObj.drawString(Minecraft.getMinecraft().thePlayer.inventory
+ fr.drawString(Minecraft.getMinecraft().thePlayer.inventory
.getDisplayName()
.getUnformattedText(),
guiLeft + 102, guiTop + Y_SIZE - 96 + 2, 0x404040
@@ -2328,7 +2047,7 @@ public class GuiCustomHex extends Gui {
searchField.setPrependText("\u00a77Search...");
} else {
if (searchField.getFocus()) {
- int len = Minecraft.getMinecraft().fontRendererObj.getStringWidth(searchField.getTextDisplay()) + 10;
+ int len = fr.getStringWidth(searchField.getTextDisplay()) + 10;
searchField.setSize(Math.max(90, len), 14);
} else {
searchField.setSize(90, 14);
@@ -2359,57 +2078,20 @@ public class GuiCustomHex extends Gui {
String priceStr = "" + numberFormat.format(enchanterCurrentItem.getPrice()) + " Coins";
if (enchanterCurrentItem.price < 0) priceStr = "";
- int priceWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(priceStr);
+ int priceWidth = fr.getStringWidth(priceStr);
int priceTop = guiTop + 10;
int x = 180;
int color = 0x2d2102;
- Minecraft.getMinecraft().fontRendererObj.drawString(
- priceStr,
- guiLeft + x - priceWidth / 2 - 1,
- priceTop + 4,
- color,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- priceStr,
- guiLeft + x - priceWidth / 2 + 1,
- priceTop + 4,
- color,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- priceStr,
- guiLeft + x - priceWidth / 2,
- priceTop + 4 - 1,
- color,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- priceStr,
- guiLeft + x - priceWidth / 2,
- priceTop + 4 + 1,
- color,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- priceStr,
- guiLeft + x - priceWidth / 2,
- priceTop + 4,
- 0xfcba03,
- false
- );
+ fr.drawString(priceStr, guiLeft + x - priceWidth / 2 - 1, priceTop + 4, color, false);
+ fr.drawString(priceStr, guiLeft + x - priceWidth / 2 + 1, priceTop + 4, color, false);
+ fr.drawString(priceStr, guiLeft + x - priceWidth / 2, priceTop + 4 - 1, color, false);
+ fr.drawString(priceStr, guiLeft + x - priceWidth / 2, priceTop + 4 + 1, color, false);
+ fr.drawString(priceStr, guiLeft + x - priceWidth / 2, priceTop + 4, 0xfcba03, false);
//Enchant name
String name = WordUtils.capitalizeFully(enchanterCurrentItem.itemId.replace("_", " "));
name = fixName(name);
- Utils.drawStringCentered(
- name,
- Minecraft.getMinecraft().fontRendererObj,
- guiLeft + X_SIZE / 2,
- top + 8,
- true,
- 0xffffffdd
- );
+ Utils.drawStringCentered(name, guiLeft + X_SIZE / 2, top + 8, true, 0xffffffdd);
//Confirm button
String confirmText = "Apply";
@@ -2428,7 +2110,7 @@ public class GuiCustomHex extends Gui {
Utils.drawTexturedRect(guiLeft + X_SIZE / 2 - 1 - 48, top + 18, 48, 14,
0, 48 / 512f, 342 / 512f, (342 + 14) / 512f, GL11.GL_NEAREST
);
- Utils.drawStringCentered(confirmText, Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered(confirmText,
guiLeft + X_SIZE / 2 - 1 - 23, top + 18 + 9, false, 0x408040
);
} else {
@@ -2437,7 +2119,7 @@ public class GuiCustomHex extends Gui {
Utils.drawTexturedRect(guiLeft + X_SIZE / 2 - 1 - 48, top + 18, 48, 14,
0, 48 / 512f, 328 / 512f, (328 + 14) / 512f, GL11.GL_NEAREST
);
- Utils.drawStringCentered(confirmText, Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered(confirmText,
guiLeft + X_SIZE / 2 - 1 - 24, top + 18 + 8, false, 0x408040
);
@@ -2453,7 +2135,7 @@ public class GuiCustomHex extends Gui {
Utils.drawTexturedRect(guiLeft + X_SIZE / 2 + 1, top + 18, 48, 14,
0, 48 / 512f, 342 / 512f, (342 + 14) / 512f, GL11.GL_NEAREST
);
- Utils.drawStringCentered("Cancel", Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered("Cancel",
guiLeft + X_SIZE / 2 + 1 + 25, top + 18 + 9, false, 0xa04040
);
} else {
@@ -2462,7 +2144,7 @@ public class GuiCustomHex extends Gui {
Utils.drawTexturedRect(guiLeft + X_SIZE / 2 + 1, top + 18, 48, 14,
0, 48 / 512f, 328 / 512f, (328 + 14) / 512f, GL11.GL_NEAREST
);
- Utils.drawStringCentered("Cancel", Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered("Cancel",
guiLeft + X_SIZE / 2 + 1 + 24, top + 18 + 8, false, 0xa04040
);
}
@@ -2574,7 +2256,8 @@ public class GuiCustomHex extends Gui {
renderBaseTexture();
- Minecraft.getMinecraft().fontRendererObj.drawString("The Hex", guiLeft + 7, guiTop + 7, 0x404040, false);
+ FontRenderer fr = Minecraft.getMinecraft().fontRendererObj;
+ fr.drawString("The Hex", guiLeft + 7, guiTop + 7, 0x404040, false);
//Minecraft.getMinecraft().fontRendererObj.drawString("Applied", guiLeft + 247, guiTop + 7, 0x404040, false);
tooltipToDisplay = renderSettings(mouseX, mouseY, tooltipToDisplay);
@@ -2587,10 +2270,10 @@ public class GuiCustomHex extends Gui {
//Can't be enchanted text
if (currentState == EnchantState.INVALID_ITEM_HEX) {
GlStateManager.disableDepth();
- Utils.drawStringCentered("This item can't", Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered("This item can't",
guiLeft + X_SIZE / 2, guiTop + 88, true, 0xffff5555
);
- Utils.drawStringCentered("be enchanted", Minecraft.getMinecraft().fontRendererObj,
+ Utils.drawStringCentered("be enchanted",
guiLeft + X_SIZE / 2, guiTop + 98, true, 0xffff5555
);
GlStateManager.enableDepth();
@@ -2631,50 +2314,14 @@ public class GuiCustomHex extends Gui {
colour = 0xff5555;
}
- int levelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(levelStr);
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 16 - levelWidth / 2 - 1,
- top + 4,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 16 - levelWidth / 2 + 1,
- top + 4,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 16 - levelWidth / 2,
- top + 4 - 1,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 16 - levelWidth / 2,
- top + 4 + 1,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 16 - levelWidth / 2,
- top + 4,
- colour,
- false
- );
+ int levelWidth = fr.getStringWidth(levelStr);
+ fr.drawString(levelStr, guiLeft + 16 - levelWidth / 2 - 1, top + 4, 0x2d2102, false);
+ fr.drawString(levelStr, guiLeft + 16 - levelWidth / 2 + 1, top + 4, 0x2d2102, false);
+ fr.drawString(levelStr, guiLeft + 16 - levelWidth / 2, top + 4 - 1, 0x2d2102, false);
+ fr.drawString(levelStr, guiLeft + 16 - levelWidth / 2, top + 4 + 1, 0x2d2102, false);
+ fr.drawString(levelStr, guiLeft + 16 - levelWidth / 2, top + 4, colour, false);
- Minecraft.getMinecraft().fontRendererObj.drawString(
- item.itemName,
- guiLeft + 8 + 16 + 2 + textOffset,
- top + 4 + textOffset,
- 0xffffffdd,
- true
- );
+ fr.drawString(item.itemName, guiLeft + 8 + 16 + 2 + textOffset, top + 4 + textOffset, 0xffffffdd, true);
}
GlScissorStack.pop(scaledResolution);
@@ -2710,53 +2357,20 @@ public class GuiCustomHex extends Gui {
colour = 0xff5555;
}
- int levelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(levelStr);
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 256 - levelWidth / 2 - 1,
- top + 4,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 256 - levelWidth / 2 + 1,
- top + 4,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 256 - levelWidth / 2,
- top + 4 - 1,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 256 - levelWidth / 2,
- top + 4 + 1,
- 0x2d2102,
- false
- );
- Minecraft.getMinecraft().fontRendererObj.drawString(
- levelStr,
- guiLeft + 256 - levelWidth / 2,
- top + 4,
- colour,
- false
- );
+ int levelWidth = fr.getStringWidth(levelStr);
+ fr.drawString(levelStr, guiLeft + 256 - levelWidth / 2 - 1, top + 4, 0x2d2102, false);
+ fr.drawString(levelStr, guiLeft + 256 - levelWidth / 2 + 1, top + 4, 0x2d2102, false);
+ fr.drawString(levelStr, guiLeft + 256 - levelWidth / 2, top + 4 - 1, 0x2d2102, false);
+ fr.drawString(levelStr, guiLeft + 256 - levelWidth / 2, top + 4 + 1, 0x2d2102, false);
+ fr.drawString(levelStr, guiLeft + 256 - levelWidth / 2, top + 4, colour, false);