diff options
Diffstat (limited to 'src/main/java/me/shedaniel/rei/gui')
14 files changed, 549 insertions, 279 deletions
diff --git a/src/main/java/me/shedaniel/rei/gui/ContainerGuiOverlay.java b/src/main/java/me/shedaniel/rei/gui/ContainerGuiOverlay.java index e1963ea12..19dd03c70 100644 --- a/src/main/java/me/shedaniel/rei/gui/ContainerGuiOverlay.java +++ b/src/main/java/me/shedaniel/rei/gui/ContainerGuiOverlay.java @@ -1,15 +1,15 @@ package me.shedaniel.rei.gui; import com.google.common.collect.Lists; -import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.client.ClientHelper; import me.shedaniel.rei.client.ConfigHelper; import me.shedaniel.rei.client.GuiHelper; import me.shedaniel.rei.client.KeyBindHelper; +import me.shedaniel.rei.gui.credits.CreditsGui; import me.shedaniel.rei.gui.widget.*; import net.minecraft.client.MainWindow; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.GuiEventHandler; import net.minecraft.client.gui.IGuiEventListener; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; @@ -17,6 +17,7 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.TextComponentTranslation; import java.awt.*; import java.util.Collections; @@ -24,7 +25,7 @@ import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; -public class ContainerGuiOverlay extends GuiScreen { +public class ContainerGuiOverlay extends GuiEventHandler { private static final List<QueuedTooltip> QUEUED_TOOLTIPS = Lists.newArrayList(); public static String searchTerm = ""; @@ -46,7 +47,7 @@ public class ContainerGuiOverlay extends GuiScreen { widgets.add(this.itemListOverlay = new ItemListOverlay(page)); this.itemListOverlay.updateList(getItemListArea(), page, searchTerm); - widgets.add(buttonLeft = new ButtonWidget(rectangle.x, rectangle.y + 5, 16, 16, "<") { + widgets.add(buttonLeft = new ButtonWidget(rectangle.x, rectangle.y + 5, 16, 16, new TextComponentTranslation("text.rei.left_arrow")) { @Override public void onPressed(int button, double mouseX, double mouseY) { page--; @@ -55,7 +56,7 @@ public class ContainerGuiOverlay extends GuiScreen { itemListOverlay.updateList(getItemListArea(), page, searchTerm); } }); - widgets.add(buttonRight = new ButtonWidget(rectangle.x + rectangle.width - 18, rectangle.y + 5, 16, 16, ">") { + widgets.add(buttonRight = new ButtonWidget(rectangle.x + rectangle.width - 18, rectangle.y + 5, 16, 16, new TextComponentTranslation("text.rei.right_arrow")) { @Override public void onPressed(int button, double mouseX, double mouseY) { page++; @@ -83,7 +84,13 @@ public class ContainerGuiOverlay extends GuiScreen { ClientHelper.openConfigWindow(GuiHelper.getLastGuiContainer()); } }); - this.widgets.add(new LabelWidget(rectangle.x + (rectangle.width / 2), rectangle.y + 10, "") { + widgets.add(new ButtonWidget(ConfigHelper.getInstance().isMirrorItemPanel() ? window.getScaledWidth() - 50 : 10, window.getScaledHeight() - 30, 40, 20, I18n.format("text.rei.credits")) { + @Override + public void onPressed(int button, double mouseX, double mouseY) { + Minecraft.getInstance().displayGuiScreen(new CreditsGui(GuiHelper.getLastGuiContainer())); + } + }); + widgets.add(new LabelWidget(rectangle.x + (rectangle.width / 2), rectangle.y + 10, "") { @Override public void draw(int mouseX, int mouseY, float partialTicks) { page = MathHelper.clamp(page, 0, getTotalPage()); @@ -104,7 +111,7 @@ public class ContainerGuiOverlay extends GuiScreen { }; GuiHelper.searchField.setChangedListener(s -> { searchTerm = s; - itemListOverlay.updateList(page, searchTerm); + itemListOverlay.updateList(getItemListArea(), page, searchTerm); }); GuiHelper.searchField.setBounds(getTextFieldArea()); this.widgets.add(GuiHelper.searchField); @@ -114,12 +121,11 @@ public class ContainerGuiOverlay extends GuiScreen { @Override public void onPressed(int button, double mouseX, double mouseY) { ConfigHelper.getInstance().toggleCraftableOnly(); - itemListOverlay.updateList(page, searchTerm); + itemListOverlay.updateList(getItemListArea(), page, searchTerm); } }); this.itemListOverlay.updateList(getItemListArea(), page, searchTerm); - this.children.addAll(widgets); } private Rectangle getTextFieldArea() { @@ -130,7 +136,7 @@ public class ContainerGuiOverlay extends GuiScreen { RecipeViewingWidgetGui widget = (RecipeViewingWidgetGui) Minecraft.getInstance().currentScreen; return new Rectangle(widget.getBounds().x, window.getScaledHeight() - 22, widget.getBounds().width - widthRemoved, 18); } - return new Rectangle(GuiHelper.getLastMixinGuiContainer().getContainerLeft(), window.getScaledHeight() - 22, GuiHelper.getLastMixinGuiContainer().getContainerWidth() - widthRemoved, 18); + return new Rectangle(GuiHelper.getLastMixinGuiContainer().rei_getContainerLeft(), window.getScaledHeight() - 22, GuiHelper.getLastMixinGuiContainer().rei_etContainerWidth() - widthRemoved, 18); } private Rectangle getCraftableToggleArea() { @@ -158,7 +164,7 @@ public class ContainerGuiOverlay extends GuiScreen { onInitialized(); else if (ConfigHelper.getInstance().craftableOnly() && (!hasSameListContent(new LinkedList<>(GuiHelper.inventoryStacks), currentStacks) || (currentStacks.size() != GuiHelper.inventoryStacks.size()))) { GuiHelper.inventoryStacks = ClientHelper.getInventoryItemsTypes(); - itemListOverlay.updateList(page, searchTerm); + itemListOverlay.updateList(getItemListArea(), page, searchTerm); } GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); RenderHelper.disableStandardItemLighting(); @@ -188,7 +194,6 @@ public class ContainerGuiOverlay extends GuiScreen { QUEUED_TOOLTIPS.add(queuedTooltip); } - @Override public void render(int int_1, int int_2, float float_1) { if (!GuiHelper.isOverlayVisible()) return; @@ -197,14 +202,11 @@ public class ContainerGuiOverlay extends GuiScreen { widget.draw(int_1, int_2, float_1); }); RenderHelper.disableStandardItemLighting(); - itemListOverlay.draw(int_1, int_2, float_1); - RenderHelper.disableStandardItemLighting(); - super.render(int_1, int_2, float_1); } private Rectangle calculateBoundary() { if (!ConfigHelper.getInstance().isMirrorItemPanel()) { - int startX = GuiHelper.getLastMixinGuiContainer().getContainerLeft() + GuiHelper.getLastMixinGuiContainer().getContainerWidth() + 10; + int startX = GuiHelper.getLastMixinGuiContainer().rei_getContainerLeft() + GuiHelper.getLastMixinGuiContainer().rei_etContainerWidth() + 10; int width = window.getScaledWidth() - startX; if (Minecraft.getInstance().currentScreen instanceof RecipeViewingWidgetGui) { RecipeViewingWidgetGui widget = (RecipeViewingWidgetGui) Minecraft.getInstance().currentScreen; @@ -213,12 +215,7 @@ public class ContainerGuiOverlay extends GuiScreen { } return new Rectangle(startX, 0, width, window.getScaledHeight()); } - int width = GuiHelper.getLastMixinGuiContainer().getContainerLeft() - 6; - if (Minecraft.getInstance().currentScreen instanceof RecipeViewingWidgetGui) { - RecipeViewingWidgetGui widget = (RecipeViewingWidgetGui) Minecraft.getInstance().currentScreen; - width = widget.getBounds().x - 6; - } - return new Rectangle(4, 0, width, window.getScaledHeight()); + return new Rectangle(4, 0, getLeft() - 6, window.getScaledHeight()); } private int getLeft() { @@ -226,7 +223,9 @@ public class ContainerGuiOverlay extends GuiScreen { RecipeViewingWidgetGui widget = (RecipeViewingWidgetGui) Minecraft.getInstance().currentScreen; return widget.getBounds().x; } - return GuiHelper.getLastMixinGuiContainer().getContainerLeft(); + if (Minecraft.getInstance().player.getRecipeBook().isGuiOpen()) + return GuiHelper.getLastMixinGuiContainer().rei_getContainerLeft() - 147 - 30; + return GuiHelper.getLastMixinGuiContainer().rei_getContainerLeft(); } private int getTotalPage() { @@ -254,15 +253,15 @@ public class ContainerGuiOverlay extends GuiScreen { @Override public boolean keyPressed(int int_1, int int_2, int int_3) { + for(IGuiEventListener listener : widgets) + if (listener.keyPressed(int_1, int_2, int_3)) + return true; if (KeyBindHelper.HIDE.matchesKey(int_1, int_2)) { GuiHelper.toggleOverlayVisible(); return true; } if (!GuiHelper.isOverlayVisible()) return false; - for(IGuiEventListener listener : children) - if (listener.keyPressed(int_1, int_2, int_3)) - return true; Point point = ClientHelper.getMouseLocation(); ItemStack itemStack = null; for(IWidget widget : itemListOverlay.getListeners()) @@ -279,8 +278,8 @@ public class ContainerGuiOverlay extends GuiScreen { } } if (itemStack == null && Minecraft.getInstance().currentScreen instanceof GuiContainer) - if (GuiHelper.getLastMixinGuiContainer().getHoveredSlot() != null) - itemStack = GuiHelper.getLastMixinGuiContainer().getHoveredSlot().getStack(); + if (GuiHelper.getLastMixinGuiContainer().rei_getHoveredSlot() != null) + itemStack = GuiHelper.getLastMixinGuiContainer().rei_getHoveredSlot().getStack(); if (itemStack != null && !itemStack.isEmpty()) { if (KeyBindHelper.RECIPE.matchesKey(int_1, int_2)) return ClientHelper.executeRecipeKeyBind(this, itemStack); @@ -294,13 +293,18 @@ public class ContainerGuiOverlay extends GuiScreen { public boolean charTyped(char char_1, int int_1) { if (!GuiHelper.isOverlayVisible()) return false; - for(IGuiEventListener listener : children) + for(IGuiEventListener listener : widgets) if (listener.charTyped(char_1, int_1)) return true; return super.charTyped(char_1, int_1); } @Override + protected List<? extends IGuiEventListener> getChildren() { + return widgets; + } + + @Override public boolean mouseClicked(double double_1, double double_2, int int_1) { if (!GuiHelper.isOverlayVisible()) return false; diff --git a/src/main/java/me/shedaniel/rei/gui/config/ConfigEntry.java b/src/main/java/me/shedaniel/rei/gui/config/ConfigEntry.java new file mode 100644 index 000000000..5637f2575 --- /dev/null +++ b/src/main/java/me/shedaniel/rei/gui/config/ConfigEntry.java @@ -0,0 +1,77 @@ +package me.shedaniel.rei.gui.config; + +import me.shedaniel.rei.client.ClientHelper; +import me.shedaniel.rei.gui.widget.ButtonWidget; +import net.minecraft.client.MainWindow; +import net.minecraft.client.Minecraft; +import net.minecraft.client.audio.SimpleSound; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiListExtended; +import net.minecraft.init.SoundEvents; +import net.minecraft.util.text.ITextComponent; + +import java.awt.*; + + +public class ConfigEntry extends GuiListExtended.IGuiListEntry<ConfigEntry> { + + private static final FontRenderer FONT_RENDERER = Minecraft.getInstance().fontRenderer; + private ITextComponent nameComponent; + private ConfigEntryButtonProvider buttonProvider; + private ButtonWidget buttonWidget; + + public ConfigEntry(ITextComponent nameComponent, ConfigEntryButtonProvider buttonProvider) { + this.nameComponent = nameComponent; + this.buttonProvider = buttonProvider; + this.buttonWidget = new ButtonWidget(0, 0, 150, 20, "") { + @Override + public boolean onMouseClick(int button, double mouseX, double mouseY) { + if (getBounds().contains(mouseX, mouseY) && enabled) + if (buttonProvider.onPressed(button, mouseX, mouseY)) { + Minecraft.getInstance().getSoundHandler().play(SimpleSound.master(SoundEvents.UI_BUTTON_CLICK, 1.0F)); + return true; + } + return false; + } + + @Override + public void onPressed(int button, double mouseX, double mouseY) {} + }; + } + + @Override + public void drawEntry(int entryWidth, int height, int i3, int i4, boolean isSelected, float delta) { + MainWindow window = Minecraft.getInstance().mainWindow; + Point mouse = ClientHelper.getMouseLocation(); + if (Minecraft.getInstance().fontRenderer.getBidiFlag()) { + Minecraft.getInstance().fontRenderer.drawStringWithShadow(nameComponent.getFormattedText(), window.getScaledWidth() - FONT_RENDERER.getStringWidth(nameComponent.getFormattedText()) - 40, getY() + 5, 16777215); + this.buttonWidget.text = buttonProvider.getText(); + this.buttonWidget.getBounds().setLocation(getX(), getY() + 2); + } else { + Minecraft.getInstance().fontRenderer.drawStringWithShadow(nameComponent.getFormattedText(), getX(), getY() + 5, 16777215); + this.buttonWidget.text = buttonProvider.getText(); + this.buttonWidget.getBounds().setLocation(window.getScaledWidth() - 190, getY() + 2); + } + buttonProvider.draw(buttonWidget, mouse, delta); + } + + @Override + public boolean mouseClicked(double double_1, double double_2, int int_1) { + if (buttonWidget.mouseClicked(double_1, double_2, int_1)) + return true; + return false; + } + + interface ConfigEntryButtonProvider { + + public boolean onPressed(int button, double mouseX, double mouseY); + + public String getText(); + + default public void draw(ButtonWidget button, Point mouse, float delta) { + button.draw(mouse.x, mouse.y, delta); + } + + } + +} diff --git a/src/main/java/me/shedaniel/rei/gui/config/ConfigEntryListWidget.java b/src/main/java/me/shedaniel/rei/gui/config/ConfigEntryListWidget.java new file mode 100644 index 000000000..ef6d1cef1 --- /dev/null +++ b/src/main/java/me/shedaniel/rei/gui/config/ConfigEntryListWidget.java @@ -0,0 +1,35 @@ +package me.shedaniel.rei.gui.config; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiListExtended; + +public class ConfigEntryListWidget extends GuiListExtended<ConfigEntry> { + + public ConfigEntryListWidget(Minecraft client, int width, int height, int startY, int endY, int entryHeight) { + super(client, width, height, startY, endY, entryHeight); + setShowSelectionBox(false); //toggleShowSelection + } + + public void configClearEntries() { + clearEntries(); + } + + private ConfigEntry getEntry(int int_1) { + return this.getChildren().get(int_1); + } + + public void configAddEntry(ConfigEntry entry) { + addEntry(entry); + } + + @Override + public int getListWidth() { + return width - 80; + } + + @Override + protected int getScrollBarX() { + return width - 40; + } + +} diff --git a/src/main/java/me/shedaniel/rei/gui/config/ConfigGui.java b/src/main/java/me/shedaniel/rei/gui/config/ConfigGui.java new file mode 100644 index 000000000..2511b0c21 --- /dev/null +++ b/src/main/java/me/shedaniel/rei/gui/config/ConfigGui.java @@ -0,0 +1,207 @@ +package me.shedaniel.rei.gui.config; + +import me.shedaniel.rei.client.ConfigHelper; +import me.shedaniel.rei.client.GuiHelper; +import me.shedaniel.rei.client.REIItemListOrdering; +import me.shedaniel.rei.gui.widget.ButtonWidget; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.IGuiEventListener; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.resources.I18n; +import net.minecraft.util.text.TextComponentTranslation; + +import java.awt.*; +import java.io.IOException; +import java.util.Arrays; + +public class ConfigGui extends GuiScreen { + + private GuiScreen parent; + private ConfigEntryListWidget entryListWidget; + + public ConfigGui(GuiScreen parent) { + this.parent = parent; + } + + @Override + public boolean keyPressed(int int_1, int int_2, int int_3) { + if (int_1 == 256 && this.allowCloseWithEscape()) { + Minecraft.getInstance().displayGuiScreen(parent); + GuiHelper.getLastOverlay().onInitialized(); + return true; + } else { + return super.keyPressed(int_1, int_2, int_3); + } + } + + @Override + protected void initGui() { + children.add(entryListWidget = new ConfigEntryListWidget(mc, width, height, 32, height - 32, 24)); + entryListWidget.configClearEntries(); + entryListWidget.configAddEntry(new ConfigEntry(new TextComponentTranslation("text.rei.side_searchbox"), new ConfigEntry.ConfigEntryButtonProvider() { + @Override + public boolean onPressed(int button, double mouseX, double mouseY) { + if (button == 0) + ConfigHelper.getInstance().setSideSearchField(!ConfigHelper.getInstance().sideSearchField()); + try { + ConfigHelper.getInstance().saveConfig(); + } catch (IOException e) { + e.printStackTrace(); + return false; + } + return true; + } + + @Override + public String getText() { + return getTrueFalseText(ConfigHelper.getInstance().sideSearchField()); + } + })); + entryListWidget.configAddEntry(new ConfigEntry(new TextComponentTranslation("text.rei.enable_craftable_only"), new ConfigEntry.ConfigEntryButtonProvider() { + @Override + public boolean onPressed(int button, double mouseX, double mouseY) { + if (button == 0) + ConfigHelper.getInstance().setShowCraftableOnlyButton(!ConfigHelper.getInstance().showCraftableOnlyButton()); + try { + ConfigHelper.getInstance().saveConfig(); + } catch (IOException e) { + e.printStackTrace(); + return false; + } + return true; + } + + @Override + public String getText() { + return getTrueFalseText(ConfigHelper.getInstance().showCraftableOnlyButton()); + } + })); + entryListWidget.configAddEntry(new ConfigEntry(new TextComponentTranslation("text.rei.list_ordering"), new ConfigEntry.ConfigEntryButtonProvider() { + @Override + public boolean onPressed(int button, double mouseX, double mouseY) { + int index = Arrays.asList(REIItemListOrdering.values()).indexOf(ConfigHelper.getInstance().getItemListOrdering()) + 1; + if (index >= REIItemListOrdering.values().length) { + index = 0; + ConfigHelper.getInstance().setAscending(!ConfigHelper.getInstance().isAscending()); + } + ConfigHelper.getInstance().setItemListOrdering(REIItemListOrdering.values()[index]); + try { + ConfigHelper.getInstance().saveConfig(); + } catch (IOException e) { + e.printStackTrace(); + return false; + } + return true; + } + + @Override + public String getText() { + return I18n.format("text.rei.list_ordering_button", I18n.format(ConfigHelper.getInstance().getItemListOrdering().getNameTranslationKey()), I18n.format(ConfigHelper.getInstance().isAscending() ? "ordering.rei.ascending" : "ordering.rei.descending")); + } + })); + entryListWidget.configAddEntry(new ConfigEntry(new TextComponentTranslation("text.rei.mirror_rei"), new ConfigEntry.ConfigEntryButtonProvider() { + @Override + public boolean onPressed(int button, double mouseX, double mouseY) { + if (button == 0) + ConfigHelper.getInstance().setMirrorItemPanel(!ConfigHelper.getInstance().isMirrorItemPanel()); + try { + ConfigHelper.getInstance().saveConfig(); + } catch (IOException e) { + e.printStackTrace(); + return false; + } + return true; + } + + @Override + public String getText() { + return getTrueFalseText(ConfigHelper.getInstance().isMirrorItemPanel()); + } + })); + entryListWidget.configAddEntry(new ConfigEntry(new TextComponentTranslation("text.rei.check_updates"), new ConfigEntry.ConfigEntryButtonProvider() { + @Override + public boolean onPressed(int button, double mouseX, double mouseY) { + if (button == 0) + ConfigHelper.getInstance().setCheckUpdates(!ConfigHelper.getInstance().checkUpdates()); + try { + ConfigHelper.getInstance().saveConfig(); + } catch (IOException e) { + e.printStackTrace(); + return false; + } + return true; + } + + @Override + public String getText() { + return getTrueFalseText(ConfigHelper.getInstance().checkUpdates()); + } + })); + entryListWidget.configAddEntry(new ConfigEntry(new TextComponentTranslation("text.rei.load_default_plugin"), new ConfigEntry.ConfigEntryButtonProvider() { + @Override + public boolean onPressed(int button, double mouseX, double mouseY) { + if (button == 0) + ConfigHelper.getInstance().setLoadingDefaultPlugin(!ConfigHelper.getInstance().isLoadingDefaultPlugin()); + try { + ConfigHelper.getInstance().saveConfig(); + } catch (IOException e) { + e.printStackTrace(); + return false; + } + return true; + } + + @Override + public String getText() { + return getTrueFalseText(ConfigHelper.getInstance().isLoadingDefaultPlugin()); + } + + @Override + public void draw(ButtonWidget button, Point mouse, float delta) { + button.draw(mouse.x, mouse.y, delta); + if (button.getBounds().contains(mouse)) { + RenderHelper.disableStandardItemLighting(); + drawHoveringText(Arrays.asList(I18n.format("text.rei.load_default_plugin.restart_tooltip").split("\n")), mouse.x, mouse.y); + RenderHelper.disableStandardItemLighting(); + } + } + })); + addButton(new net.minecraft.client.gui.GuiButton(0, width / 2 - 100, height - 26, I18n.format("gui.done")) { + @Override + public void onClick(double double_1, double double_2) { + try { + ConfigHelper.getInstance().saveConfig(); + } catch (IOException e) { + e.printStackTrace(); + } + ConfigGui.this.mc.displayGuiScreen(parent); + GuiHelper.getLastOverlay().onInitialized(); + } + }); + super.initGui(); + } + + private String getTrueFalseText(boolean showCraftableOnlyButton) { + return String.format("%s%b", showCraftableOnlyButton ? "§a" : "§c", showCraftableOnlyButton); + } + + @Override + public void render(int int_1, int int_2, float float_1) { + this.drawBackground(0); + this.entryListWidget.drawScreen(int_1, int_2, float_1); + this.drawCenteredString(this.fontRenderer, I18n.format("text.rei.config"), this.width / 2, 16, 16777215); + super.render(int_1, int_2, float_1); + } + + @Override + public boolean doesGuiPauseGame() { + return false; + } + + @Override + public IGuiEventListener getFocused() { + return entryListWidget; + } + +}
\ No newline at end of file diff --git a/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntry.java b/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntry.java new file mode 100644 index 000000000..32896a9f8 --- /dev/null +++ b/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntry.java @@ -0,0 +1,22 @@ +package me.shedaniel.rei.gui.credits; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiListExtended; +import net.minecraft.util.text.ITextComponent; + +public class CreditsEntry extends GuiListExtended.IGuiListEntry<CreditsEntry> { + + private ITextComponent textComponent; + + public CreditsEntry(ITextComponent textComponent) { + this.textComponent = textComponent; + } + + @Override + public void drawEntry(int entryWidth, int height, int i3, int i4, boolean isSelected, float delta) { + int x = getX(); + int y = getY(); + Minecraft.getInstance().fontRenderer.drawStringWithShadow(textComponent.getFormattedText(), x + 5, y + 5, -1); + } + +} diff --git a/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java b/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java new file mode 100644 index 000000000..bfc13e331 --- /dev/null +++ b/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java @@ -0,0 +1,35 @@ +package me.shedaniel.rei.gui.credits; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiListExtended; + +public class CreditsEntryListWidget extends GuiListExtended<CreditsEntry> { + + public CreditsEntryListWidget(Minecraft client, int width, int height, int startY, int endY, int entryHeight) { + super(client, width, height, startY, endY, entryHeight); + setShowSelectionBox(false); //toggleShowSelection + } + + public void creditsClearEntries() { + clearEntries(); + } + + private CreditsEntry getEntry(int int_1) { + return this.getChildren().get(int_1); + } + + public void creditsAddEntry(CreditsEntry entry) { + addEntry(entry); + } + + @Override + public int getListWidth() { + return width - 80; + } + + @Override + protected int getScrollBarX() { + return width - 40; + } + +} diff --git a/src/main/java/me/shedaniel/rei/gui/credits/CreditsGui.java b/src/main/java/me/shedaniel/rei/gui/credits/CreditsGui.java new file mode 100644 index 000000000..be9652dc4 --- /dev/null +++ b/src/main/java/me/shedaniel/rei/gui/credits/CreditsGui.java @@ -0,0 +1,64 @@ +package me.shedaniel.rei.gui.credits; + +import me.shedaniel.rei.client.GuiHelper; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.IGuiEventListener; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.resources.I18n; +import net.minecraft.util.text.TextComponentString; + +public class CreditsGui extends GuiScreen { + + private GuiContainer parent; + private CreditsEntryListWidget entryListWidget; + + public CreditsGui(GuiContainer parent) { + this.parent = parent; + } + + @Override + public boolean keyPressed(int int_1, int int_2, int int_3) { + if (int_1 == 256 && this.allowCloseWithEscape()) { + this.mc.displayGuiScreen(parent); + GuiHelper.getLastOverlay().onInitialized(); + return true; + } + return super.keyPressed(int_1, int_2, int_3); + } + + @Override + protected void initGui() { + children.add(entryListWidget = new CreditsEntryListWidget(mc, width, height, 32, height - 32, 12)); + entryListWidget.creditsClearEntries(); + for(String line : I18n.format("text.rei.credit.text").split("\n")) + entryListWidget.creditsAddEntry(new CreditsEntry(new TextComponentString(line))); + entryListWidget.creditsAddEntry(new CreditsEntry(new TextComponentString(""))); + addButton(new GuiButton(0, width / 2 - 100, height - 26, I18n.format("gui.done")) { + @Override + public void onClick(double double_1, double double_2) { + CreditsGui.this.mc.displayGuiScreen(parent); + GuiHelper.getLastOverlay().onInitialized(); + } + }); + } + + @Override + public void render(int int_1, int int_2, float float_1) { + this.drawBackground(0); + this.entryListWidget.drawScreen(int_1, int_2, float_1); + this.drawCenteredString(this.fontRenderer, I18n.format("text.rei.credits"), this.width / 2, 16, 16777215); + super.render(int_1, int_2, float_1); + } + + @Override + public boolean doesGuiPauseGame() { + return false; + } + + @Override + public IGuiEventListener getFocused() { + return entryListWidget; + } + +} diff --git a/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java index 99e36f0c9..d8443c8ad 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java @@ -8,6 +8,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.init.SoundEvents; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.ITextComponent; import java.awt.*; import java.util.ArrayList; @@ -16,32 +17,30 @@ import java.util.List; public abstract class ButtonWidget extends Gui implements IWidget { protected static final ResourceLocation WIDGET_TEX = new ResourceLocation("textures/gui/widgets.png"); - public int x; - public int y; public String text; public boolean enabled; public boolean visible; - protected int width; - protected int height; protected boolean hovered; private boolean pressed; private Rectangle bounds; - public ButtonWidget(Rectangle rectangle, String text) { - this(rectangle.x, rectangle.y, rectangle.width, rectangle.height, text); + public ButtonWidget(Rectangle rectangle, ITextComponent text) { + this(rectangle, text.getFormattedText()); } - public ButtonWidget(int x, int y, int width, int height, String text) { - this.width = 200; - this.height = 20; + public ButtonWidget(Rectangle rectangle, String text) { + this.bounds = rectangle; this.enabled = true; this.visible = true; - this.x = x; - this.y = y; - this.width = width; - this.height = height; this.text = text; - this.bounds = new Rectangle(x, this.y, this.width, this.height); + } + + public ButtonWidget(int x, int y, int width, int height, String text) { + this(new Rectangle(x, y, width, height), text); + } + + public ButtonWidget(int x, int y, int width, int height, ITextComponent text) { + this(new Rectangle(x, y, width, height), text); } public Rectangle getBounds() { @@ -66,8 +65,8 @@ public abstract class ButtonWidget extends Gui implements IWidget { @Override public void draw(int mouseX, int mouseY, float partialTicks) { - if (this.visible) { + int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height; Minecraft minecraftClient_1 = Minecraft.getInstance(); FontRenderer fontRenderer_1 = minecraftClient_1.fontRenderer; minecraftClient_1.getTextureManager().bindTexture(WIDGET_TEX); @@ -78,18 +77,18 @@ public abstract class ButtonWidget extends Gui implements IWidget { GlStateManager.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); GlStateManager.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA); //Four Corners - this.drawTexturedModalRect(this.x, this.y, 0, 46 + textureOffset * 20, 4, 4); - this.drawTexturedModalRect(this.x + this.width - 4, this.y, 196, 46 + textureOffset * 20, 4, 4); - this.drawTexturedModalRect(this.x, this.y + this.height - 4, 0, 62 + textureOffset * 20, 4, 4); - this.drawTexturedModalRect(this.x + this.width - 4, this.y + this.height - 4, 196, 62 + textureOffset * 20, 4, 4); + this.drawTextu |