diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index 26c65833c..c248e88f5 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -257,15 +257,15 @@ public class GuiLexicon extends GuiScreen { } } - public void drawScreenAfterScale(int par1, int par2, float par3) { - float time = ClientTickHandler.ticksInGame + par3; - timeDelta = time - lastTime; + public void drawScreenAfterScale(int xCoord, int yCoord, float newPartialTicks) { + float time = ClientTickHandler.ticksInGame + newPartialTicks; + timeDelta = time - lastTime + newPartialTicks; lastTime = time; - partialTicks = par3; + partialTicks = newPartialTicks; GlStateManager.color(1F, 1F, 1F, 1F); mc.renderEngine.bindTexture(texture); - drawNotes(par3); + drawNotes(newPartialTicks); GlStateManager.color(1F, 1F, 1F, 1F); mc.renderEngine.bindTexture(texture); @@ -292,7 +292,7 @@ public class GuiLexicon extends GuiScreen { GlStateManager.color(1F, 1F, 1F, 1F); mc.renderEngine.bindTexture(texture); drawTexturedModalRect(left - 19, top + 42, 67, 180, 19, 26); - if(par1 >= left - 19 && par1 < left && par2 >= top + 62 && par2 < top + 88) { + if(xCoord >= left - 19 && xCoord < left && yCoord >= top + 62 && yCoord < top + 88) { mc.renderEngine.bindTexture(textureToff); GlStateManager.pushMatrix(); GlStateManager.scale(0.5F, 0.5F, 0.5F); @@ -302,24 +302,24 @@ public class GuiLexicon extends GuiScreen { int w = 256; int h = 152; - int x = (int) ((ClientTickHandler.ticksInGame + par3) * 6) % (width + w) - w; - int y = (int) (top + guiHeight / 2 - h / 4 + Math.sin((ClientTickHandler.ticksInGame + par3) / 6.0) * 40); + int x = (int) ((ClientTickHandler.ticksInGame + newPartialTicks) * 6) % (width + w) - w; + int y = (int) (top + guiHeight / 2 - h / 4 + Math.sin((ClientTickHandler.ticksInGame + newPartialTicks) / 6.0) * 40); drawTexturedModalRect(x * 2, y * 2, 0, 0, w, h); GlStateManager.disableBlend(); GlStateManager.popMatrix(); - RenderHelper.renderTooltip(par1, par2, Arrays.asList(TextFormatting.GOLD + "#goldfishchris", TextFormatting.AQUA + "IT SAYS MANUAL")); + RenderHelper.renderTooltip(xCoord, yCoord, Arrays.asList(TextFormatting.GOLD + "#goldfishchris", TextFormatting.AQUA + "IT SAYS MANUAL")); } } - super.drawScreen(par1, par2, par3); + super.drawScreen(xCoord, yCoord, newPartialTicks); if(hasTutorialArrow) { mc.renderEngine.bindTexture(texture); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.color(1F, 1F, 1F, 0.7F + (float) (Math.sin((ClientTickHandler.ticksInGame + par3) * 0.3F) + 1) * 0.15F); + GlStateManager.color(1F, 1F, 1F, 0.7F + (float) (Math.sin((ClientTickHandler.ticksInGame + newPartialTicks) * 0.3F) + 1) * 0.15F); drawTexturedModalRect(tutorialArrowX, tutorialArrowY, 20, 200, TUTORIAL_ARROW_WIDTH, TUTORIAL_ARROW_HEIGHT); GlStateManager.disableBlend(); } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java index 7c07451cc..3a6acdd1b 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java @@ -54,8 +54,8 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented { } @Override - public void drawScreenAfterScale(int par1, int par2, float par3) { - super.drawScreenAfterScale(par1, par2, par3); + public void drawScreenAfterScale(int xCoord, int yCoord, float newPartialTicks) { + super.drawScreenAfterScale(xCoord, yCoord, newPartialTicks); RenderHelper.enableGUIStandardItemLighting(); GlStateManager.enableRescaleNormal(); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java index e9e6eb05f..460b07c37 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java @@ -55,8 +55,8 @@ public class GuiLexiconChallengesList extends GuiLexicon implements IParented { } @Override - public void drawScreenAfterScale(int par1, int par2, float par3) { - super.drawScreenAfterScale(par1, par2, par3); + public void drawScreenAfterScale(int xCoord, int yCoord, float newPartialTicks) { + super.drawScreenAfterScale(xCoord, yCoord, newPartialTicks); boolean unicode = fontRenderer.getUnicodeFlag(); fontRenderer.setUnicodeFlag(true); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java index 71c72c6a7..4c7cb784a 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java @@ -192,11 +192,11 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa } @Override - public void drawScreenAfterScale(int par1, int par2, float par3) { - super.drawScreenAfterScale(par1, par2, par3); + public void drawScreenAfterScale(int xCoord, int yCoord, float newPartialTicks) { + super.drawScreenAfterScale(xCoord, yCoord, newPartialTicks); LexiconPage page = entry.pages.get(this.page); - page.renderScreen(this, par1, par2); + page.renderScreen(this, xCoord, yCoord); } @Override diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java index d5da87209..18fd3d127 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -28,7 +28,6 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.gui.lexicon.button.GuiButtonBack; import vazkii.botania.client.gui.lexicon.button.GuiButtonInvisible; import vazkii.botania.client.gui.lexicon.button.GuiButtonPage; -import vazkii.botania.common.Botania; import vazkii.botania.common.lexicon.DogLexiconEntry; import java.io.IOException; @@ -171,8 +170,8 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { } @Override - public void drawScreenAfterScale(int par1, int par2, float par3) { - super.drawScreenAfterScale(par1, par2, par3); + public void drawScreenAfterScale(int xCoord, int yCoord, float newPartialTicks) { + super.drawScreenAfterScale(xCoord, yCoord, newPartialTicks); if(!searchField.getText().isEmpty()) { drawBookmark(left + 138, top + guiHeight - 24, " " + searchField.getText(), false);