mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 10:55:17 +00:00
Pass through tesrs, shotgun fontRendererObj to fontRenderer
This commit is contained in:
1 parent
de6ad1f7e8
commit
e85cd75a57
62 files changed
+168
-164
No files matched your search
@@ -56,7 +56,7 @@ public final class BossBarHandler {
|
||||
int xf = x + (bgRect.width - fgRect.width) / 2;
|
||||
int yf = y + (bgRect.height - fgRect.height) / 2;
|
||||
int fw = (int) ((double) fgRect.width * evt.getBossInfo().getPercent());
|
||||
int tx = c - mc.fontRendererObj.getStringWidth(name) / 2;
|
||||
int tx = c - mc.fontRenderer.getStringWidth(name) / 2;
|
||||
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
int auxHeight = currentBoss.bossBarRenderCallback(evt.getResolution(), x, y);
|
||||
@@ -65,9 +65,9 @@ public final class BossBarHandler {
|
||||
mc.renderEngine.bindTexture(currentBoss.getBossBarTexture());
|
||||
drawBar(currentBoss, x, y, bgRect.x, bgRect.y, bgRect.width, bgRect.height, true);
|
||||
drawBar(currentBoss, xf, yf, fgRect.x, fgRect.y, fw, fgRect.height, false);
|
||||
mc.fontRendererObj.drawStringWithShadow(name, tx, y - 10, 0xA2018C);
|
||||
mc.fontRenderer.drawStringWithShadow(name, tx, y - 10, 0xA2018C);
|
||||
GlStateManager.enableBlend();
|
||||
evt.setIncrement(Math.max(bgRect.height, fgRect.height) + auxHeight + mc.fontRendererObj.FONT_HEIGHT);
|
||||
evt.setIncrement(Math.max(bgRect.height, fgRect.height) + auxHeight + mc.fontRenderer.FONT_HEIGHT);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -163,7 +163,7 @@ public final class HUDHandler {
|
||||
if(MultiblockRenderHandler.currentMultiblock != null && MultiblockRenderHandler.anchor == null) {
|
||||
profiler.startSection("multiblockRightClick");
|
||||
String s = I18n.format("botaniamisc.rightClickToAnchor");
|
||||
mc.fontRendererObj.drawStringWithShadow(s, event.getResolution().getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(s) / 2, event.getResolution().getScaledHeight() / 2 - 30, 0xFFFFFF);
|
||||
mc.fontRenderer.drawStringWithShadow(s, event.getResolution().getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(s) / 2, event.getResolution().getScaledHeight() / 2 - 30, 0xFFFFFF);
|
||||
profiler.endSection();
|
||||
}
|
||||
|
||||
@@ -272,12 +272,12 @@ public final class HUDHandler {
|
||||
int color = 0x00CC00 + (alpha << 24);
|
||||
String disp = I18n.format(ItemTwigWand.getModeString(stack));
|
||||
|
||||
int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(disp) / 2;
|
||||
int x = res.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(disp) / 2;
|
||||
int y = res.getScaledHeight() - 70;
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
mc.fontRendererObj.drawStringWithShadow(disp, x, y, color);
|
||||
mc.fontRenderer.drawStringWithShadow(disp, x, y, color);
|
||||
GlStateManager.disableBlend();
|
||||
}
|
||||
profiler.endSection();
|
||||
@@ -335,7 +335,7 @@ public final class HUDHandler {
|
||||
net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting();
|
||||
mc.getRenderItem().renderItemAndEffectIntoGUI(stack, x - 20, y);
|
||||
mc.getRenderItem().renderItemAndEffectIntoGUI(recipe.getOutput(), x + 26, y);
|
||||
mc.getRenderItem().renderItemOverlays(mc.fontRendererObj, recipe.getOutput(), x + 26, y);
|
||||
mc.getRenderItem().renderItemOverlays(mc.fontRenderer, recipe.getOutput(), x + 26, y);
|
||||
net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
|
||||
|
||||
GlStateManager.disableLighting();
|
||||
@@ -353,14 +353,14 @@ public final class HUDHandler {
|
||||
if(!target.isEmpty()) {
|
||||
String s1 = target.getDisplayName();
|
||||
String s2 = tile.getItemCount() + "x";
|
||||
int strlen = Math.max(mc.fontRendererObj.getStringWidth(s1), mc.fontRendererObj.getStringWidth(s2));
|
||||
int strlen = Math.max(mc.fontRenderer.getStringWidth(s1), mc.fontRenderer.getStringWidth(s2));
|
||||
int w = res.getScaledWidth();
|
||||
int h = res.getScaledHeight();
|
||||
Gui.drawRect(w / 2 + 8, h / 2 - 12, w / 2 + strlen + 32, h / 2 + 10, 0x44000000);
|
||||
Gui.drawRect(w / 2 + 6, h / 2 - 14, w / 2 + strlen + 34, h / 2 + 12, 0x44000000);
|
||||
|
||||
mc.fontRendererObj.drawStringWithShadow(target.getDisplayName(), w / 2 + 30, h / 2 - 10, 0x6666FF);
|
||||
mc.fontRendererObj.drawStringWithShadow(tile.getItemCount() + "x", w / 2 + 30, h / 2, 0xFFFFFF);
|
||||
mc.fontRenderer.drawStringWithShadow(target.getDisplayName(), w / 2 + 30, h / 2 - 10, 0x6666FF);
|
||||
mc.fontRenderer.drawStringWithShadow(tile.getItemCount() + "x", w / 2 + 30, h / 2, 0xFFFFFF);
|
||||
net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
mc.getRenderItem().renderItemAndEffectIntoGUI(target, w / 2 + 10, h / 2 - 10);
|
||||
@@ -376,7 +376,7 @@ public final class HUDHandler {
|
||||
Profiler profiler = mc.mcProfiler;
|
||||
|
||||
profiler.startSection("lexicon");
|
||||
FontRenderer font = mc.fontRendererObj;
|
||||
FontRenderer font = mc.fontRenderer;
|
||||
boolean draw = false;
|
||||
String drawStr = "";
|
||||
String secondLine = "";
|
||||
@@ -417,7 +417,7 @@ public final class HUDHandler {
|
||||
if(!mc.player.isSneaking()) {
|
||||
drawStr = "?";
|
||||
secondLine = "";
|
||||
font = mc.fontRendererObj;
|
||||
font = mc.fontRenderer;
|
||||
}
|
||||
|
||||
mc.getRenderItem().renderItemIntoGUI(new ItemStack(ModItems.lexicon), sx, sy);
|
||||
@@ -427,7 +427,7 @@ public final class HUDHandler {
|
||||
|
||||
if(!mc.player.isSneaking()) {
|
||||
GlStateManager.scale(0.5F, 0.5F, 1F);
|
||||
mc.fontRendererObj.drawStringWithShadow(TextFormatting.BOLD + mc.gameSettings.keyBindSneak.getDisplayName(), (sx + 10) * 2 - 16, (sy + 8) * 2 + 20, 0xFFFFFFFF);
|
||||
mc.fontRenderer.drawStringWithShadow(TextFormatting.BOLD + mc.gameSettings.keyBindSneak.getDisplayName(), (sx + 10) * 2 - 16, (sy + 8) * 2 + 20, 0xFFFFFFFF);
|
||||
GlStateManager.scale(2F, 2F, 1F);
|
||||
}
|
||||
}
|
||||
@@ -443,7 +443,7 @@ public final class HUDHandler {
|
||||
String txt1 = TextFormatting.GRAY + I18n.format("botaniamisc.nearIndex1");
|
||||
String txt2 = TextFormatting.GRAY + I18n.format("botaniamisc.nearIndex2");
|
||||
|
||||
int l = Math.max(mc.fontRendererObj.getStringWidth(txt0), Math.max(mc.fontRendererObj.getStringWidth(txt1), mc.fontRendererObj.getStringWidth(txt2))) + 20;
|
||||
int l = Math.max(mc.fontRenderer.getStringWidth(txt0), Math.max(mc.fontRenderer.getStringWidth(txt1), mc.fontRenderer.getStringWidth(txt2))) + 20;
|
||||
int x = res.getScaledWidth() - l - 20;
|
||||
int y = res.getScaledHeight() - 60;
|
||||
|
||||
@@ -454,19 +454,19 @@ public final class HUDHandler {
|
||||
mc.getRenderItem().renderItemAndEffectIntoGUI(new ItemStack(ModBlocks.corporeaIndex), x, y + 10);
|
||||
net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
|
||||
|
||||
mc.fontRendererObj.drawStringWithShadow(txt0, x + 20, y, 0xFFFFFF);
|
||||
mc.fontRendererObj.drawStringWithShadow(txt1, x + 20, y + 14, 0xFFFFFF);
|
||||
mc.fontRendererObj.drawStringWithShadow(txt2, x + 20, y + 24, 0xFFFFFF);
|
||||
mc.fontRenderer.drawStringWithShadow(txt0, x + 20, y, 0xFFFFFF);
|
||||
mc.fontRenderer.drawStringWithShadow(txt1, x + 20, y + 14, 0xFFFFFF);
|
||||
mc.fontRenderer.drawStringWithShadow(txt2, x + 20, y + 24, 0xFFFFFF);
|
||||
}
|
||||
|
||||
public static void drawSimpleManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res) {
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(name) / 2;
|
||||
int x = res.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(name) / 2;
|
||||
int y = res.getScaledHeight() / 2 + 10;
|
||||
|
||||
mc.fontRendererObj.drawStringWithShadow(name, x, y, color);
|
||||
mc.fontRenderer.drawStringWithShadow(name, x, y, color);
|
||||
|
||||
x = res.getScaledWidth() / 2 - 51;
|
||||
y += 10;
|
||||
@@ -475,9 +475,9 @@ public final class HUDHandler {
|
||||
|
||||
if(mana < 0) {
|
||||
String text = I18n.format("botaniamisc.statusUnknown");
|
||||
x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(text) / 2;
|
||||
x = res.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(text) / 2;
|
||||
y -= 1;
|
||||
mc.fontRendererObj.drawString(text, x, y, color);
|
||||
mc.fontRenderer.drawString(text, x, y, color);
|
||||
}
|
||||
|
||||
GlStateManager.disableBlend();
|
||||
@@ -498,11 +498,11 @@ public final class HUDHandler {
|
||||
|
||||
GlStateManager.disableDepth();
|
||||
if(properlyBound) {
|
||||
mc.fontRendererObj.drawStringWithShadow("\u2714", x + 10, y + 9, 0x004C00);
|
||||
mc.fontRendererObj.drawStringWithShadow("\u2714", x + 10, y + 8, 0x0BD20D);
|
||||
mc.fontRenderer.drawStringWithShadow("\u2714", x + 10, y + 9, 0x004C00);
|
||||
mc.fontRenderer.drawStringWithShadow("\u2714", x + 10, y + 8, 0x0BD20D);
|
||||
} else {
|
||||
mc.fontRendererObj.drawStringWithShadow("\u2718", x + 10, y + 9, 0x4C0000);
|
||||
mc.fontRendererObj.drawStringWithShadow("\u2718", x + 10, y + 8, 0xD2080D);
|
||||
mc.fontRenderer.drawStringWithShadow("\u2718", x + 10, y + 9, 0x4C0000);
|
||||
mc.fontRenderer.drawStringWithShadow("\u2718", x + 10, y + 8, 0xD2080D);
|
||||
}
|
||||
GlStateManager.enableDepth();
|
||||
}
|
||||
|
||||
@@ -80,7 +80,7 @@ public final class ItemsRemainingRenderHandler {
|
||||
} else text = customString;
|
||||
|
||||
int color = 0x00FFFFFF | (int) (alpha * 0xFF) << 24;
|
||||
mc.fontRendererObj.drawStringWithShadow(text, x + 20, y + 6, color);
|
||||
mc.fontRenderer.drawStringWithShadow(text, x + 20, y + 6, color);
|
||||
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.enableAlpha();
|
||||
|
||||
@@ -100,7 +100,7 @@ public class RenderLexicon {
|
||||
|
||||
model.render(null, 0F, 0F, pageFlip, opening, 0F, 1F / 16F);
|
||||
if(ticks < 3) {
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRendererObj;
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRenderer;
|
||||
GlStateManager.rotate(180F, 0F, 0F, 1F);
|
||||
GlStateManager.translate(-0.3F, -0.21F, -0.07F);
|
||||
GlStateManager.scale(0.0035F, 0.0035F, -0.0035F);
|
||||
|
||||
@@ -132,7 +132,7 @@ public final class TooltipAdditionDisplayHandler {
|
||||
GlStateManager.scale(0.5F, 0.5F, 1F);
|
||||
boolean mac = Minecraft.IS_RUNNING_ON_MAC;
|
||||
|
||||
mc.fontRendererObj.drawStringWithShadow(TextFormatting.BOLD + (ConfigHandler.useShiftForQuickLookup ? "Shift" : mac ? "Cmd" : "Ctrl"), (x + 10) * 2 - 16, (tooltipY + 8) * 2 + 20, 0xFFFFFFFF);
|
||||
mc.fontRenderer.drawStringWithShadow(TextFormatting.BOLD + (ConfigHandler.useShiftForQuickLookup ? "Shift" : mac ? "Cmd" : "Ctrl"), (x + 10) * 2 - 16, (tooltipY + 8) * 2 + 20, 0xFFFFFFFF);
|
||||
GlStateManager.scale(2F, 2F, 1F);
|
||||
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ public final class RenderHelper {
|
||||
int var5 = 0;
|
||||
int var6;
|
||||
int var7;
|
||||
FontRenderer fontRenderer = Minecraft.getMinecraft().fontRendererObj;
|
||||
FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
|
||||
for (var6 = 0; var6 < tooltipData.size(); ++var6) {
|
||||
var7 = fontRenderer.getStringWidth(tooltipData.get(var6));
|
||||
if (var7 > var5)
|
||||
|
||||
@@ -35,8 +35,8 @@ public class GuiFlowerBag extends GuiContainer {
|
||||
@Override
|
||||
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
|
||||
String s = I18n.format("item.botania:flowerBag.name");
|
||||
fontRendererObj.drawString(s, xSize / 2 - fontRendererObj.getStringWidth(s) / 2, 6, 4210752);
|
||||
fontRendererObj.drawString(I18n.format("container.inventory"), 8, ySize - 96 + 2, 4210752);
|
||||
fontRenderer.drawString(s, xSize / 2 - fontRenderer.getStringWidth(s) / 2, 6, 4210752);
|
||||
fontRenderer.drawString(I18n.format("container.inventory"), 8, ySize - 96 + 2, 4210752);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -58,7 +58,7 @@ public class GuiFlowerBag extends GuiContainer {
|
||||
RenderHelper.enableGUIStandardItemLighting();
|
||||
mc.getRenderItem().renderItemIntoGUI(stack, x, y);
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
mc.fontRendererObj.drawStringWithShadow("0", x + 11, y + 9, 0xFF6666);
|
||||
mc.fontRenderer.drawStringWithShadow("0", x + 11, y + 9, 0xFF6666);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,8 +28,8 @@ public class GuiCraftingHalo extends GuiContainer {
|
||||
|
||||
@Override
|
||||
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
|
||||
fontRendererObj.drawString(I18n.format("container.crafting"), 28, 6, 4210752);
|
||||
fontRendererObj.drawString(I18n.format("container.inventory"), 8, ySize - 96 + 2, 4210752);
|
||||
fontRenderer.drawString(I18n.format("container.crafting"), 28, 6, 4210752);
|
||||
fontRenderer.drawString(I18n.format("container.inventory"), 8, ySize - 96 + 2, 4210752);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -248,14 +248,14 @@ public class GuiLexicon extends GuiScreen {
|
||||
if(konamiTime > 0) {
|
||||
String meme = I18n.format("botania.subtitle.way");
|
||||
GlStateManager.pushMatrix();
|
||||
int fullWidth = fontRendererObj.getStringWidth(meme);
|
||||
int fullWidth = fontRenderer.getStringWidth(meme);
|
||||
int left = width;
|
||||
double widthPerTick = (fullWidth + width) / 240;
|
||||
double currWidth = left - widthPerTick * (240 - (konamiTime - par3)) * 3.2;
|
||||
|
||||
GlStateManager.translate(currWidth, height / 2 - 10, 0);
|
||||
GlStateManager.scale(4, 4, 4);
|
||||
mc.fontRendererObj.drawStringWithShadow(meme, 0, 0, 0xFFFFFF);
|
||||
mc.fontRenderer.drawStringWithShadow(meme, 0, 0, 0xFFFFFF);
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
}
|
||||
@@ -347,13 +347,13 @@ public class GuiLexicon extends GuiScreen {
|
||||
if(notesEnabled && ClientTickHandler.ticksInGame % 20 < 10)
|
||||
noteDisplay += "&r_";
|
||||
|
||||
fontRendererObj.drawString(I18n.format("botaniamisc.notes"), x + 5, y - 7, 0x666666);
|
||||
fontRenderer.drawString(I18n.format("botaniamisc.notes"), x + 5, y - 7, 0x666666);
|
||||
|
||||
boolean unicode = fontRendererObj.getUnicodeFlag();
|
||||
fontRendererObj.setUnicodeFlag(true);
|
||||
boolean unicode = fontRenderer.getUnicodeFlag();
|
||||
fontRenderer.setUnicodeFlag(true);
|
||||
|
||||
PageText.renderText(x + 5, y - 3, 92, 120, 0, true, 0, TextFormatting.RESET + noteDisplay);
|
||||
fontRendererObj.setUnicodeFlag(unicode);
|
||||
fontRenderer.setUnicodeFlag(unicode);
|
||||
}
|
||||
|
||||
public void drawBookmark(int x, int y, String s, boolean drawLeft) {
|
||||
@@ -365,8 +365,8 @@ public class GuiLexicon extends GuiScreen {
|
||||
}
|
||||
|
||||
public void drawBookmark(int x, int y, String s, boolean drawLeft, int color, int v) {
|
||||
// This function is called from the buttons so I can't use fontRendererObj
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRendererObj;
|
||||
// This function is called from the buttons so I can't use fontRenderer
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRenderer;
|
||||
boolean unicode = font.getUnicodeFlag();
|
||||
font.setUnicodeFlag(true);
|
||||
int l = font.getStringWidth(s);
|
||||
@@ -398,15 +398,15 @@ public class GuiLexicon extends GuiScreen {
|
||||
drawTexturedModalRect(left - 8, top + 9, 0, 224, 140, 31);
|
||||
|
||||
int color = 0xffd200;
|
||||
boolean unicode = fontRendererObj.getUnicodeFlag();
|
||||
fontRendererObj.drawString(title, left + 18, top + 13, color);
|
||||
fontRendererObj.setUnicodeFlag(true);
|
||||
fontRendererObj.drawString(I18n.format("botaniamisc.edition", ItemLexicon.getEdition()), left + 24, top + 22, color);
|
||||
boolean unicode = fontRenderer.getUnicodeFlag();
|
||||
fontRenderer.drawString(title, left + 18, top + 13, color);
|
||||
fontRenderer.setUnicodeFlag(true);
|
||||
fontRenderer.drawString(I18n.format("botaniamisc.edition", ItemLexicon.getEdition()), left + 24, top + 22, color);
|
||||
|
||||
String s = TextFormatting.BOLD + categoryHighlight;
|
||||
fontRendererObj.drawString(s, left + guiWidth / 2 - fontRendererObj.getStringWidth(s) / 2, top + 36, 0);
|
||||
fontRenderer.drawString(s, left + guiWidth / 2 - fontRenderer.getStringWidth(s) / 2, top + 36, 0);
|
||||
|
||||
fontRendererObj.setUnicodeFlag(unicode);
|
||||
fontRenderer.setUnicodeFlag(unicode);
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
categoryHighlight = "";
|
||||
@@ -509,13 +509,13 @@ public class GuiLexicon extends GuiScreen {
|
||||
}
|
||||
|
||||
public int bookmarkWidth(String b) {
|
||||
if(fontRendererObj == null)
|
||||
fontRendererObj = Minecraft.getMinecraft().fontRendererObj;
|
||||
if(fontRenderer == null)
|
||||
fontRenderer = Minecraft.getMinecraft().fontRenderer;
|
||||
|
||||
boolean unicode = fontRendererObj.getUnicodeFlag();
|
||||
fontRendererObj.setUnicodeFlag(true);
|
||||
int width = fontRendererObj.getStringWidth(b) + 15;
|
||||
fontRendererObj.setUnicodeFlag(unicode);
|
||||
boolean unicode = fontRenderer.getUnicodeFlag();
|
||||
fontRenderer.setUnicodeFlag(true);
|
||||
int width = fontRenderer.getStringWidth(b) + 15;
|
||||
fontRenderer.setUnicodeFlag(unicode);
|
||||
return width;
|
||||
}
|
||||
|
||||
|
||||
@@ -67,17 +67,17 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented {
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
GlStateManager.enableBlend();
|
||||
|
||||
boolean unicode = fontRendererObj.getUnicodeFlag();
|
||||
fontRendererObj.setUnicodeFlag(true);
|
||||
fontRendererObj.drawString(TextFormatting.BOLD + I18n.format(challenge.unlocalizedName), left + 38, top + 13, 0);
|
||||
fontRendererObj.drawString(I18n.format(challenge.level.getName()) + " / " + (challenge.complete ? TextFormatting.DARK_GREEN : TextFormatting.DARK_RED) + I18n.format(challenge.complete ? "botaniamisc.completed" : "botaniamisc.notCompleted"), left + 38, top + 23, 0);
|
||||
boolean unicode = fontRenderer.getUnicodeFlag();
|
||||
fontRenderer.setUnicodeFlag(true);
|
||||
fontRenderer.drawString(TextFormatting.BOLD + I18n.format(challenge.unlocalizedName), left + 38, top + 13, 0);
|
||||
fontRenderer.drawString(I18n.format(challenge.level.getName()) + " / " + (challenge.complete ? TextFormatting.DARK_GREEN : TextFormatting.DARK_RED) + I18n.format(challenge.complete ? "botaniamisc.completed" : "botaniamisc.notCompleted"), left + 38, top + 23, 0);
|
||||
|
||||
int width = guiWidth - 30;
|
||||
int x = left + 16;
|
||||
int y = top + 28;
|
||||
|
||||
PageText.renderText(x, y, width, guiHeight, challenge.unlocalizedName + ".desc");
|
||||
fontRendererObj.setUnicodeFlag(unicode);
|
||||
fontRenderer.setUnicodeFlag(unicode);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -58,8 +58,8 @@ public class GuiLexiconChallengesList extends GuiLexicon implements IParented {
|
||||
public void drawScreenAfterScale(int par1, int par2, float par3) {
|
||||
super.drawScreenAfterScale(par1, par2, par3);
|
||||
|
||||
boolean unicode = fontRendererObj.getUnicodeFlag();
|
||||
fontRendererObj.setUnicodeFlag(true);
|
||||
boolean unicode = fontRenderer.getUnicodeFlag();
|
||||
fontRenderer.setUnicodeFlag(true);
|
||||
for(EnumChallengeLevel level : EnumChallengeLevel.class.getEnumConstants()) {
|
||||
List<Challenge> list = ModChallenges.challenges.get(level);
|
||||
int complete = 0;
|
||||
@@ -67,9 +67,9 @@ public class GuiLexiconChallengesList extends GuiLexicon implements IParented {
|
||||
if(c.complete)
|
||||
complete++;
|
||||
|
||||
fontRendererObj.drawString(TextFormatting.BOLD + I18n.format(level.getName()) + TextFormatting.RESET + " (" + complete + "/" + list.size() + ")", left + 20, top + 11 + level.ordinal() * 44, 0);
|
||||
fontRenderer.drawString(TextFormatting.BOLD + I18n.format(level.getName()) + TextFormatting.RESET + " (" + complete + "/" + list.size() + ")", left + 20, top + 11 + level.ordinal() * 44, 0);
|
||||
}
|
||||
fontRendererObj.setUnicodeFlag(unicode);
|
||||
fontRenderer.setUnicodeFlag(unicode);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -106,7 +106,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
|
||||
buttonList.add(leftButton = new GuiButtonPage(13, left, top + guiHeight - 10, false));
|
||||
buttonList.add(rightButton = new GuiButtonPage(14, left + guiWidth - 18, top + guiHeight - 10, true));
|
||||
|
||||
searchField = new GuiTextField(15, fontRendererObj, left + guiWidth / 2 + 28, top + guiHeight + 6, 200, 10);
|
||||
searchField = new GuiTextField(15, fontRenderer, left + guiWidth / 2 + 28, top + guiHeight + 6, 200, 10);
|
||||
searchField.setCanLoseFocus(false);
|
||||
searchField.setFocused(true);
|
||||
searchField.setEnableBackgroundDrawing(false);
|
||||
@@ -185,18 +185,18 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
|
||||
drawTexturedModalRect(left + 134, top + guiHeight - 26, 86, 180, 12, 12);
|
||||
|
||||
if(entriesToDisplay.size() == 1) {
|
||||
boolean unicode = mc.fontRendererObj.getUnicodeFlag();
|
||||
mc.fontRendererObj.setUnicodeFlag(true);
|
||||
boolean unicode = mc.fontRenderer.getUnicodeFlag();
|
||||
mc.fontRenderer.setUnicodeFlag(true);
|
||||
String s = I18n.format("botaniamisc.enterToView");
|
||||
mc.fontRendererObj.drawString(s, left + guiWidth / 2 - mc.fontRendererObj.getStringWidth(s) / 2, top + 30, 0x666666);
|
||||
mc.fontRendererObj.setUnicodeFlag(unicode);
|
||||
mc.fontRenderer.drawString(s, left + guiWidth / 2 - mc.fontRenderer.getStringWidth(s) / 2, top + 30, 0x666666);
|
||||
mc.fontRenderer.setUnicodeFlag(unicode);
|
||||
}
|
||||
} else {
|
||||
boolean unicode = mc.fontRendererObj.getUnicodeFlag();
|
||||
mc.fontRendererObj.setUnicodeFlag(true);
|
||||
boolean unicode = mc.fontRenderer.getUnicodeFlag();
|
||||
mc.fontRenderer.setUnicodeFlag(true);
|
||||
String s = I18n.format("botaniamisc.typeToSearch");
|
||||
mc.fontRendererObj.drawString(s, left + 120 - mc.fontRendererObj.getStringWidth(s), top + guiHeight - 18, 0x666666);
|
||||
mc.fontRendererObj.setUnicodeFlag(unicode);
|
||||
mc.fontRenderer.drawString(s, left + 120 - mc.fontRenderer.getStringWidth(s), top + guiHeight - 18, 0x666666);
|
||||
mc.fontRenderer.setUnicodeFlag(unicode);
|
||||
}
|
||||
|
||||
float animationTime = 4F;
|
||||
@@ -213,9 +213,9 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
|
||||
x = currentButton.xPosition - 20;
|
||||
y = currentButton.yPosition;
|
||||
|
||||
mc.fontRendererObj.drawStringWithShadow("?", x, y, 0xFFFFFF);
|
||||
mc.fontRenderer.drawStringWithShadow("?", x, y, 0xFFFFFF);
|
||||
GlStateManager.scale(0.5F, 0.5F, 1F);
|
||||
mc.fontRendererObj.drawStringWithShadow(TextFormatting.BOLD + "Shift", x * 2 - 6, y * 2 + 20, 0xFFFFFF);
|
||||
mc.fontRenderer.drawStringWithShadow(TextFormatting.BOLD + "Shift", x * 2 - 6, y * 2 + 20, 0xFFFFFF);
|
||||
GlStateManager.scale(2F, 2F, 1F);
|
||||
}
|
||||
}
|
||||
@@ -226,9 +226,9 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
|
||||
int x = currentButton.xPosition;
|
||||
int y = currentButton.yPosition;
|
||||
String s = I18n.format(currentEntry.getTagline());
|
||||
boolean unicode = mc.fontRendererObj.getUnicodeFlag();
|
||||
mc.fontRendererObj.setUnicodeFlag(true);
|
||||
int width = mc.fontRendererObj.getStringWidth(s);
|
||||
boolean unicode = mc.fontRenderer.getUnicodeFlag();
|
||||
mc.fontRenderer.setUnicodeFlag(true);
|
||||
int width = mc.fontRenderer.getStringWidth(s);
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(x, y, 0);
|
||||
@@ -237,14 +237,14 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
|
||||
Gui.drawRect(10, -32, width + 22, -2, 0x44000000);
|
||||
|
||||
drawBookmark(width / 2 + 16, -8, s, true, 0xFFFFFF, 180);
|
||||
mc.fontRendererObj.setUnicodeFlag(unicode);
|
||||
mc.fontRenderer.setUnicodeFlag(unicode);
|
||||
|
||||
net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
ItemStack paper = new ItemStack(Items.PAPER, currentEntry.pages.size());
|
||||
|
||||
mc.getRenderItem().renderItemAndEffectIntoGUI(paper, 14, -28);
|
||||
mc.getRenderItem().renderItemOverlays(mc.fontRendererObj, paper, 14, -28);
|
||||
mc.getRenderItem().renderItemOverlays(mc.fontRenderer, paper, 14, -28);
|
||||
List<ItemStack> stacks = currentEntry.getDisplayedRecipes();
|
||||
|
||||
if(stacks.size() > 0) {
|
||||
|
||||
@@ -44,8 +44,8 @@ public class GuiButtonChallengeIcon extends GuiButtonLexicon {
|
||||
|
||||
if(challenge.complete) {
|
||||
GlStateManager.disableDepth();
|
||||
par1Minecraft.fontRendererObj.drawStringWithShadow("\u2714", xPosition + 10, yPosition + 9, 0x004C00);
|
||||
par1Minecraft.fontRendererObj.drawStringWithShadow("\u2714", xPosition + 10, yPosition + 8, 0x0BD20D);
|
||||
par1Minecraft.fontRenderer.drawStringWithShadow("\u2714", xPosition + 10, yPosition + 9, 0x004C00);
|
||||
par1Minecraft.fontRenderer.drawStringWithShadow("\u2714", xPosition + 10, yPosition + 8, 0x0BD20D);
|
||||
GlStateManager.enableDepth();
|
||||
}
|
||||
|
||||
|
||||
@@ -100,10 +100,10 @@ public class GuiButtonInvisible extends GuiButtonLexicon {
|
||||
drawRect(xPosition - 5, yPosition, (int) (xPosition - 5 + timeHover * 24), yPosition + height, alpha << 24 | color);
|
||||
GlStateManager.enableAlpha();
|
||||
|
||||
boolean unicode = par1Minecraft.fontRendererObj.getUnicodeFlag();
|
||||
par1Minecraft.fontRendererObj.setUnicodeFlag(true);
|
||||
par1Minecraft.fontRendererObj.drawString(displayString, xPosition + (showStack ? 7 : 0), yPosition + (height - 8) / 2, 0);
|
||||
par1Minecraft.fontRendererObj.setUnicodeFlag(unicode);
|
||||
boolean unicode = par1Minecraft.fontRenderer.getUnicodeFlag();
|
||||
par1Minecraft.fontRenderer.setUnicodeFlag(true);
|
||||
par1Minecraft.fontRenderer.drawString(displayString, xPosition + (showStack ? 7 : 0), yPosition + (height - 8) / 2, 0);
|
||||
par1Minecraft.fontRenderer.setUnicodeFlag(unicode);
|
||||
|
||||
if(showStack) {
|
||||
GlStateManager.scale(0.5F, 0.5F, 0.5F);
|
||||
|
||||
@@ -46,7 +46,7 @@ public class GuiButtonNotes extends GuiButtonLexicon {
|
||||
else {
|
||||
tooltip.add(TextFormatting.GREEN + I18n.format("botaniamisc.showNotes"));
|
||||
if(parent.note != null && !parent.note.isEmpty())
|
||||
Minecraft.getMinecraft().fontRendererObj.drawStringWithShadow("!", xPosition + 10, yPosition, 0xFF0000);
|
||||
Minecraft.getMinecraft().fontRenderer.drawStringWithShadow("!", xPosition + 10, yPosition, 0xFF0000);
|
||||
}
|
||||
|
||||
int tooltipY = (tooltip.size() - 1) * 10;
|
||||
|
||||
@@ -32,7 +32,7 @@ import vazkii.botania.common.block.tile.TileAlfPortal;
|
||||
public class RenderTileAlfPortal extends TileEntitySpecialRenderer<TileAlfPortal> {
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(@Nonnull TileAlfPortal portal, double d0, double d1, double d2, float f, int digProgress) {
|
||||
public void renderTileEntityAt(@Nonnull TileAlfPortal portal, double d0, double d1, double d2, float f, int digProgress, float unused) {
|
||||
if (!portal.getWorld().isBlockLoaded(portal.getPos(), false)
|
||||
|| portal.getWorld().getBlockState(portal.getPos()).getBlock() != ModBlocks.alfPortal)
|
||||
return;
|
||||
|
||||
@@ -33,7 +33,7 @@ import vazkii.botania.common.block.tile.TileAltar;
|
||||
public class RenderTileAltar extends TileEntitySpecialRenderer<TileAltar> {
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(@Nonnull TileAltar altar, double d0, double d1, double d2, float pticks, int digProgress) {
|
||||
public void renderTileEntityAt(@Nonnull TileAltar altar, double d0, double d1, double d2, float pticks, int digProgress, float unused) {
|
||||
if(!altar.getWorld().isBlockLoaded(altar.getPos(), false)
|
||||
|| altar.getWorld().getBlockState(altar.getPos()).getBlock() != ModBlocks.altar)
|
||||
return;
|
||||
|
||||
@@ -24,7 +24,7 @@ import vazkii.botania.common.block.tile.TileAnimatedTorch;
|
||||
public class RenderTileAnimatedTorch extends TileEntitySpecialRenderer<TileAnimatedTorch> {
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(TileAnimatedTorch te, double x, double y, double z, float partialTicks, int destroyStage) {
|
||||
public void renderTileEntityAt(TileAnimatedTorch te, double x, double y, double z, float partialTicks, int destroyStage, float unused) {
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(x, y, z);
|
||||
|
||||
@@ -41,7 +41,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer<TileAvatar> {
|
||||
private static final ModelAvatar model = new ModelAvatar();
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(@Nullable TileAvatar avatar, double d0, double d1, double d2, float pticks, int digProgress) {
|
||||
public void renderTileEntityAt(@Nullable TileAvatar avatar, double d0, double d1, double d2, float pticks, int digProgress, float unused) {
|
||||
if (avatar != null)
|
||||
if (!avatar.getWorld().isBlockLoaded(avatar.getPos(), false)
|
||||
|| avatar.getWorld().getBlockState(avatar.getPos()).getBlock() != ModBlocks.avatar)
|
||||
|
||||
@@ -31,7 +31,7 @@ public class RenderTileBellows extends TileEntitySpecialRenderer<TileBellows> {
|
||||
private static final ModelBellows model = new ModelBellows();
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(@Nullable TileBellows bellows, double d0, double d1, double d2, float f, int digProgress) {
|
||||
public void renderTileEntityAt(@Nullable TileBellows bellows, double d0, double d1, double d2, float f, int digProgress, float unused) {
|
||||
if (bellows != null)
|
||||
if (!bellows.getWorld().isBlockLoaded(bellows.getPos(), false)
|
||||
|| bellows.getWorld().getBlockState(bellows.getPos()).getBlock() != ModBlocks.bellows)
|
||||
|
||||
@@ -32,7 +32,7 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer<TileBrewery> {
|
||||
public TileBrewery brewery;
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(@Nullable TileBrewery brewery, double d0, double d1, double d2, float f, int digProgress) {
|
||||
public void renderTileEntityAt(@Nullable TileBrewery brewery, double d0, double d1, double d2, float f, int digProgress, float unused) {
|
||||
this.brewery = brewery;
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
|
||||
@@ -25,7 +25,7 @@ import vazkii.botania.common.block.tile.TileCocoon;
|
||||
public class RenderTileCocoon extends TileEntitySpecialRenderer<TileCocoon> {
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(@Nonnull TileCocoon cocoon, double d0, double d1, double d2, float f, int digProgress) {
|
||||
public void renderTileEntityAt(@Nonnull TileCocoon cocoon, double d0, double d1, double d2, float f, int digProgress, float unused) {
|
||||
float rot = 0F;
|
||||
float modval = 60F - (float) cocoon.timePassed / (float) TileCocoon.TOTAL_TIME * 30F;
|
||||
if(cocoon.timePassed % modval < 10) {
|
||||
|
||||
@@ -50,7 +50,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer<Til
|
||||
private RenderEntityItem itemRenderer = null;
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(@Nonnull TileCorporeaCrystalCube cube, double d0, double d1, double d2, float f, int digProgress) {
|
||||
public void renderTileEntityAt(@Nonnull TileCorporeaCrystalCube cube, double d0, double d1, double d2, float f, int digProgress, float unused) {
|
||||
ItemStack stack = ItemStack.EMPTY;
|
||||
if (cube != null) {
|
||||
if(entity == null)
|
||||
@@ -115,16 +115,16 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer<Til
|
||||
float s = 1F / 64F;
|
||||
GlStateManager.scale(s, s, s);
|
||||
GlStateManager.disableLighting();
|
||||
int l = mc.fontRendererObj.getStringWidth(countStr);
|
||||
int l = mc.fontRenderer.getStringWidth(countStr);
|
||||
|
||||
GlStateManager.translate(0F, 55F, 0F);
|
||||
float tr = -16.5F;
|
||||
for(int i = 0; i < 4; i++) {
|
||||
GlStateManager.rotate(90F, 0F, 1F, 0F);
|
||||
GlStateManager.translate(0F, 0F, tr);
|
||||
mc.fontRendererObj.drawString(countStr, -l / 2, 0, color);
|
||||
mc.fontRenderer.drawString(countStr, -l / 2, 0, color);
|
||||
GlStateManager.translate(0F, 0F, 0.1F);
|
||||
mc.fontRendererObj.drawString(countStr, -l / 2 + 1, 1, colorShade);
|
||||
mc.fontRenderer.drawString(countStr, -l / 2 + 1, 1, colorShade);
|
||||
GlStateManager.translate(0F, 0F, -tr - 0.1F);
|
||||
}
|
||||
GlStateManager.enableLighting();
|
||||
|
||||
@@ -28,7 +28,7 @@ public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer<TileCorpo
|
||||
public static boolean move = true;
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(@Nullable TileCorporeaIndex index, double x, double y, double z, float partticks, int digProgress) {
|
||||
public void renderTileEntityAt(@Nullable TileCorporeaIndex index, double x, double y, double z, float partticks, int digProgress, float unused) {
|
||||
move = index != null;
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
|
||||
@@ -36,7 +36,7 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer<TileEnchanter
|
||||
private EntityItem item;
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(@Nonnull TileEnchanter enchanter, double d0, double d1, double d2, float f, int digProgress) {
|
||||
public void renderTileEntityAt(@Nonnull TileEnchanter enchanter, double d0, double d1, double d2, float f, int digProgress, float unused) {
|
||||
float alphaMod = 0F;
|
||||
|
||||
if(enchanter.stage == TileEnchanter.State.GATHER_MANA)
|
||||
@@ -54,7 +54,7 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer<TileEnchanter
|
||||
MethodHandles.itemAge_setter.invokeExact(item, ClientTickHandler.ticksInGame);
|
||||
} catch (Throwable ignored) {}
|
||||
|
||||
item.setEntityItemStack(enchanter.itemToEnchant);
|
||||
item.setItem(enchanter.itemToEnchant);
|
||||
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translate(0.5F, 1.25F, 0.5F);
|
||||
|
||||
@@ -29,7 +29,7 @@ import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
public class RenderTileFloatingFlower extends TileEntitySpecialRenderer {
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(@Nonnull TileEntity tile, double d0, double d1, double d2, float t, int digProgress) {
|
||||
public void renderTileEntityAt(@Nonnull TileEntity tile, double d0, double d1, double d2, float t, int digProgress, float unused) {
|
||||
if(ConfigHandler.staticFloaters)
|
||||
return;
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ import vazkii.botania.client.render.entity.RenderDoppleganger;
|
||||
|
||||
public class RenderTileGaiaHead extends TileEntitySkullRenderer {
|
||||
@Override
|
||||
public void renderTileEntityAt(TileEntitySkull skull, double x, double y, double z, float partialTicks, int digProgress) {
|
||||
public void renderTileEntityAt(TileEntitySkull skull, double x, double y, double z, float partialTicks, int digProgress, float unused) {
|
||||
ShaderHelper.useShader(ShaderHelper.doppleganger, RenderDoppleganger.defaultCallback);
|
||||
|
||||
// Null-safe copy of super
|
||||
|
||||
@@ -32,7 +32,7 @@ public class RenderTileHourglass extends TileEntitySpecialRenderer<TileHourglass
|
||||
final ModelHourglass model = new ModelHourglass();
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(@Nullable TileHourglass hourglass, double d0, double d1, double d2, float ticks, int digProgress) {
|
||||
public void renderTileEntityAt(@Nullable TileHourglass hourglass, double d0, double d1, double d2, float ticks, int digProgress, float unused) {
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
|
||||
@@ -33,7 +33,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer<TileIncens
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
@Override
|
||||
public void renderTileEntityAt(@Nonnull TileIncensePlate plate, double d0, double d1, double d2, float ticks, int digProgress) {
|
||||
public void renderTileEntityAt(@Nonnull TileIncensePlate plate, double d0, double d1, double d2, float ticks, int digProgress, float unused) {
|
||||
if(!plate.getWorld().isBlockLoaded(plate.getPos(), false)
|
||||
|| plate.getWorld().getBlockState(plate.getPos()).getBlock() != ModBlocks.incensePlate)
|
||||
return;
|
||||
|
||||
@@ -38,7 +38,7 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer<TileLightRel
|
||||
private static Map<LuminizerVariant, TextureAtlasSprite> sprites = new HashMap();
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(@Nonnull TileLightRelay tile, double x, double y, double z, float pticks, int digProgress) {
|
||||
public void renderTileEntityAt(@Nonnull TileLightRelay tile, double x, double y, double z, float pticks, int digProgress, float unused) {
|
||||
if(!tile.getWorld().isBlockLoaded(tile.getPos(), false) || tile.getWorld().getBlockState(tile.getPos()).getBlock() != ModBlocks.lightRelay)
|
||||
return;
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer<TilePool> {
|
||||
public static int forceManaNumber = -1;
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(@Nonnull TilePool pool, double d0, double d1, double d2, float f, int digProgress) {
|
||||
public void renderTileEntityAt(@Nonnull TilePool pool, double d0, double d1, double d2, float f, int digProgress, float unused) {
|
||||
if(pool != null && (!pool.getWorld().isBlockLoaded(pool.getPos(), false)
|
||||
|| pool.getWorld().getBlockState(pool.getPos()).getBlock() != ModBlocks.pool))
|
||||
return;
|
||||
|
||||
@@ -27,7 +27,7 @@ import vazkii.botania.common.block.tile.mana.TilePrism;
|
||||
public class RenderTilePrism extends TileEntitySpecialRenderer<TilePrism> {
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(@Nonnull TilePrism prism, double x, double y, double z, float partTicks, int digProgress) {
|
||||
public void renderTileEntityAt(@Nonnull TilePrism prism, double x, double y, double z, float partTicks, int digProgress, float unused) {
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(x, y, z);
|
||||
float pos = (float) Math.sin((ClientTickHandler.ticksInGame + partTicks) * 0.05F) * 0.5F * (1F - 1F / 16F) - 0.5F;
|
||||
|
||||
@@ -46,7 +46,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer<TilePylon> {
|
||||
public static boolean pink = false;
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(@Nonnull TilePylon pylon, double d0, double d1, double d2, float pticks, int digProgress) {
|
||||
public void renderTileEntityAt(@Nonnull TilePylon pylon, double d0, double d1, double d2, float pticks, int digProgress, float unused) {
|
||||
if(!pylon.getWorld().isBlockLoaded(pylon.getPos(), false)
|
||||
|| pylon.getWorld().getBlockState(pylon.getPos()).getBlock() != ModBlocks.pylon)
|
||||
return;
|
||||
|
||||
@@ -10,15 +10,17 @@
|
||||
*/
|
||||
package vazkii.botania.client.render.tile;
|
||||
|
||||
import net.minecraft.client.renderer.VertexBuffer;
|
||||
import net.minecraft.client.renderer.BufferBuilder;
|
||||
import net.minecraftforge.client.model.animation.FastTESR;
|
||||
import vazkii.botania.client.core.handler.RedStringRenderer;
|
||||
import vazkii.botania.common.block.tile.string.TileRedString;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
public class RenderTileRedString extends FastTESR<TileRedString> {
|
||||
|
||||
@Override
|
||||
public void renderTileEntityFast(TileRedString trs, double x, double y, double z, float partialTicks, int destroyStage, VertexBuffer worldRenderer) {
|
||||
public void renderTileEntityFast(@Nonnull TileRedString trs, double x, double y, double z, float partialTicks, int destroyStage, float unused, @Nonnull BufferBuilder worldRenderer) {
|
||||
RedStringRenderer.redStringTiles.add(trs);
|
||||
}
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer<TileRuneAltar
|
||||
final ModelSpinningCubes cubes = new ModelSpinningCubes();
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(@Nonnull TileRuneAltar altar, double x, double y, double z, float partticks, int digProgress) {
|
||||
public void renderTileEntityAt(@Nonnull TileRuneAltar altar, double x, double y, double z, float partticks, int digProgress, float unused) {
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translate(x, y, z);
|
||||
|
||||
@@ -23,7 +23,7 @@ import vazkii.botania.common.block.tile.TileSparkChanger;
|
||||
public class RenderTileSparkChanger extends TileEntitySpecialRenderer<TileSparkChanger> {
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(@Nonnull TileSparkChanger tileentity, double d0, double d1, double d2, float pticks, int digProgress) {
|
||||
public void renderTileEntityAt(@Nonnull TileSparkChanger tileentity, double d0, double d1, double d2, float pticks, int digProgress, float unused) {
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(d0, d1, d2);
|
||||
GlStateManager.rotate(90F, 1F, 0F, 0F);
|
||||
|
||||
@@ -46,7 +46,7 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer<TileSpreader>
|
||||
private static final ModelSpreader model = new ModelSpreader();
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(@Nonnull TileSpreader spreader, double d0, double d1, double d2, float ticks, int digProgress) {
|
||||
public void renderTileEntityAt(@Nonnull TileSpreader spreader, double d0, double d1, double d2, float ticks, int digProgress, float unused) {
|
||||
if(!spreader.getWorld().isBlockLoaded(spreader.getPos(), false)
|
||||
|| spreader.getWorld().getBlockState(spreader.getPos()).getBlock() != ModBlocks.spreader)
|
||||
return;
|
||||
|
||||
@@ -18,6 +18,7 @@ import javax.annotation.Nonnull;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.ActiveRenderInfo;
|
||||
import net.minecraft.client.renderer.BufferBuilder;
|
||||
import net.minecraft.client.renderer.GLAllocation;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
@@ -38,7 +39,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer<TileStarfield
|
||||
private FloatBuffer buffer = GLAllocation.createDirectFloatBuffer(16);
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(@Nonnull TileStarfield starfield, double x, double y, double z, float partialTicks, int destroyStage)
|
||||
public void renderTileEntityAt(@Nonnull TileStarfield starfield, double x, double y, double z, float partialTicks, int destroyStage, float unused)
|
||||
{
|
||||
GlStateManager.disableLighting();
|
||||
RANDOM.setSeed(31100L);
|
||||
@@ -97,7 +98,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer<TileStarfield
|
||||
GlStateManager.multMatrix(PROJECTION);
|
||||
GlStateManager.multMatrix(MODELVIEW);
|
||||
Tessellator tessellator = Tessellator.getInstance();
|
||||
VertexBuffer vertexbuffer = tessellator.getBuffer();
|
||||
BufferBuilder vertexbuffer = tessellator.getBuffer();
|
||||
vertexbuffer.begin(7, DefaultVertexFormats.POSITION_COLOR);
|
||||
float f3 = (RANDOM.nextFloat() * 0.5F + 0.1F) * f1;
|
||||
float f4 = (RANDOM.nextFloat() * 0.5F + 0.4F) * f1;
|
||||
|
||||
@@ -31,7 +31,7 @@ import vazkii.botania.common.block.tile.TileTerraPlate;
|
||||
public class RenderTileTerraPlate extends TileEntitySpecialRenderer<TileTerraPlate> {
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(@Nonnull TileTerraPlate plate, double d0, double d1, double d2, float f, int digProgress) {
|
||||
public void renderTileEntityAt(@Nonnull TileTerraPlate plate, double d0, double d1, double d2, float f, int digProgress, float unused) {
|
||||
float max = TileTerraPlate.MAX_MANA / 10F;
|
||||
float alphaMod = Math.min(max, plate.getCurrentMana()) / max;
|
||||
GlStateManager.pushMatrix();
|
||||
|
||||
@@ -33,7 +33,7 @@ public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer<TileTeruTe
|
||||
final ModelTeruTeruBozu model = new ModelTeruTeruBozu();
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(@Nullable TileTeruTeruBozu tileentity, double d0, double d1, double d2, float f, int digProgress) {
|
||||
public void renderTileEntityAt(@Nullable TileTeruTeruBozu tileentity, double d0, double d1, double d2, float f, int digProgress, float unused) {
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.enableBlend();
|
||||
|
||||
@@ -16,6 +16,7 @@ import javax.annotation.Nonnull;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.BufferBuilder;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
@@ -65,7 +66,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(@Nonnull TileTinyPotato potato, double x, double y, double z, float partialTicks, int destroyStage) {
|
||||
public void renderTileEntityAt(@Nonnull TileTinyPotato potato, double x, double y, double z, float partialTicks, int destroyStage, float unused) {
|
||||
if(!potato.getWorld().isBlockLoaded(potato.getPos(), false)
|
||||
|| potato.getWorld().getBlockState(potato.getPos()).getBlock() != ModBlocks.tinyPotato)
|
||||
return;
|
||||
@@ -305,10 +306,10 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
|
||||
GlStateManager.enableBlend();
|
||||
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
|
||||
Tessellator tessellator = Tessellator.getInstance();
|
||||
VertexBuffer worldrenderer = tessellator.getBuffer();
|
||||
BufferBuilder worldrenderer = tessellator.getBuffer();
|
||||
GlStateManager.disableTexture2D();
|
||||
worldrenderer.begin(7, DefaultVertexFormats.POSITION_COLOR);
|
||||
int i = mc.fontRendererObj.getStringWidth(potato.name) / 2;
|
||||
int i = mc.fontRenderer.getStringWidth(potato.name) / 2;
|
||||
worldrenderer.pos(-i - 1, -1.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
|
||||
worldrenderer.pos(-i - 1, 8.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
|
||||
worldrenderer.pos(i + 1, 8.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
|
||||
@@ -316,7 +317,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
|
||||
tessellator.draw();
|
||||
GlStateManager.enableTexture2D();
|
||||
GlStateManager.depthMask(true);
|
||||
mc.fontRendererObj.drawString(potato.name, -mc.fontRendererObj.getStringWidth(potato.name) / 2, 0, 0xFFFFFF);
|
||||
mc.fontRenderer.drawString(potato.name, -mc.fontRenderer.getStringWidth(potato.name) / 2, 0, 0xFFFFFF);
|
||||
if (name.equals("pahimar") || name.equals("soaryn")) {
|
||||
GlStateManager.translate(0F, 14F, 0F);
|
||||
String str = name.equals("pahimar") ? "[WIP]" : "(soon)";
|
||||
@@ -325,7 +326,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
|
||||
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
|
||||
GlStateManager.disableTexture2D();
|
||||
worldrenderer.begin(7, DefaultVertexFormats.POSITION_COLOR);
|
||||
i = mc.fontRendererObj.getStringWidth(str) / 2;
|
||||
i = mc.fontRenderer.getStringWidth(str) / 2;
|
||||
worldrenderer.pos(-i - 1, -1.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
|
||||
worldrenderer.pos(-i - 1, 8.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
|
||||
worldrenderer.pos(i + 1, 8.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
|
||||
@@ -333,7 +334,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
|
||||
tessellator.draw();
|
||||
GlStateManager.enableTexture2D();
|
||||
GlStateManager.depthMask(true);
|
||||
mc.fontRendererObj.drawString(str, -mc.fontRendererObj.getStringWidth(str) / 2, 0, 0xFFFFFF);
|
||||
mc.fontRenderer.drawString(str, -mc.fontRenderer.getStringWidth(str) / 2, 0, 0xFFFFFF);
|
||||
}
|
||||
|
||||
GlStateManager.enableLighting();
|
||||
|
||||
@@ -239,10 +239,10 @@ public class SubTileHopperhock extends SubTileFunctional {
|
||||
String filter = I18n.format("botaniamisc.filter" + filterType);
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(filter) / 2;
|
||||
int x = res.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(filter) / 2;
|
||||
int y = res.getScaledHeight() / 2 + 30;
|
||||
|
||||
mc.fontRendererObj.drawStringWithShadow(filter, x, y, color);
|
||||
mc.fontRenderer.drawStringWithShadow(filter, x, y, color);
|
||||
GlStateManager.disableBlend();
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -182,11 +182,11 @@ public class SubTileRannuncarpus extends SubTileFunctional {
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
if(!recieverStack.isEmpty()) {
|
||||
String stackName = recieverStack.getDisplayName();
|
||||
int width = 16 + mc.fontRendererObj.getStringWidth(stackName) / 2;
|
||||
int width = 16 + mc.fontRenderer.getStringWidth(stackName) / 2;
|
||||
int x = res.getScaledWidth() / 2 - width;
|
||||
int y = res.getScaledHeight() / 2 + 30;
|
||||
|
||||
mc.fontRendererObj.drawStringWithShadow(stackName, x + 20, y + 5, color);
|
||||
mc.fontRenderer.drawStringWithShadow(stackName, x + 20, y + 5, color);
|
||||
RenderHelper.enableGUIStandardItemLighting();
|
||||
mc.getRenderItem().renderItemAndEffectIntoGUI(recieverStack, x, y);
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
|
||||
@@ -112,11 +112,11 @@ public class SubTileSpectrolus extends SubTileGenerating {
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
if(!stack.isEmpty()) {
|
||||
String stackName = stack.getDisplayName();
|
||||
int width = 16 + mc.fontRendererObj.getStringWidth(stackName) / 2;
|
||||
int width = 16 + mc.fontRenderer.getStringWidth(stackName) / 2;
|
||||
int x = res.getScaledWidth() / 2 - width;
|
||||
int y = res.getScaledHeight() / 2 + 30;
|
||||
|
||||
mc.fontRendererObj.drawStringWithShadow(stackName, x + 20, y + 5, color);
|
||||
mc.fontRenderer.drawStringWithShadow(stackName, x + 20, y + 5, color);
|
||||
RenderHelper.enableGUIStandardItemLighting();
|
||||
mc.getRenderItem().renderItemAndEffectIntoGUI(stack, x, y);
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
|
||||
@@ -364,7 +364,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary {
|
||||
mc.getRenderItem().renderItemIntoGUI(stack, xc + radius + 32, yc - 8);
|
||||
mc.getRenderItem().renderItemIntoGUI(new ItemStack(Items.WHEAT_SEEDS), xc + radius + 16, yc + 6);
|
||||
net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
|
||||
mc.fontRendererObj.drawStringWithShadow("+", xc + radius + 14, yc + 10, 0xFFFFFF);
|
||||
mc.fontRenderer.drawStringWithShadow("+", xc + radius + 14, yc + 10, 0xFFFFFF);
|
||||
}
|
||||
|
||||
net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting();
|
||||
@@ -380,9 +380,9 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary {
|
||||
net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
|
||||
} else if(recipeKeepTicks > 0 && hasWater) {
|
||||
String s = I18n.format("botaniamisc.altarRefill0");
|
||||
mc.fontRendererObj.drawStringWithShadow(s, xc - mc.fontRendererObj.getStringWidth(s) / 2, yc + 10, 0xFFFFFF);
|
||||
mc.fontRenderer.drawStringWithShadow(s, xc - mc.fontRenderer.getStringWidth(s) / 2, yc + 10, 0xFFFFFF);
|
||||
s = I18n.format("botaniamisc.altarRefill1");
|
||||
mc.fontRendererObj.drawStringWithShadow(s, xc - mc.fontRendererObj.getStringWidth(s) / 2, yc + 20, 0xFFFFFF);
|
||||
mc.fontRenderer.drawStringWithShadow(s, xc - mc.fontRenderer.getStringWidth(s) / 2, yc + 20, 0xFFFFFF);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -112,7 +112,7 @@ public class TileAnimatedTorch extends TileMod {
|
||||
int y = res.getScaledHeight() / 2 - 8;
|
||||
|
||||
mc.getRenderItem().renderItemAndEffectIntoGUI(new ItemStack(Blocks.REDSTONE_TORCH), x, y);
|
||||
mc.fontRendererObj.drawStringWithShadow(I18n.translateToLocal("botania.animatedTorch." + torchMode.name().toLowerCase()), x + 18, y + 6, 0xFF4444);
|
||||
mc.fontRenderer.drawStringWithShadow(I18n.translateToLocal("botania.animatedTorch." + torchMode.name().toLowerCase()), x + 18, y + 6, 0xFF4444);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -192,13 +192,13 @@ public class TileHourglass extends TileSimpleInventory {
|
||||
RenderHelper.enableGUIStandardItemLighting();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
mc.getRenderItem().renderItemIntoGUI(stack, x, y);
|
||||
mc.getRenderItem().renderItemOverlays(mc.fontRendererObj, stack, x, y);
|
||||
mc.getRenderItem().renderItemOverlays(mc.fontRenderer, stack, x, y);
|
||||
GlStateManager.disableRescaleNormal();
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
|
||||
int time = getTotalTime();
|
||||
String timeStr = StringUtils.ticksToElapsedTime(time);
|
||||
mc.fontRendererObj.drawStringWithShadow(timeStr, x + 20, y, getColor());
|
||||
mc.fontRenderer.drawStringWithShadow(timeStr, x + 20, y, getColor());
|
||||
|
||||
String status = "";
|
||||
if(lock)
|
||||
@@ -206,7 +206,7 @@ public class TileHourglass extends TileSimpleInventory {
|
||||
if(!move)
|
||||
status = status.isEmpty() ? "stopped" : "lockedStopped";
|
||||
if(!status.isEmpty())
|
||||
mc.fontRendererObj.drawStringWithShadow(I18n.format("botaniamisc." + status), x + 20, y + 12, getColor());
|
||||
mc.fontRenderer.drawStringWithShadow(I18n.format("botaniamisc." + status), x + 20, y + 12, getColor());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -372,7 +372,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver
|
||||
net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
|
||||
|
||||
if(progress == 1F)
|
||||
mc.fontRendererObj.drawStringWithShadow("+", xc + radius + 14, yc + 12, 0xFFFFFF);
|
||||
mc.fontRenderer.drawStringWithShadow("+", xc + radius + 14, yc + 12, 0xFFFFFF);
|
||||
}
|
||||
|
||||
net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting();
|
||||
@@ -388,9 +388,9 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver
|
||||
net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
|
||||
} else if(recipeKeepTicks > 0) {
|
||||
String s = I18n.format("botaniamisc.altarRefill0");
|
||||
mc.fontRendererObj.drawStringWithShadow(s, xc - mc.fontRendererObj.getStringWidth(s) / 2, yc + 10, 0xFFFFFF);
|
||||
mc.fontRenderer.drawStringWithShadow(s, xc - mc.fontRenderer.getStringWidth(s) / 2, yc + 10, 0xFFFFFF);
|
||||
s = I18n.format("botaniamisc.altarRefill1");
|
||||
mc.fontRendererObj.drawStringWithShadow(s, xc - mc.fontRendererObj.getStringWidth(s) / 2, yc + 20, 0xFFFFFF);
|
||||
mc.fontRenderer.drawStringWithShadow(s, xc - mc.fontRenderer.getStringWidth(s) / 2, yc + 20, 0xFFFFFF);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -582,11 +582,11 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
String lensName = lens.getDisplayName();
|
||||
int width = 16 + mc.fontRendererObj.getStringWidth(lensName) / 2;
|
||||
int width = 16 + mc.fontRenderer.getStringWidth(lensName) / 2;
|
||||
int x = res.getScaledWidth() / 2 - width;
|
||||
int y = res.getScaledHeight() / 2 + 50;
|
||||
|
||||
mc.fontRendererObj.drawStringWithShadow(lensName, x + 20, y + 5, color);
|
||||
mc.fontRenderer.drawStringWithShadow(lensName, x + 20, y + 5, color);
|
||||
RenderHelper.enableGUIStandardItemLighting();
|
||||
mc.getRenderItem().renderItemAndEffectIntoGUI(lens, x, y);
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
@@ -601,11 +601,11 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
if(!recieverStack.isEmpty()) {
|
||||
String stackName = recieverStack.getDisplayName();
|
||||
int width = 16 + mc.fontRendererObj.getStringWidth(stackName) / 2;
|
||||
int width = 16 + mc.fontRenderer.getStringWidth(stackName) / 2;
|
||||
int x = res.getScaledWidth() / 2 - width;
|
||||
int y = res.getScaledHeight() / 2 + 30;
|
||||
|
||||
mc.fontRendererObj.drawStringWithShadow(stackName, x + 20, y + 5, color);
|
||||
mc.fontRenderer.drawStringWithShadow(stackName, x + 20, y + 5, color);
|
||||
RenderHelper.enableGUIStandardItemLighting();
|
||||
mc.getRenderItem().renderItemAndEffectIntoGUI(recieverStack, x, y);
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
|
||||
@@ -85,11 +85,11 @@ public class TileTurntable extends TileMod {
|
||||
for(int i = 0; i < this.speed; i++)
|
||||
speed = speed + motion;
|
||||
|
||||
int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(speed) / 2;
|
||||
int x = res.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(speed) / 2;
|
||||
int y = res.getScaledHeight() / 2 - 15;
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
mc.fontRendererObj.drawStringWithShadow(speed, x, y, color);
|
||||
mc.fontRenderer.drawStringWithShadow(speed, x, y, color);
|
||||
GlStateManager.disableBlend();
|
||||
}
|
||||
|
||||
|
||||
@@ -998,10 +998,10 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss {
|
||||
mc.getRenderItem().renderItemIntoGUI(stack, px, py);
|
||||
net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
|
||||
|
||||
boolean unicode = mc.fontRendererObj.getUnicodeFlag();
|
||||
mc.fontRendererObj.setUnicodeFlag(true);
|
||||
mc.fontRendererObj.drawStringWithShadow("" + getPlayerCount(), px + 15, py + 4, 0xFFFFFF);
|
||||
mc.fontRendererObj.setUnicodeFlag(unicode);
|
||||
boolean unicode = mc.fontRenderer.getUnicodeFlag();
|
||||
mc.fontRenderer.setUnicodeFlag(true);
|
||||
mc.fontRenderer.drawStringWithShadow("" + getPlayerCount(), px + 15, py + 4, 0xFFFFFF);
|
||||
mc.fontRenderer.setUnicodeFlag(unicode);
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
return 5;
|
||||
|
||||
@@ -535,7 +535,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement {
|
||||
|
||||
if(slot == 0) {
|
||||
String name = craftingTable.getDisplayName();
|
||||
int l = mc.fontRendererObj.getStringWidth(name);
|
||||
int l = mc.fontRenderer.getStringWidth(name);
|
||||
int x = resolution.getScaledWidth() / 2 - l / 2;
|
||||
int y = resolution.getScaledHeight() / 2 - 65;
|
||||
|
||||
@@ -546,7 +546,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement {
|
||||
mc.getRenderItem().renderItemAndEffectIntoGUI(craftingTable, resolution.getScaledWidth() / 2 - 8, resolution.getScaledHeight() / 2 - 52);
|
||||
net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
|
||||
|
||||
mc.fontRendererObj.drawStringWithShadow(name, x, y, 0xFFFFFF);
|
||||
mc.fontRenderer.drawStringWithShadow(name, x, y, 0xFFFFFF);
|
||||
} else {
|
||||
ItemStack[] recipe = getCraftingItems(stack, slot);
|
||||
String label = I18n.format("botaniamisc.unsetRecipe");
|
||||
@@ -591,7 +591,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement {
|
||||
}
|
||||
|
||||
mc.getRenderItem().renderItemAndEffectIntoGUI(recipe[9], x + 72, y + 18);
|
||||
mc.getRenderItem().renderItemOverlays(mc.fontRendererObj, recipe[9], x + 72, y + 18);
|
||||
mc.getRenderItem().renderItemOverlays(mc.fontRenderer, recipe[9], x + 72, y + 18);
|
||||
|
||||
net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
|
||||
}
|
||||
@@ -599,11 +599,11 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement {
|
||||
int yoff = 110;
|
||||
if(setRecipe && !canCraft(recipe, getFakeInv(player))) {
|
||||
String warning = TextFormatting.RED + I18n.format("botaniamisc.cantCraft");
|
||||
mc.fontRendererObj.drawStringWithShadow(warning, resolution.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(warning) / 2, resolution.getScaledHeight() / 2 - yoff, 0xFFFFFF);
|
||||
mc.fontRenderer.drawStringWithShadow(warning, resolution.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(warning) / 2, resolution.getScaledHeight() / 2 - yoff, 0xFFFFFF);
|
||||
yoff += 12;
|
||||
}
|
||||
|
||||
mc.fontRendererObj.drawStringWithShadow(label, resolution.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(label) / 2, resolution.getScaledHeight() / 2 - yoff, 0xFFFFFF);
|
||||
mc.fontRenderer.drawStringWithShadow(label, resolution.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(label) / 2, resolution.getScaledHeight() / 2 - yoff, 0xFFFFFF);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -151,7 +151,7 @@ public class ItemSextant extends ItemMod {
|
||||
|
||||
if(onUse == stack && stack.getItem().getMaxItemUseDuration(stack) - time >= 10) {
|
||||
double radius = calculateRadius(stack, player);
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRendererObj;
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRenderer;
|
||||
int x = resolution.getScaledWidth() / 2 + 30;
|
||||
int y = resolution.getScaledHeight() / 2;
|
||||
|
||||
|
||||
@@ -99,7 +99,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm
|
||||
mc.getRenderItem().renderItemAndEffectIntoGUI(dispStack, x, y);
|
||||
net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
|
||||
|
||||
mc.fontRendererObj.drawStringWithShadow(text, x + 20, y + 4, 0xFFFFFF);
|
||||
mc.fontRenderer.drawStringWithShadow(text, x + 20, y + 4, 0xFFFFFF);
|
||||
}
|
||||
|
||||
public static boolean hasMonocle(EntityPlayer player) {
|
||||
|
||||
@@ -50,7 +50,7 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage {
|
||||
int y = gui.getTop() + 12;
|
||||
|
||||
Brew brew = recipe.getBrew();
|
||||
FontRenderer renderer = Minecraft.getMinecraft().fontRendererObj;
|
||||
FontRenderer renderer = Minecraft.getMinecraft().fontRenderer;
|
||||
boolean unicode = renderer.getUnicodeFlag();
|
||||
renderer.setUnicodeFlag(true);
|
||||
String s = TextFormatting.BOLD + I18n.format("botaniamisc.brewOf", I18n.format(brew.getUnlocalizedName()));
|
||||
|
||||
@@ -74,7 +74,7 @@ public class PageManaInfusionRecipe extends PageRecipe {
|
||||
public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) {
|
||||
RecipeManaInfusion recipe = recipes.get(recipeAt);
|
||||
TextureManager render = Minecraft.getMinecraft().renderEngine;
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRendererObj;
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRenderer;
|
||||
|
||||
Object input = recipe.getInput();
|
||||
if(input instanceof String)
|
||||
|
||||
@@ -84,7 +84,7 @@ public class PageMultiblock extends LexiconPage {
|
||||
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRendererObj;
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRenderer;
|
||||
boolean unicode = font.getUnicodeFlag();
|
||||
String s = TextFormatting.BOLD + I18n.format(getUnlocalizedName());
|
||||
font.setUnicodeFlag(true);
|
||||
|
||||
@@ -99,7 +99,7 @@ public class PagePetalRecipe<T extends RecipePetals> extends PageRecipe {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void renderManaBar(IGuiLexiconEntry gui, T recipe, int mx, int my) {
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRendererObj;
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRenderer;
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
|
||||
|
||||
@@ -147,7 +147,7 @@ public class PageRecipe extends LexiconPage {
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(xPos, yPos, 0);
|
||||
render.renderItemAndEffectIntoGUI(stack, 0, 0);
|
||||
render.renderItemOverlays(Minecraft.getMinecraft().fontRendererObj, stack, 0, 0);
|
||||
render.renderItemOverlays(Minecraft.getMinecraft().fontRenderer, stack, 0, 0);
|
||||
GlStateManager.popMatrix();
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
@@ -45,7 +45,7 @@ public class PageRuneRecipe extends PagePetalRecipe<RecipeRuneAltar> {
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void renderManaBar(IGuiLexiconEntry gui, RecipeRuneAltar recipe, int mx, int my) {
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRendererObj;
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRenderer;
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
String manaUsage = I18n.format("botaniamisc.manaUsage");
|
||||
|
||||
@@ -121,7 +121,7 @@ public class PageShedding extends PageEntity {
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.enableDepth();
|
||||
render.renderItemAndEffectIntoGUI(stack, xPos, yPos);
|
||||
render.renderItemOverlays(Minecraft.getMinecraft().fontRendererObj, stack, xPos, yPos);
|
||||
render.renderItemOverlays(Minecraft.getMinecraft().fontRenderer, stack, xPos, yPos);
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@ public class PageText extends LexiconPage {
|
||||
y += 10;
|
||||
width -= 4;
|
||||
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRendererObj;
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRenderer;
|
||||
boolean unicode = font.getUnicodeFlag();
|
||||
if(useUnicode)
|
||||
font.setUnicodeFlag(true);
|
||||
|
||||
Reference in new issue
Block a user