From 174fdfd2a5c9f1de733d2da72156b95819f740eb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 17 Jun 2017 08:59:48 -0500 Subject: [PATCH] More find-replace --- .../botania/client/gui/lexicon/GuiLexicon.java | 4 ++-- .../botania/client/gui/lexicon/GuiLexiconIndex.java | 8 ++++---- .../gui/lexicon/button/GuiButtonAchievement.java | 4 ++-- .../client/gui/lexicon/button/GuiButtonBack.java | 4 ++-- .../client/gui/lexicon/button/GuiButtonBookmark.java | 4 ++-- .../client/gui/lexicon/button/GuiButtonCategory.java | 4 ++-- .../gui/lexicon/button/GuiButtonChallengeIcon.java | 8 ++++---- .../gui/lexicon/button/GuiButtonChallengeInfo.java | 4 ++-- .../gui/lexicon/button/GuiButtonChallenges.java | 4 ++-- .../client/gui/lexicon/button/GuiButtonDoot.java | 8 ++++---- .../client/gui/lexicon/button/GuiButtonHistory.java | 4 ++-- .../gui/lexicon/button/GuiButtonInvisible.java | 12 ++++++------ .../client/gui/lexicon/button/GuiButtonNotes.java | 6 +++--- .../client/gui/lexicon/button/GuiButtonOptions.java | 4 ++-- .../client/gui/lexicon/button/GuiButtonPage.java | 4 ++-- .../gui/lexicon/button/GuiButtonScaleChange.java | 4 ++-- .../client/gui/lexicon/button/GuiButtonShare.java | 4 ++-- .../gui/lexicon/button/GuiButtonUpdateWarning.java | 4 ++-- .../gui/lexicon/button/GuiButtonViewOnline.java | 4 ++-- .../common/crafting/recipe/CompositeLensRecipe.java | 7 ++++--- .../vazkii/botania/common/item/lens/ItemLens.java | 4 ++-- 21 files changed, 55 insertions(+), 54 deletions(-) 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 7927880a1..663d56fb6 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -639,8 +639,8 @@ public class GuiLexicon extends GuiScreen { } public void orientTutorialArrowWithButton(GuiButton button) { - tutorialArrowX = button.xPosition - TUTORIAL_ARROW_WIDTH; - tutorialArrowY = button.yPosition - TUTORIAL_ARROW_HEIGHT; + tutorialArrowX = button.x - TUTORIAL_ARROW_WIDTH; + tutorialArrowY = button.y - TUTORIAL_ARROW_HEIGHT; } boolean closeScreenOnInvKey() { 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 dd2529b9d..f5a211915 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -210,8 +210,8 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { int x; int y; - x = currentButton.xPosition - 20; - y = currentButton.yPosition; + x = currentButton.x - 20; + y = currentButton.y; mc.fontRenderer.drawStringWithShadow("?", x, y, 0xFFFFFF); GlStateManager.scale(0.5F, 0.5F, 1F); @@ -223,8 +223,8 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { if(currentButton != null && infoTime > 0) { float fract = infoTime / animationTime; - int x = currentButton.xPosition; - int y = currentButton.yPosition; + int x = currentButton.x; + int y = currentButton.y; String s = I18n.format(currentEntry.getTagline()); boolean unicode = mc.fontRenderer.getUnicodeFlag(); mc.fontRenderer.setUnicodeFlag(true); 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 6e0fba021..5352b18dd 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,12 +30,12 @@ public class GuiButtonAchievement extends GuiButtonLexicon { @Override public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { - hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height; int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GlStateManager.color(1F, 1F, 1F, 1F); - drawTexturedModalRect(xPosition, yPosition, k == 2 ? 109 : 98, 191, 11, 11); + drawTexturedModalRect(x, y, k == 2 ? 109 : 98, 191, 11, 11); List tooltip = new ArrayList<>(); tooltip.add(TextFormatting.GREEN + I18n.format("botaniamisc.achievements")); 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 449c710d1..3942eeaca 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 @@ -30,12 +30,12 @@ public class GuiButtonBack extends GuiButtonLexicon { @Override public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { if(enabled) { - hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height; int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GlStateManager.color(1F, 1F, 1F, 1F); - drawTexturedModalRect(xPosition, yPosition, 36, k == 2 ? 180 : 189, 18, 9); + drawTexturedModalRect(x, y, 36, k == 2 ? 180 : 189, 18, 9); List tooltip = getTooltip(); int tooltipY = (tooltip.size() - 1) * 10; 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 c33aaf210..93d15c3a4 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 @@ -22,8 +22,8 @@ public class GuiButtonBookmark extends GuiButtonLexicon { @Override public void drawButton(@Nonnull Minecraft mc, int par2, int par3) { - gui.drawBookmark(xPosition, yPosition, displayString, false); - hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + gui.drawBookmark(x, y, displayString, false); + hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height; int k = getHoverState(hovered); List tooltip = new ArrayList<>(); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java index c6b5eec70..d7ab8d14f 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java @@ -75,7 +75,7 @@ public class GuiButtonCategory extends GuiButtonLexicon { @Override public void drawButton(@Nonnull Minecraft mc, int mx, int my) { - boolean inside = mx >= xPosition && my >= yPosition && mx < xPosition + width && my < yPosition + height; + boolean inside = mx >= x && my >= y && mx < x + width && my < y + height; if(inside) ticksHovered = Math.min(time, ticksHovered + gui.timeDelta); else ticksHovered = Math.max(0F, ticksHovered - gui.timeDelta); @@ -111,7 +111,7 @@ public class GuiButtonCategory extends GuiButtonLexicon { } ShaderHelper.useShader(ShaderHelper.categoryButton, shaderCallback); - RenderHelper.drawTexturedModalRect(xPosition * 2, yPosition * 2, zLevel * 2, 0, 0, 32, 32, s, s); + RenderHelper.drawTexturedModalRect(x * 2, y * 2, zLevel * 2, 0, 0, 32, 32, s, s); ShaderHelper.releaseShader(); if(shaders) { 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 34d785b2d..f3d9230fb 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 @@ -33,19 +33,19 @@ public class GuiButtonChallengeIcon extends GuiButtonLexicon { @Override public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { - hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height; int k = getHoverState(hovered); RenderHelper.enableGUIStandardItemLighting(); GlStateManager.enableRescaleNormal(); - par1Minecraft.getRenderItem().renderItemIntoGUI(challenge.icon, xPosition, yPosition); + par1Minecraft.getRenderItem().renderItemIntoGUI(challenge.icon, x, y); RenderHelper.disableStandardItemLighting(); GlStateManager.enableBlend(); if(challenge.complete) { GlStateManager.disableDepth(); - par1Minecraft.fontRenderer.drawStringWithShadow("\u2714", xPosition + 10, yPosition + 9, 0x004C00); - par1Minecraft.fontRenderer.drawStringWithShadow("\u2714", xPosition + 10, yPosition + 8, 0x0BD20D); + par1Minecraft.fontRenderer.drawStringWithShadow("\u2714", x + 10, y + 9, 0x004C00); + par1Minecraft.fontRenderer.drawStringWithShadow("\u2714", x + 10, y + 8, 0x0BD20D); GlStateManager.enableDepth(); } 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 1ec89c1a9..c4d40a456 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 @@ -31,8 +31,8 @@ public class GuiButtonChallengeInfo extends GuiButtonLexicon { @Override public void drawButton(@Nonnull Minecraft mc, int par2, int par3) { - gui.drawBookmark(xPosition, yPosition, displayString, false); - hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + gui.drawBookmark(x, y, displayString, false); + hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height; int k = getHoverState(hovered); List tooltip = new ArrayList<>(); 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 d49ea716d..556dfba43 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,12 +30,12 @@ public class GuiButtonChallenges extends GuiButtonLexicon { @Override public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { - hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height; int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GlStateManager.color(1F, 1F, 1F, 1F); - drawTexturedModalRect(xPosition, yPosition, k == 2 ? 131 : 120, 180, 11, 11); + drawTexturedModalRect(x, y, k == 2 ? 131 : 120, 180, 11, 11); List tooltip = new ArrayList(); tooltip.add(TextFormatting.GREEN + I18n.format("botaniamisc.challenges")); 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 7d54432ea..720ff16cc 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 @@ -34,13 +34,13 @@ public class GuiButtonDoot extends GuiButtonLexicon { @Override public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { - hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height; int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); GlStateManager.color(1F, 1F, 1F, 1F); - par1Minecraft.getRenderItem().renderItemIntoGUI(new ItemStack(ModItems.cacophonium), xPosition, yPosition); - par1Minecraft.getRenderItem().renderItemIntoGUI(new ItemStack(Items.FIREWORKS), xPosition + 8, yPosition + 2); + par1Minecraft.getRenderItem().renderItemIntoGUI(new ItemStack(ModItems.cacophonium), x, y); + par1Minecraft.getRenderItem().renderItemIntoGUI(new ItemStack(Items.FIREWORKS), x + 8, y + 2); GlStateManager.disableLighting(); @@ -50,7 +50,7 @@ public class GuiButtonDoot extends GuiButtonLexicon { tooltip.add(TextFormatting.GRAY + "doot doot"); if(k == 2) - RenderHelper.renderTooltip(xPosition - 100, yPosition + 36, tooltip); + RenderHelper.renderTooltip(x - 100, y + 36, tooltip); GlStateManager.enableAlpha(); } 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 ad5ac14c5..d6576c1a1 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 @@ -32,8 +32,8 @@ public class GuiButtonHistory extends GuiButtonLexicon { @Override public void drawButton(@Nonnull Minecraft mc, int par2, int par3) { - gui.drawBookmark(xPosition, yPosition, displayString, false); - hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + gui.drawBookmark(x, y, displayString, false); + hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height; int k = getHoverState(hovered); List tooltip = new ArrayList<>(); 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 ed6d747f6..369093080 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 @@ -59,13 +59,13 @@ public class GuiButtonInvisible extends GuiButtonLexicon { float f = 1F / 64F; GlStateManager.translate(dogPos, 0, 0); GlStateManager.color(1F, 1F, 1F, 1F); - vazkii.botania.client.core.helper.RenderHelper.drawTexturedModalRect(0, yPosition, zLevel + 10, dogPos % 100 < 50 ? 23 : 0, 0, 23, 19, f, f); - xPosition = (int) Math.max(xPosition, dogPos + 10); + vazkii.botania.client.core.helper.RenderHelper.drawTexturedModalRect(0, y, zLevel + 10, dogPos % 100 < 50 ? 23 : 0, 0, 23, 19, f, f); + x = (int) Math.max(x, dogPos + 10); GlStateManager.translate(-dogPos, 0, 0); } - hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height; int k = getHoverState(hovered); boolean showStack = !displayStack.isEmpty() && !displayString.isEmpty(); @@ -97,19 +97,19 @@ public class GuiButtonInvisible extends GuiButtonLexicon { int maxalpha = 0x22; int alpha = Math.min(maxalpha, (int) (timeHover / 4 * maxalpha)); - drawRect(xPosition - 5, yPosition, (int) (xPosition - 5 + timeHover * 24), yPosition + height, alpha << 24 | color); + drawRect(x - 5, y, (int) (x - 5 + timeHover * 24), y + height, alpha << 24 | color); GlStateManager.enableAlpha(); boolean unicode = par1Minecraft.fontRenderer.getUnicodeFlag(); par1Minecraft.fontRenderer.setUnicodeFlag(true); - par1Minecraft.fontRenderer.drawString(displayString, xPosition + (showStack ? 7 : 0), yPosition + (height - 8) / 2, 0); + par1Minecraft.fontRenderer.drawString(displayString, x + (showStack ? 7 : 0), y + (height - 8) / 2, 0); par1Minecraft.fontRenderer.setUnicodeFlag(unicode); if(showStack) { GlStateManager.scale(0.5F, 0.5F, 0.5F); RenderHelper.enableGUIStandardItemLighting(); GlStateManager.enableRescaleNormal(); - par1Minecraft.getRenderItem().renderItemIntoGUI(displayStack, xPosition * 2 - 6, yPosition * 2 + 4); + par1Minecraft.getRenderItem().renderItemIntoGUI(displayStack, x * 2 - 6, y * 2 + 4); RenderHelper.disableStandardItemLighting(); GlStateManager.enableBlend(); } 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 89b6e13d5..6701d39ee 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,12 +33,12 @@ public class GuiButtonNotes extends GuiButtonLexicon { @Override public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { - hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height; int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GlStateManager.color(1F, 1F, 1F, 1F); - drawTexturedModalRect(xPosition, yPosition, k == 2 ? 130 : 120, 191, 10, 11); + drawTexturedModalRect(x, y, k == 2 ? 130 : 120, 191, 10, 11); List tooltip = new ArrayList<>(); if(GuiLexicon.notesEnabled) @@ -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().fontRenderer.drawStringWithShadow("!", xPosition + 10, yPosition, 0xFF0000); + Minecraft.getMinecraft().fontRenderer.drawStringWithShadow("!", x + 10, y, 0xFF0000); } int tooltipY = (tooltip.size() - 1) * 10; 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 3c527e470..ff46edfb0 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,12 +30,12 @@ public class GuiButtonOptions extends GuiButtonLexicon { @Override public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { - hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height; int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GlStateManager.color(1F, 1F, 1F, 1F); - drawTexturedModalRect(xPosition, yPosition, k == 2 ? 109 : 98, 180, 11, 11); + drawTexturedModalRect(x, y, k == 2 ? 109 : 98, 180, 11, 11); List tooltip = new ArrayList<>(); for(int i = 0; i < 3; i++) 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 01583cd25..f75a3e910 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,12 +32,12 @@ public class GuiButtonPage extends GuiButtonLexicon { @Override public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { if(enabled) { - hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height; int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GlStateManager.color(1F, 1F, 1F, 1F); - drawTexturedModalRect(xPosition, yPosition, k == 2 ? 18 : 0, right ? 180 : 190, 18, 10); + drawTexturedModalRect(x, y, k == 2 ? 18 : 0, right ? 180 : 190, 18, 10); if(k == 2) RenderHelper.renderTooltip(par2, par3, Collections.singletonList(I18n.format(right ? "botaniamisc.nextPage" : "botaniamisc.prevPage"))); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonScaleChange.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonScaleChange.java index 7db2c8146..3f07594e7 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonScaleChange.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonScaleChange.java @@ -30,12 +30,12 @@ public class GuiButtonScaleChange extends GuiButtonLexicon { @Override public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { - hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height; int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GlStateManager.color(1F, 1F, 1F, 1F); - drawTexturedModalRect(xPosition, yPosition, k == 2 ? 152 : 141, 191, 11, 11); + drawTexturedModalRect(x, y, k == 2 ? 152 : 141, 191, 11, 11); List tooltip = new ArrayList<>(); tooltip.add(TextFormatting.GREEN + I18n.format("botaniamisc.scaleChange")); 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 d6ab41087..6b41c8b6d 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,12 +30,12 @@ public class GuiButtonShare extends GuiButtonLexicon { @Override public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { - hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height; int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GlStateManager.color(1F, 1F, 1F, 1F); - drawTexturedModalRect(xPosition, yPosition, k == 2 ? 10 : 0 , 200, 10, 12); + drawTexturedModalRect(x, y, k == 2 ? 10 : 0 , 200, 10, 12); List tooltip = getTooltip(); int tooltipY = (tooltip.size() - 1) * 10; 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 30138a3ed..a97e25efd 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,14 +35,14 @@ public class GuiButtonUpdateWarning extends GuiButtonLexicon { if(!visible || !enabled) return; - hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height; int k = getHoverState(hovered); boolean red = k == 2 || ClientTickHandler.ticksInGame % 10 < 5; par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GlStateManager.color(1F, 1F, 1F, 1F); - drawTexturedModalRect(xPosition, yPosition, red ? 153 : 142, 180, 11, 11); + drawTexturedModalRect(x, y, red ? 153 : 142, 180, 11, 11); List tooltip = new ArrayList<>(); String version = PersistentVariableHelper.lastBotaniaVersion; 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 61891013c..7a585376e 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,12 +30,12 @@ public class GuiButtonViewOnline extends GuiButtonLexicon { @Override public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { - hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height; int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GlStateManager.color(1F, 1F, 1F, 1F); - drawTexturedModalRect(xPosition, yPosition, k == 2 ? 41 : 30, 200, 11, 11); + drawTexturedModalRect(x, y, k == 2 ? 41 : 30, 200, 11, 11); List tooltip = Collections.singletonList(TextFormatting.AQUA + I18n.format("botaniamisc.viewOnline")); int tooltipY = (tooltip.size() - 1) * 10; diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java index 81b11e045..5c7a85f00 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java @@ -19,11 +19,12 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.fml.common.registry.IForgeRegistryEntry; import vazkii.botania.api.mana.ICompositableLens; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.lens.ItemLens; -public class CompositeLensRecipe implements IRecipe { +public class CompositeLensRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { @@ -78,8 +79,8 @@ public class CompositeLensRecipe implements IRecipe { } @Override - public int getRecipeSize() { - return 10; + public boolean canFit(int width, int height) { + return width * height >= 3; } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index 6d898e392..6cd1eb895 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -160,9 +160,9 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { + public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList stacks) { for(int i = 0; i < SUBTYPES; i++) - stacks.add(new ItemStack(item, 1, i)); + stacks.add(new ItemStack(this, 1, i)); } @Nonnull