diff options
Diffstat (limited to 'src/main/java/me/shedaniel/rei/gui')
8 files changed, 28 insertions, 20 deletions
diff --git a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java index 10f84192a..896b4b872 100644 --- a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java +++ b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java @@ -195,6 +195,8 @@ public class ContainerScreenOverlay extends DrawableContainer { public void draw(int int_1, int int_2, float float_1) { if (!GuiHelper.isOverlayVisible()) return; + buttonLeft.enabled = itemListOverlay.getWidgets().size() > 0; + buttonRight.enabled = itemListOverlay.getWidgets().size() > 0; widgets.forEach(widget -> { GuiLighting.disable(); widget.draw(int_1, int_2, float_1); @@ -269,7 +271,7 @@ public class ContainerScreenOverlay extends DrawableContainer { } if (itemStack == null && MinecraftClient.getInstance().currentScreen instanceof RecipeViewingWidgetScreen) { RecipeViewingWidgetScreen recipeViewingWidget = (RecipeViewingWidgetScreen) MinecraftClient.getInstance().currentScreen; - for(GuiEventListener entry : recipeViewingWidget.getEntries()) + for(GuiEventListener entry : recipeViewingWidget.method_1968()) if (entry instanceof ItemSlotWidget && ((HighlightableWidget) entry).isHighlighted(point.x, point.y)) { itemStack = ((ItemSlotWidget) entry).getCurrentStack(); break; @@ -291,14 +293,14 @@ public class ContainerScreenOverlay extends DrawableContainer { public boolean charTyped(char char_1, int int_1) { if (!GuiHelper.isOverlayVisible()) return false; - for(GuiEventListener listener : getEntries()) + for(GuiEventListener listener : method_1968()) if (listener.charTyped(char_1, int_1)) return true; return super.charTyped(char_1, int_1); } @Override - protected List<? extends GuiEventListener> getEntries() { + public List<? extends GuiEventListener> method_1968() { return widgets; } diff --git a/src/main/java/me/shedaniel/rei/gui/config/ConfigEntry.java b/src/main/java/me/shedaniel/rei/gui/config/ConfigEntry.java index ac993282e..369ed3470 100644 --- a/src/main/java/me/shedaniel/rei/gui/config/ConfigEntry.java +++ b/src/main/java/me/shedaniel/rei/gui/config/ConfigEntry.java @@ -43,9 +43,9 @@ public class ConfigEntry extends EntryListWidget.Entry<ConfigEntry> { if (MinecraftClient.getInstance().textRenderer.isRightToLeft()) { MinecraftClient.getInstance().textRenderer.drawWithShadow(nameComponent.getFormattedText(), window.getScaledWidth() - MinecraftClient.getInstance().textRenderer.getStringWidth(nameComponent.getFormattedText()) - 40, getY() + 5, 16777215); this.buttonWidget.text = buttonProvider.getText(); - this.buttonWidget.getBounds().setLocation(10, getY() + 2); + this.buttonWidget.getBounds().setLocation(getX(), getY() + 2); } else { - MinecraftClient.getInstance().textRenderer.drawWithShadow(nameComponent.getFormattedText(), 10.0F, getY() + 5, 16777215); + MinecraftClient.getInstance().textRenderer.drawWithShadow(nameComponent.getFormattedText(), getX(), getY() + 5, 16777215); this.buttonWidget.text = buttonProvider.getText(); this.buttonWidget.getBounds().setLocation(window.getScaledWidth() - 190, getY() + 2); } diff --git a/src/main/java/me/shedaniel/rei/gui/config/ConfigEntryListWidget.java b/src/main/java/me/shedaniel/rei/gui/config/ConfigEntryListWidget.java index ee74cc568..e6c83593c 100644 --- a/src/main/java/me/shedaniel/rei/gui/config/ConfigEntryListWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/config/ConfigEntryListWidget.java @@ -15,7 +15,7 @@ public class ConfigEntryListWidget extends EntryListWidget<ConfigEntry> { } private ConfigEntry getEntry(int int_1) { - return this.getEntries().get(int_1); + return this.method_1968().get(int_1); //getEntries } public void configAddEntry(ConfigEntry entry) { diff --git a/src/main/java/me/shedaniel/rei/gui/config/ConfigScreen.java b/src/main/java/me/shedaniel/rei/gui/config/ConfigScreen.java index 65007b2f5..a82375411 100644 --- a/src/main/java/me/shedaniel/rei/gui/config/ConfigScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/config/ConfigScreen.java @@ -167,7 +167,7 @@ public class ConfigScreen extends Screen { } } })); - addButton(new ButtonWidget(0, width / 2 - 100, height - 26, I18n.translate("gui.done")) { + addButton(new ButtonWidget(width / 2 - 100, height - 26, I18n.translate("gui.done")) { @Override public void onPressed(double double_1, double double_2) { try { @@ -187,11 +187,12 @@ public class ConfigScreen extends Screen { } @Override - public void draw(int int_1, int int_2, float float_1) { + public void method_18326(int int_1, int int_2, float float_1) { + //draw this.drawTextureBackground(0); - this.entryListWidget.draw(int_1, int_2, float_1); + this.entryListWidget.method_18326(int_1, int_2, float_1); this.drawStringCentered(this.fontRenderer, I18n.translate("text.rei.config"), this.width / 2, 16, 16777215); - super.draw(int_1, int_2, float_1); + super.method_18326(int_1, int_2, float_1); } @Override diff --git a/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java b/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java index 81f48c40c..d38cadfa2 100644 --- a/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java @@ -15,7 +15,7 @@ public class CreditsEntryListWidget extends EntryListWidget<CreditsEntry> { } private CreditsEntry getEntry(int int_1) { - return this.getEntries().get(int_1); + return this.method_1968().get(int_1); //getEntries } public void creditsAddEntry(CreditsEntry entry) { diff --git a/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java b/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java index ed0464e07..bfb9dd589 100644 --- a/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java @@ -34,7 +34,7 @@ public class CreditsScreen extends Screen { for(String line : I18n.translate("text.rei.credit.text").split("\n")) entryListWidget.creditsAddEntry(new CreditsEntry(new StringTextComponent(line))); entryListWidget.creditsAddEntry(new CreditsEntry(new StringTextComponent(""))); - addButton(new ButtonWidget(0, width / 2 - 100, height - 26, I18n.translate("gui.done")) { + addButton(new ButtonWidget(width / 2 - 100, height - 26, I18n.translate("gui.done")) { @Override public void onPressed(double double_1, double double_2) { CreditsScreen.this.client.openScreen(parent); @@ -44,11 +44,12 @@ public class CreditsScreen extends Screen { } @Override - public void draw(int int_1, int int_2, float float_1) { + public void method_18326(int int_1, int int_2, float float_1) { + //draw this.drawTextureBackground(0); - this.entryListWidget.draw(int_1, int_2, float_1); + this.entryListWidget.method_18326(int_1, int_2, float_1); this.drawStringCentered(this.fontRenderer, I18n.translate("text.rei.credits"), this.width / 2, 16, 16777215); - super.draw(int_1, int_2, float_1); + super.method_18326(int_1, int_2, float_1); } @Override diff --git a/src/main/java/me/shedaniel/rei/gui/widget/ItemListOverlay.java b/src/main/java/me/shedaniel/rei/gui/widget/ItemListOverlay.java index cb38c6941..e3d6b94a7 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/ItemListOverlay.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/ItemListOverlay.java @@ -44,6 +44,10 @@ public class ItemListOverlay extends Drawable implements IWidget { GuiHelper.getLastOverlay().addTooltip(new QueuedTooltip(ClientHelper.getMouseLocation(), Arrays.asList(I18n.translate("text.rei.delete_items")))); } + public List<IWidget> getWidgets() { + return widgets; + } + public void updateList(Rectangle bounds, int page, String searchTerm) { this.rectangle = bounds; this.widgets = Lists.newLinkedList(); diff --git a/src/main/java/me/shedaniel/rei/gui/widget/RecipeViewingWidgetScreen.java b/src/main/java/me/shedaniel/rei/gui/widget/RecipeViewingWidgetScreen.java index 1ac5cadc0..e946920d1 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/RecipeViewingWidgetScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/RecipeViewingWidgetScreen.java @@ -218,13 +218,13 @@ public class RecipeViewingWidgetScreen extends Screen { } @Override - public void draw(int mouseX, int mouseY, float partialTicks) { + public void method_18326(int mouseX, int mouseY, float partialTicks) { drawBackground(); tabs.stream().filter(tabWidget -> { return !tabWidget.isSelected(); }).forEach(tabWidget -> tabWidget.draw(mouseX, mouseY, partialTicks)); GuiLighting.disable(); - super.draw(mouseX, mouseY, partialTicks); + super.method_18326(mouseX, mouseY, partialTicks); widgets.forEach(widget -> { GuiLighting.disable(); widget.draw(mouseX, mouseY, partialTicks); @@ -286,11 +286,11 @@ public class RecipeViewingWidgetScreen extends Screen { @Override public boolean mouseClicked(double double_1, double double_2, int int_1) { - for(GuiEventListener entry : getEntries()) + for(GuiEventListener entry : method_1968()) //getEntries if (entry.mouseClicked(double_1, double_2, int_1)) { - focusOn(entry); + method_1967(entry); //focusOn if (int_1 == 0) - setActive(true); + method_1966(true); //setActive return true; } return false; |