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 e569972b6..4ea0dd2af 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -11,6 +11,7 @@ package vazkii.botania.client.gui.lexicon; import java.awt.Desktop; +import java.io.IOException; import java.net.URI; import java.util.ArrayDeque; import java.util.ArrayList; @@ -294,7 +295,7 @@ public class GuiLexicon extends GuiScreen { public void drawBookmark(int x, int y, String s, boolean drawLeft, int color) { // This function is called from the buttons so I can't use fontRendererObj - FontRenderer font = Minecraft.getMinecraft().fontRenderer; + FontRenderer font = Minecraft.getMinecraft().fontRendererObj; boolean unicode = font.getUnicodeFlag(); font.setUnicodeFlag(true); int l = font.getStringWidth(s); @@ -424,7 +425,7 @@ public class GuiLexicon extends GuiScreen { public int bookmarkWidth(String b) { if(fontRendererObj == null) - fontRendererObj = Minecraft.getMinecraft().fontRenderer; + fontRendererObj = Minecraft.getMinecraft().fontRendererObj; boolean unicode = fontRendererObj.getUnicodeFlag(); fontRendererObj.setUnicodeFlag(true); @@ -557,7 +558,7 @@ public class GuiLexicon extends GuiScreen { } @Override - protected void keyTyped(char par1, int par2) { + protected void keyTyped(char par1, int par2) throws IOException { handleNoteKey(par1, par2); if(!notesEnabled && closeScreenOnInvKey() && mc.gameSettings.keyBindInventory.getKeyCode() == par2) { @@ -568,7 +569,7 @@ public class GuiLexicon extends GuiScreen { if(par2 == KONAMI_CODE[konamiIndex]) { konamiIndex++; if(konamiIndex >= KONAMI_CODE.length) { - mc.getSoundHandler().playSound(PositionedSoundRecord.func_147673_a(new ResourceLocation("botania:way"))); + mc.getSoundHandler().playSound(PositionedSoundRecord.create(new ResourceLocation("botania:way"))); konamiIndex = 0; } } else konamiIndex = 0; 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 5f852aedc..879d6e50a 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java @@ -27,6 +27,8 @@ import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.gui.lexicon.button.GuiButtonBack; import vazkii.botania.common.lexicon.page.PageText; +import java.io.IOException; + public class GuiLexiconChallenge extends GuiLexicon implements IParented { private static final String TAG_CHALLENGE = "challenge"; @@ -65,7 +67,7 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented { RenderHelper.enableGUIStandardItemLighting(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - RenderItem.getInstance().renderItemIntoGUI(fontRendererObj, mc.renderEngine, challenge.icon, left + 18, top + 15); + mc.getRenderItem().renderItemIntoGUI(challenge.icon, left + 18, top + 15); RenderHelper.disableStandardItemLighting(); GL11.glEnable(GL11.GL_BLEND); @@ -95,7 +97,7 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented { } @Override - protected void mouseClicked(int par1, int par2, int par3) { + protected void mouseClicked(int par1, int par2, int par3) throws IOException { super.mouseClicked(par1, par2, par3); if(par3 == 1) @@ -124,7 +126,7 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented { void back() { if(backButton.enabled) { actionPerformed(backButton); - backButton.func_146113_a(mc.getSoundHandler()); + backButton.playPressSound(mc.getSoundHandler()); } } 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 66484f628..f8d29c09c 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java @@ -10,6 +10,7 @@ */ package vazkii.botania.client.gui.lexicon; +import java.io.IOException; import java.util.List; import net.minecraft.client.gui.GuiButton; @@ -84,7 +85,7 @@ public class GuiLexiconChallengesList extends GuiLexicon implements IParented { } @Override - protected void mouseClicked(int par1, int par2, int par3) { + protected void mouseClicked(int par1, int par2, int par3) throws IOException { super.mouseClicked(par1, par2, par3); if(par3 == 1) @@ -108,7 +109,7 @@ public class GuiLexiconChallengesList extends GuiLexicon implements IParented { void back() { if(backButton.enabled) { actionPerformed(backButton); - backButton.func_146113_a(mc.getSoundHandler()); + backButton.playPressSound(mc.getSoundHandler()); } } 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 80eb85c29..79bdeece0 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java @@ -11,6 +11,7 @@ package vazkii.botania.client.gui.lexicon; import java.awt.Desktop; +import java.io.IOException; import java.net.URI; import java.util.List; @@ -272,7 +273,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa } @Override - protected void mouseClicked(int par1, int par2, int par3) { + protected void mouseClicked(int par1, int par2, int par3) throws IOException { super.mouseClicked(par1, par2, par3); fx = par1; @@ -290,7 +291,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa } @Override - public void handleMouseInput() { + public void handleMouseInput() throws IOException { super.handleMouseInput(); if(Mouse.getEventButton() == 0) @@ -328,14 +329,14 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa void back() { if(backButton.enabled) { actionPerformed(backButton); - backButton.func_146113_a(mc.getSoundHandler()); + backButton.playPressSound(mc.getSoundHandler()); } } void nextPage() { if(rightButton.enabled) { actionPerformed(rightButton); - rightButton.func_146113_a(mc.getSoundHandler()); + rightButton.playPressSound(mc.getSoundHandler()); updateNote(); } } @@ -343,7 +344,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa void prevPage() { if(leftButton.enabled) { actionPerformed(leftButton); - leftButton.func_146113_a(mc.getSoundHandler()); + leftButton.playPressSound(mc.getSoundHandler()); updateNote(); } } @@ -400,7 +401,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa @Override public GuiLexicon copy() { - GuiLexiconEntry gui = new GuiLexiconEntry(entry, new GuiScreen()); + GuiLexiconEntry gui = new GuiLexiconEntry(entry, new GuiScreen() {}); // todo 1.8 check anonymous class gui.page = page; gui.setTitle(); return gui; 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 eb1296bf3..e2cafe235 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -10,6 +10,7 @@ */ package vazkii.botania.client.gui.lexicon; +import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -107,7 +108,8 @@ 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(fontRendererObj, left + guiWidth / 2 + 28, top + guiHeight + 6, 200, 10); + // todo 1.8 verify componentID + searchField = new GuiTextField(15, fontRendererObj, left + guiWidth / 2 + 28, top + guiHeight + 6, 200, 10); searchField.setCanLoseFocus(false); searchField.setFocused(true); searchField.setEnableBackgroundDrawing(false); @@ -214,15 +216,15 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { GL11.glEnable(GL12.GL_RESCALE_NORMAL); ItemStack paper = new ItemStack(Items.paper, currentEntry.pages.size()); - RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, paper, 14, -28); - RenderItem.getInstance().renderItemOverlayIntoGUI(mc.fontRenderer, mc.renderEngine, paper, 14, -28); + mc.getRenderItem().renderItemAndEffectIntoGUI(paper, 14, -28); + mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, paper, 14, -28, ""); // todo 1.8 text List stacks = currentEntry.getDisplayedRecipes(); if(stacks.size() > 0) { int spaceForEach = Math.min(18, (width - 30) / stacks.size()); for(int i = 0; i < stacks.size(); i++) { ItemStack stack = stacks.get(i); - RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, stack, 38 + spaceForEach * i, -28); + mc.getRenderItem().renderItemAndEffectIntoGUI(stack, 38 + spaceForEach * i, -28); } } @@ -330,7 +332,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { } @Override - protected void mouseClicked(int par1, int par2, int par3) { + protected void mouseClicked(int par1, int par2, int par3) throws IOException { super.mouseClicked(par1, par2, par3); searchField.mouseClicked(par1, par2, par3); @@ -349,7 +351,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { } @Override - public void handleMouseInput() { + public void handleMouseInput() throws IOException { super.handleMouseInput(); if(Mouse.getEventButton() == 0) @@ -394,21 +396,21 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { void back() { if(backButton.enabled) { actionPerformed(backButton); - backButton.func_146113_a(mc.getSoundHandler()); + backButton.playPressSound(mc.getSoundHandler()); } } void nextPage() { if(rightButton.enabled) { actionPerformed(rightButton); - rightButton.func_146113_a(mc.getSoundHandler()); + rightButton.playPressSound(mc.getSoundHandler()); } } void prevPage() { if(leftButton.enabled) { actionPerformed(leftButton); - leftButton.func_146113_a(mc.getSoundHandler()); + leftButton.playPressSound(mc.getSoundHandler()); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java index 822add343..9284737f5 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java @@ -30,8 +30,8 @@ public class GuiButtonAchievement extends GuiButtonLexicon { @Override public void drawButton(Minecraft par1Minecraft, int par2, int par3) { - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GL11.glColor4f(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java index 465127cad..1c2d07a52 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java @@ -29,8 +29,8 @@ public class GuiButtonBack extends GuiButtonLexicon { @Override public void drawButton(Minecraft par1Minecraft, int par2, int par3) { - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GL11.glColor4f(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java index 8f972bb1e..ab0c49fcc 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java @@ -21,8 +21,8 @@ public class GuiButtonBookmark extends GuiButtonLexicon { @Override public void drawButton(Minecraft mc, int par2, int par3) { gui.drawBookmark(xPosition, yPosition, displayString, false); - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); List tooltip = new ArrayList(); if(displayString.equals("+")) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java index e3fe060c9..92c71b23d 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java @@ -35,12 +35,12 @@ public class GuiButtonChallengeIcon extends GuiButtonLexicon { @Override public void drawButton(Minecraft par1Minecraft, int par2, int par3) { - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); RenderHelper.enableGUIStandardItemLighting(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - RenderItem.getInstance().renderItemIntoGUI(par1Minecraft.fontRenderer, par1Minecraft.renderEngine, challenge.icon, xPosition, yPosition); + par1Minecraft.getRenderItem().renderItemIntoGUI(challenge.icon, xPosition, yPosition); RenderHelper.disableStandardItemLighting(); GL11.glEnable(GL11.GL_BLEND); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java index 0dd4fe65a..2d7d6fffa 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java @@ -30,8 +30,8 @@ public class GuiButtonChallengeInfo extends GuiButtonLexicon { @Override public void drawButton(Minecraft mc, int par2, int par3) { gui.drawBookmark(xPosition, yPosition, displayString, false); - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); List tooltip = new ArrayList(); tooltip.add(StatCollector.translateToLocal("botaniamisc.challengeInfo")); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java index 826dfa2c5..816ce512a 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java @@ -30,8 +30,8 @@ public class GuiButtonChallenges extends GuiButtonLexicon { @Override public void drawButton(Minecraft par1Minecraft, int par2, int par3) { - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GL11.glColor4f(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java index 1b2646b9e..03404cc16 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java @@ -35,13 +35,13 @@ public class GuiButtonDoot extends GuiButtonLexicon { @Override public void drawButton(Minecraft par1Minecraft, int par2, int par3) { - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); - par1Minecraft.renderEngine.bindTexture(TextureMap.locationItemsTexture); + par1Minecraft.renderEngine.bindTexture(TextureMap.locationBlocksTexture); GL11.glColor4f(1F, 1F, 1F, 1F); - RenderItem.getInstance().renderItemIntoGUI(par1Minecraft.fontRenderer, par1Minecraft.renderEngine, new ItemStack(ModItems.cacophonium), xPosition, yPosition); - RenderItem.getInstance().renderItemIntoGUI(par1Minecraft.fontRenderer, par1Minecraft.renderEngine, new ItemStack(Items.fireworks), xPosition + 8, yPosition + 2); + par1Minecraft.getRenderItem().renderItemIntoGUI(new ItemStack(ModItems.cacophonium), xPosition, yPosition); + par1Minecraft.getRenderItem().renderItemIntoGUI(new ItemStack(Items.fireworks), xPosition + 8, yPosition + 2); GL11.glDisable(GL11.GL_LIGHTING); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java index b5f1fd75e..98c9780cc 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java @@ -31,8 +31,8 @@ public class GuiButtonHistory extends GuiButtonLexicon { @Override public void drawButton(Minecraft mc, int par2, int par3) { gui.drawBookmark(xPosition, yPosition, displayString, false); - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); List tooltip = new ArrayList(); tooltip.add(StatCollector.translateToLocal("botaniamisc.historyLong")); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java index 0e2e4191a..6f9d84422 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java @@ -37,8 +37,8 @@ public class GuiButtonInvisible extends GuiButtonLexicon { @Override public void drawButton(Minecraft par1Minecraft, int par2, int par3) { - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); boolean showStack = displayStack != null && !displayString.isEmpty(); if(!displayString.isEmpty() && k == 2) { @@ -59,7 +59,7 @@ public class GuiButtonInvisible extends GuiButtonLexicon { key = format.charAt(1); for(EnumChatFormatting ecf : EnumChatFormatting.class.getEnumConstants()) - if(ecf.getFormattingCode() == key) { + if(ecf.toString().indexOf(ecf.toString().length() - 1) == key) { // todo 1.8 recheck (want last char of code) if(ecf.ordinal() > 15) ecf = EnumChatFormatting.BLACK; color = LibMisc.CONTROL_CODE_COLORS[ecf.ordinal()]; @@ -81,7 +81,7 @@ public class GuiButtonInvisible extends GuiButtonLexicon { GL11.glScalef(0.5F, 0.5F, 0.5F); RenderHelper.enableGUIStandardItemLighting(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - RenderItem.getInstance().renderItemIntoGUI(par1Minecraft.fontRenderer, par1Minecraft.renderEngine, displayStack, xPosition * 2 - 6, yPosition * 2 + 4); + par1Minecraft.getRenderItem().renderItemIntoGUI(displayStack, xPosition * 2 - 6, yPosition * 2 + 4); RenderHelper.disableStandardItemLighting(); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java index b352679b9..56e717a22 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java @@ -22,8 +22,8 @@ public class GuiButtonLexicon extends GuiButton { } @Override - public void func_146113_a(SoundHandler p_146113_1_) { - p_146113_1_.playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("botania:lexiconPage"), 1.0F)); + public void playPressSound(SoundHandler p_146113_1_) { + p_146113_1_.playSound(PositionedSoundRecord.create(new ResourceLocation("botania:lexiconPage"), 1.0F)); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java index 26b3d4373..25ede9c6e 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java @@ -33,8 +33,8 @@ public class GuiButtonNotes extends GuiButtonLexicon { @Override public void drawButton(Minecraft par1Minecraft, int par2, int par3) { - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GL11.glColor4f(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java index 013f9bceb..476a85275 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java @@ -30,8 +30,8 @@ public class GuiButtonOptions extends GuiButtonLexicon { @Override public void drawButton(Minecraft par1Minecraft, int par2, int par3) { - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GL11.glColor4f(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java index fdd0bc7e8..fa2436b5c 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java @@ -32,8 +32,8 @@ public class GuiButtonPage extends GuiButtonLexicon { @Override public void drawButton(Minecraft par1Minecraft, int par2, int par3) { if(enabled) { - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GL11.glColor4f(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java index 339cc48dd..4ee5896d5 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java @@ -30,8 +30,8 @@ public class GuiButtonShare extends GuiButtonLexicon { @Override public void drawButton(Minecraft par1Minecraft, int par2, int par3) { - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GL11.glColor4f(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java index 7f50bc672..b1262f39c 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java @@ -35,8 +35,8 @@ public class GuiButtonUpdateWarning extends GuiButtonLexicon { if(!visible || !enabled) return; - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); boolean red = k == 2 || ClientTickHandler.ticksInGame % 10 < 5; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java index 3cfb30b45..0c1e39773 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java @@ -30,8 +30,8 @@ public class GuiButtonViewOnline extends GuiButtonLexicon { @Override public void drawButton(Minecraft par1Minecraft, int par2, int par3) { - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GL11.glColor4f(1F, 1F, 1F, 1F);