From 93dc019f11596f7a9386a6e3f597667fa1b50eb8 Mon Sep 17 00:00:00 2001 From: Daniel She Date: Thu, 14 Feb 2019 14:38:18 +0100 Subject: REI Update v2.3 (#35) * Fixes #33 * Fixes #32 * Fix #29 * Highlight Cursor * Fix #15 * Remove Unwanted Imports * Making it actually v2.3 * LOLCATS & Upside Down Lanuage + Credits Screen * better credits * Better Config * Better Config Button Handling + Campfire text using container sub-colour * Better Plugin Handling * Split ItemRegisterer out from ClientHelper * Option to disable default plugin. --- .../me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java') diff --git a/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java index 9e11bcee3..211f8a7f0 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java @@ -21,13 +21,12 @@ public abstract class CraftableToggleButtonWidget extends ButtonWidget { private ItemRenderer itemRenderer; public CraftableToggleButtonWidget(Rectangle rectangle) { - this(rectangle.x, rectangle.y, rectangle.width, rectangle.height); + super(rectangle, ""); this.itemRenderer = MinecraftClient.getInstance().getItemRenderer(); } public CraftableToggleButtonWidget(int x, int y, int width, int height) { - super(x, y, width, height, ""); - this.itemRenderer = MinecraftClient.getInstance().getItemRenderer(); + this(new Rectangle(x, y, width, height)); } @Override @@ -36,13 +35,13 @@ public abstract class CraftableToggleButtonWidget extends ButtonWidget { GuiLighting.enableForItems(); this.itemRenderer.zOffset = 0.0F; - this.itemRenderer.renderGuiItem(new ItemStack(Blocks.CRAFTING_TABLE), x + 2, y + 2); + this.itemRenderer.renderGuiItem(new ItemStack(Blocks.CRAFTING_TABLE), getBounds().x + 2, getBounds().y + 2); this.itemRenderer.zOffset = 0.0F; GuiLighting.disable(); MinecraftClient.getInstance().getTextureManager().bindTexture(CHEST_GUI_TEXTURE); GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); this.zOffset = 100f; - this.drawTexturedRect(x, y, (56 + (RoughlyEnoughItemsCore.getConfigHelper().craftableOnly() ? 0 : 20)), 202, 20, 20); + this.drawTexturedRect(getBounds().x, getBounds().y, (56 + (RoughlyEnoughItemsCore.getConfigHelper().craftableOnly() ? 0 : 20)), 202, 20, 20); this.zOffset = 0f; if (getBounds().contains(mouseX, mouseY)) drawTooltip(); -- cgit