diff options
Diffstat (limited to 'src/main/java')
31 files changed, 292 insertions, 429 deletions
diff --git a/src/main/java/me/shedaniel/rei/api/RecipeCategory.java b/src/main/java/me/shedaniel/rei/api/RecipeCategory.java index 79a9a0b7d..4bc4c6e0d 100644 --- a/src/main/java/me/shedaniel/rei/api/RecipeCategory.java +++ b/src/main/java/me/shedaniel/rei/api/RecipeCategory.java @@ -1,7 +1,7 @@ package me.shedaniel.rei.api; import me.shedaniel.rei.gui.RecipeViewingScreen; -import me.shedaniel.rei.gui.widget.IWidget; +import me.shedaniel.rei.gui.widget.Widget; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; import net.minecraft.client.gui.DrawableHelper; import net.minecraft.item.ItemStack; @@ -21,7 +21,7 @@ public interface RecipeCategory<T extends RecipeDisplay> { String getCategoryName(); - default List<IWidget> setupDisplay(Supplier<T> recipeDisplaySupplier, Rectangle bounds) { + default List<Widget> setupDisplay(Supplier<T> recipeDisplaySupplier, Rectangle bounds) { return Collections.singletonList(new RecipeBaseWidget(bounds)); } diff --git a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java index e50b7d9c9..b79dbf4c6 100644 --- a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java +++ b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java @@ -39,7 +39,7 @@ public class ContainerScreenOverlay extends ScreenComponent { public static String searchTerm = ""; private static int page = 0; private static ItemListOverlay itemListOverlay; - private final List<IWidget> widgets = Lists.newArrayList(); + private final List<Widget> widgets = Lists.newArrayList(); private Rectangle rectangle; private Window window; private ButtonWidget buttonLeft, buttonRight; @@ -56,7 +56,7 @@ public class ContainerScreenOverlay extends ScreenComponent { widgets.add(buttonLeft = new ButtonWidget(rectangle.x, rectangle.y + 5, 16, 16, new TranslatableTextComponent("text.rei.left_arrow")) { @Override - public void onPressed(int button, double mouseX, double mouseY) { + public void onPressed() { page--; if (page < 0) page = getTotalPage(); @@ -65,7 +65,7 @@ public class ContainerScreenOverlay extends ScreenComponent { }); widgets.add(buttonRight = new ButtonWidget(rectangle.x + rectangle.width - 18, rectangle.y + 5, 16, 16, new TranslatableTextComponent("text.rei.right_arrow")) { @Override - public void onPressed(int button, double mouseX, double mouseY) { + public void onPressed() { page++; if (page > getTotalPage()) page = 0; @@ -75,7 +75,7 @@ public class ContainerScreenOverlay extends ScreenComponent { page = MathHelper.clamp(page, 0, getTotalPage()); widgets.add(new ButtonWidget(RoughlyEnoughItemsCore.getConfigManager().getConfig().mirrorItemPanel ? window.getScaledWidth() - 30 : 10, 10, 20, 20, "") { @Override - public void onPressed(int button, double mouseX, double mouseY) { + public void onPressed() { if (Screen.isShiftPressed()) { ClientHelper.setCheating(!ClientHelper.isCheating()); return; @@ -106,14 +106,14 @@ public class ContainerScreenOverlay extends ScreenComponent { if (!RoughlyEnoughItemsCore.getConfigManager().getConfig().disableCreditsButton) widgets.add(new ButtonWidget(RoughlyEnoughItemsCore.getConfigManager().getConfig().mirrorItemPanel ? window.getScaledWidth() - 50 : 10, window.getScaledHeight() - 30, 40, 20, I18n.translate("text.rei.credits")) { @Override - public void onPressed(int button, double mouseX, double mouseY) { + public void onPressed() { MinecraftClient.getInstance().openScreen(new CreditsScreen(ScreenHelper.getLastContainerScreen())); } }); if (RoughlyEnoughItemsCore.getConfigManager().getConfig().showUtilsButtons) { widgets.add(new ButtonWidget(RoughlyEnoughItemsCore.getConfigManager().getConfig().mirrorItemPanel ? window.getScaledWidth() - 55 : 35, 10, 20, 20, "") { @Override - public void onPressed(int button, double mouseX, double mouseY) { + public void onPressed() { MinecraftClient.getInstance().player.sendChatMessage(RoughlyEnoughItemsCore.getConfigManager().getConfig().gamemodeCommand.replaceAll("\\{gamemode}", getNextGameMode().getName())); } @@ -127,7 +127,7 @@ public class ContainerScreenOverlay extends ScreenComponent { }); widgets.add(new ButtonWidget(RoughlyEnoughItemsCore.getConfigManager().getConfig().mirrorItemPanel ? window.getScaledWidth() - 80 : 60, 10, 20, 20, "") { @Override - public void onPressed(int button, double mouseX, double mouseY) { + public void onPressed() { MinecraftClient.getInstance().player.sendChatMessage(RoughlyEnoughItemsCore.getConfigManager().getConfig().weatherCommand.replaceAll("\\{weather}", getNextWeather().getName().toLowerCase())); } @@ -181,7 +181,7 @@ public class ContainerScreenOverlay extends ScreenComponent { if (RoughlyEnoughItemsCore.getConfigManager().getConfig().enableCraftableOnlyButton) this.widgets.add(new CraftableToggleButtonWidget(getCraftableToggleArea()) { @Override - public void onPressed(int button, double mouseX, double mouseY) { + public void onPressed() { RoughlyEnoughItemsCore.getConfigManager().toggleCraftableOnly(); itemListOverlay.updateList(getItemListArea(), page, searchTerm); } @@ -369,14 +369,14 @@ public class ContainerScreenOverlay extends ScreenComponent { return false; if (rectangle.contains(ClientHelper.getMouseLocation())) { if (amount > 0 && buttonLeft.enabled) - buttonLeft.onPressed(0, 0, 0); + buttonLeft.onPressed(); else if (amount < 0 && buttonRight.enabled) - buttonRight.onPressed(0, 0, 0); + buttonRight.onPressed(); else return false; return true; } - for(IWidget widget : widgets) + for(Widget widget : widgets) if (widget.mouseScrolled(i, j, amount)) return true; return false; diff --git a/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java index 68fde8422..cbfafb1af 100644 --- a/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java @@ -32,7 +32,7 @@ public class RecipeViewingScreen extends Screen { public static final Identifier CHEST_GUI_TEXTURE = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer.png"); public static final Color SUB_COLOR = new Color(159, 159, 159); private static final Identifier CREATIVE_INVENTORY_TABS = new Identifier("textures/gui/container/creative_inventory/tabs.png"); - private final List<IWidget> widgets; + private final List<Widget> widgets; private final List<TabWidget> tabs; private final Map<RecipeCategory, List<RecipeDisplay>> categoriesMap; private final List<RecipeCategory> categories; @@ -83,14 +83,18 @@ public class RecipeViewingScreen extends Screen { ScreenHelper.getLastOverlay().onInitialized(); return true; } + if (int_1 == 258) { + if (isShiftPressed()) + this.method_19354(); + else + this.focusNext(); + return true; + } if (choosePageActivated) { if (recipeChoosePageWidget.keyPressed(int_1, int_2, int_3)) return true; return false; } - for(InputListener listener : listeners) - if (listener.keyPressed(int_1, int_2, int_3)) - return true; return super.keyPressed(int_1, int_2, int_3); } @@ -114,7 +118,7 @@ public class RecipeViewingScreen extends Screen { widgets.add(categoryBack = new ButtonWidget((int) bounds.getX() + 5, (int) bounds.getY() + 5, 12, 12, new TranslatableTextComponent("text.rei.left_arrow")) { @Override - public void onPressed(int button, double mouseX, double mouseY) { + public void onPressed() { int currentCategoryIndex = categories.indexOf(selectedCategory); currentCategoryIndex--; if (currentCategoryIndex < 0) @@ -125,9 +129,26 @@ public class RecipeViewingScreen extends Screen { RecipeViewingScreen.this.onInitialized(); } }); + widgets.add(new ClickableLabelWidget((int) bounds.getCenterX(), (int) bounds.getY() + 7, "") { + @Override + public void draw(int mouseX, int mouseY, float partialTicks) { + this.text = selectedCategory.getCategoryName(); + super.draw(mouseX, mouseY, partialTicks); + if (isHighlighted(mouseX, mouseY)) + ScreenHelper.getLastOverlay().addTooltip(QueuedTooltip.create(I18n.translate("text.rei.view_all_categories").split("\n"))); + else if (focused) + ScreenHelper.getLastOverlay().addTooltip(QueuedTooltip.create(new Point(x, y), I18n.translate("text.rei.view_all_categories").split("\n"))); + } + + @Override + public void onLabelClicked() { + MinecraftClient.getInstance().getSoundLoader().play(PositionedSoundInstance.master(SoundEvents.UI_BUTTON_CLICK, 1.0F)); + ClientHelper.executeViewAllRecipesKeyBind(); + } + }); widgets.add(categoryNext = new ButtonWidget((int) bounds.getMaxX() - 17, (int) bounds.getY() + 5, 12, 12, new TranslatableTextComponent("text.rei.right_arrow")) { @Override - public void onPressed(int button, double mouseX, double mouseY) { + public void onPressed() { int currentCategoryIndex = categories.indexOf(selectedCategory); currentCategoryIndex++; if (currentCategoryIndex >= categories.size()) @@ -143,40 +164,13 @@ public class RecipeViewingScreen extends Screen { widgets.add(recipeBack = new ButtonWidget((int) bounds.getX() + 5, (int) bounds.getY() + 21, 12, 12, new TranslatableTextComponent("text.rei.left_arrow")) { @Override - public void onPressed(int button, double mouseX, double mouseY) { + public void onPressed() { page--; if (page < 0) page = getTotalPages(selectedCategory) - 1; RecipeViewingScreen.this.onInitialized(); } }); - widgets.add(recipeNext = new ButtonWidget((int) bounds.getMaxX() - 17, (int) bounds.getY() + 21, 12, 12, new TranslatableTextComponent("text.rei.right_arrow")) { - @Override - public void onPressed(int button, double mouseX, double mouseY) { - page++; - if (page >= getTotalPages(selectedCategory)) - page = 0; - RecipeViewingScreen.this.onInitialized(); - } - }); - recipeBack.enabled = categoriesMap.get(selectedCategory).size() > getRecipesPerPage(); - recipeNext.enabled = categoriesMap.get(selectedCategory).size() > getRecipesPerPage(); - - widgets.add(new ClickableLabelWidget((int) bounds.getCenterX(), (int) bounds.getY() + 7, "") { - @Override - public void draw(int mouseX, int mouseY, float partialTicks) { - this.text = selectedCategory.getCategoryName(); - super.draw(mouseX, mouseY, partialTicks); - if (isHighlighted(mouseX, mouseY)) - ScreenHelper.getLastOverlay().addTooltip(QueuedTooltip.create(I18n.translate("text.rei.view_all_categories").split("\n"))); - } - - @Override - public void onLabelClicked() { - MinecraftClient.getInstance().getSoundLoader().play(PositionedSoundInstance.master(SoundEvents.UI_BUTTON_CLICK, 1.0F)); - ClientHelper.executeViewAllRecipesKeyBind(); - } - }); widgets.add(new ClickableLabelWidget((int) bounds.getCenterX(), (int) bounds.getY() + 23, "") { @Override public void draw(int mouseX, int mouseY, float partialTicks) { @@ -184,6 +178,8 @@ public class RecipeViewingScreen extends Screen { super.draw(mouseX, mouseY, partialTicks); if (isHighlighted(mouseX, mouseY)) ScreenHelper.getLastOverlay().addTooltip(QueuedTooltip.create(I18n.translate("text.rei.choose_page").split("\n"))); + else if (focused) + ScreenHelper.getLastOverlay().addTooltip(QueuedTooltip.create(new Point(x, y), I18n.translate("text.rei.choose_page").split("\n"))); } @Override @@ -193,13 +189,25 @@ public class RecipeViewingScreen extends Screen { RecipeViewingScreen.this.onInitialized(); } }); + widgets.add(recipeNext = new ButtonWidget((int) bounds.getMaxX() - 17, (int) bounds.getY() + 21, 12, 12, new TranslatableTextComponent("text.rei.right_arrow")) { + @Override + public void onPressed() { + page++; + if (page >= getTotalPages(selectedCategory)) + page = 0; + RecipeViewingScreen.this.onInitialized(); + } + }); + recipeBack.enabled = categoriesMap.get(selectedCategory).size() > getRecipesPerPage(); + recipeNext.enabled = categoriesMap.get(selectedCategory).size() > getRecipesPerPage(); + for(int i = 0; i < 6; i++) { int j = i + categoryPages * 6; if (categories.size() > j) { TabWidget tab; tabs.add(tab = new TabWidget(i, this, new Rectangle(bounds.x + 4 + 28 * i, bounds.y - 28, 28, 28)) { @Override - public boolean onMouseClick(int button, double mouseX, double mouseY) { + public boolean mouseClicked(double mouseX, double mouseY, int button) { if (getBounds().contains(mouseX, mouseY)) { MinecraftClient.getInstance().getSoundLoader().play(PositionedSoundInstance.master(SoundEvents.UI_BUTTON_CLICK, 1.0F)); if (getId() + categoryPages * 6 == categories.indexOf(selectedCategory)) @@ -238,7 +246,7 @@ public class RecipeViewingScreen extends Screen { listeners.addAll(widgets); } - public List<IWidget> getWidgets() { + public List<Widget> getWidgets() { return widgets; } @@ -354,15 +362,15 @@ public class RecipeViewingScreen extends Screen { return true; if (getBounds().contains(ClientHelper.getMouseLocation())) { if (amount > 0 && recipeBack.enabled) - recipeBack.onPressed(0, 0, 0); + recipeBack.onPressed(); else if (amount < 0 && recipeNext.enabled) - recipeNext.onPressed(0, 0, 0); + recipeNext.onPressed(); } if ((new Rectangle(bounds.x, bounds.y - 28, bounds.width, 28)).contains(ClientHelper.getMouseLocation())) { if (amount > 0 && categoryBack.enabled) - categoryBack.onPressed(0, 0, 0); + categoryBack.onPressed(); else if (amount < 0 && categoryNext.enabled) - categoryNext.onPressed(0, 0, 0); + categoryNext.onPressed(); } return super.mouseScrolled(i, j, amount); } @@ -383,17 +391,17 @@ public class RecipeViewingScreen extends Screen { if (entry.mouseClicked(double_1, double_2, int_1)) { focusOn(entry); if (int_1 == 0) - method_1966(true); //setActive + setActive(true); return true; } return false; } - @Override //getFocused - public InputListener method_19357() { + @Override + public InputListener getFocused() { if (choosePageActivated) return recipeChoosePageWidget; - return super.method_19357(); + return super.getFocused(); } } 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 8e42c622a..fdea6df9f 100644 --- a/src/main/java/me/shedaniel/rei/gui/config/ConfigEntry.java +++ b/src/main/java/me/shedaniel/rei/gui/config/ConfigEntry.java @@ -4,11 +4,9 @@ import me.shedaniel.rei.client.ClientHelper; import me.shedaniel.rei.gui.widget.ButtonWidget; import me.shedaniel.rei.gui.widget.TextFieldWidget; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.audio.PositionedSoundInstance; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.widget.EntryListWidget; import net.minecraft.client.util.Window; -import net.minecraft.sound.SoundEvents; import net.minecraft.text.Style; import net.minecraft.text.TextComponent; @@ -26,17 +24,9 @@ public abstract class ConfigEntry extends EntryListWidget.Entry<ConfigEntry> { 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)) { - MinecraftClient.getInstance().getSoundLoader().play(PositionedSoundInstance.master(SoundEvents.UI_BUTTON_CLICK, 1.0F)); - return true; - } - return false; + public void onPressed() { + buttonProvider.onPressed(); } - - @Override - public void onPressed(int button, double mouseX, double mouseY) {} }; } @@ -65,7 +55,7 @@ public abstract class ConfigEntry extends EntryListWidget.Entry<ConfigEntry> { interface ConfigEntryButtonProvider { - public boolean onPressed(int button, double mouseX, double mouseY); + public void onPressed(); public String getText(); 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 c1f0f885d..ce8814abf 100644 --- a/src/main/java/me/shedaniel/rei/gui/config/ConfigScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/config/ConfigScreen.java @@ -7,10 +7,9 @@ import me.shedaniel.rei.client.ItemListOrdering; import me.shedaniel.rei.client.ScreenHelper; import me.shedaniel.rei.gui.widget.QueuedTooltip; import me.shedaniel.rei.gui.widget.TextFieldWidget; -import net.minecraft.class_4185; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.InputListener; import net.minecraft.client.gui.Screen; +import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.render.GuiLighting; import net.minecraft.client.resource.language.I18n; import net.minecraft.text.TranslatableTextComponent; @@ -35,14 +34,13 @@ public class ConfigScreen extends Screen { @Override public boolean keyPressed(int int_1, int int_2, int int_3) { - if (int_1 == 256 && this.doesEscapeKeyClose()) { + if (int_1 == 256) { MinecraftClient.getInstance().openScreen(parent); if (initOverlay) ScreenHelper.getLastOverlay().onInitialized(); return true; - } else { - return super.keyPressed(int_1, int_2, int_3); } + return super.keyPressed(int_1, int_2, int_3); } @Override @@ -52,10 +50,8 @@ public class ConfigScreen extends Screen { entryListWidget.configAddEntry(new ConfigEntry.CategoryTitleConfigEntry(new TranslatableTextComponent("text.rei.config.general"))); entryListWidget.configAddEntry(new ConfigEntry.ButtonConfigEntry(new TranslatableTextComponent("text.rei.config.cheating"), new ConfigEntry.ButtonConfigEntry.ConfigEntryButtonProvider() { @Override - public boolean onPressed(int button, double mouseX, double mouseY) { - if (button == 0) - ClientHelper.setCheating(!ClientHelper.isCheating()); - return true; + public void onPressed() { + ClientHelper.setCheating(!ClientHelper.isCheating()); } @Override @@ -66,16 +62,13 @@ public class ConfigScreen extends Screen { entryListWidget.configAddEntry(new ConfigEntry.CategoryTitleConfigEntry(new TranslatableTextComponent("text.rei.config.appearance"))); entryListWidget.configAddEntry(new ConfigEntry.ButtonConfigEntry(new TranslatableTextComponent("text.rei.config.side_search_box"), new ConfigEntry.ButtonConfigEntry.ConfigEntryButtonProvider() { @Override - public boolean onPressed(int button, double mouseX, double mouseY) { - if (button == 0) - RoughlyEnoughItemsCore.getConfigManager().getConfig().sideSearchField = !RoughlyEnoughItemsCore.getConfigManager().getConfig().sideSearchField; + public void onPressed() { + RoughlyEnoughItemsCore.getConfigManager().getConfig().sideSearchField = !RoughlyEnoughItemsCore.getConfigManager().getConfig().sideSearchField; try { RoughlyEnoughItemsCore.getConfigManager().saveConfig(); } catch (IOException e) { e.printStackTrace(); - return false; } - return true; } @Override @@ -85,7 +78,7 @@ public class ConfigScreen extends Screen { })); entryListWidget.configAddEntry(new ConfigEntry.ButtonConfigEntry(new TranslatableTextComponent("text.rei.config.list_ordering"), new ConfigEntry.ButtonConfigEntry.ConfigEntryButtonProvider() { @Override - public boolean onPressed(int button, double mouseX, double mouseY) { + public void onPressed() { int index = Arrays.asList(ItemListOrdering.values()).indexOf(RoughlyEnoughItemsCore.getConfigManager().getConfig().itemListOrdering) + 1; if (index >= ItemListOrdering.values().length) { index = 0; @@ -96,9 +89,7 @@ public class ConfigScreen extends Screen { RoughlyEnoughItemsCore.getConfigManager().saveConfig(); } catch (IOException e) { e.printStackTrace(); - return false; } - return true; } @Override @@ -108,16 +99,13 @@ public class ConfigScreen extends Screen { })); entryListWidget.configAddEntry(new ConfigEntry.ButtonConfigEntry(new TranslatableTextComponent("text.rei.config.mirror_rei"), new ConfigEntry.ButtonConfigEntry.ConfigEntryButtonProvider() { @Override - public boolean onPressed(int button, double mouseX, double mouseY) { - if (button == 0) - RoughlyEnoughItemsCore.getConfigManager().getConfig().mirrorItemPanel = !RoughlyEnoughItemsCore.getConfigManager().getConfig().mirrorItemPanel; + public void onPressed() { + RoughlyEnoughItemsCore.getConfigManager().getConfig().mirrorItemPanel = !RoughlyEnoughItemsCore.getConfigManager().getConfig().mirrorItemPanel; try { RoughlyEnoughItemsCore.getConfigManager().saveConfig(); } catch (IOException e) { e.printStackTrace(); - return false; } - return true; } @Override @@ -128,16 +116,13 @@ public class ConfigScreen extends Screen { entryListWidget.configAddEntry(new ConfigEntry.CategoryTitleConfigEntry(new TranslatableTextComponent("text.rei.config.modules"))); entryListWidget.configAddEntry(new ConfigEntry.ButtonConfigEntry(new TranslatableTextComponent("text.rei.config.enable_craftable_only"), new ConfigEntry.ButtonConfigEntry.ConfigEntryButtonProvider() { @Override - public boolean onPressed(int button, double mouseX, double mouseY) { - if (button == 0) - RoughlyEnoughItemsCore.getConfigManager().getConfig().enableCraftableOnlyButton = !RoughlyEnoughItemsCore.getConfigManager().getConfig().enableCraftableOnlyButton; + public void onPressed() { + RoughlyEnoughItemsCore.getConfigManager().getConfig().enableCraftableOnlyButton = !RoughlyEnoughItemsCore.getConfigManager().getConfig().enableCraftableOnlyButton; try { RoughlyEnoughItemsCore.getConfigManager().saveConfig(); } catch (IOException e) { e.printStackTrace(); - return false; } - return true; } @Override @@ -147,16 +132,13 @@ public class ConfigScreen extends Screen { })); entryListWidget.configAddEntry(new ConfigEntry.ButtonConfigEntry(new TranslatableTextComponent("text.rei.config.load_default_plugin"), new ConfigEntry.ButtonConfigEntry.ConfigEntryButtonProvider() { @Override - public boolean onPressed(int button, double mouseX, double mouseY) { - if (button == 0) - RoughlyEnoughItemsCore.getConfigManager().getConfig().loadDefaultPlugin = !RoughlyEnoughItemsCore.getConfigManager().getConfig().loadDefaultPlugin; + public void onPressed() { + RoughlyEnoughItemsCore.getConfigManager().getConfig().loadDefaultPlugin = !RoughlyEnoughItemsCore.getConfigManager().getConfig().loadDefaultPlugin; try { RoughlyEnoughItemsCore.getConfigManager().saveConfig(); } catch (IOException e) { e.printStackTrace(); - return false; } - return true; } @Override @@ -174,16 +156,13 @@ public class ConfigScreen extends Screen { })); entryListWidget.configAddEntry(new ConfigEntry.ButtonConfigEntry(new TranslatableTextComponent("text.rei.config.disable_credits_button"), new ConfigEntry.ButtonConfigEntry.ConfigEntryButtonProvider() { @Override - public boolean onPressed(int button, double mouseX, double mouseY) { - if (button == 0) - RoughlyEnoughItemsCore.getConfigManager().getConfig().disableCreditsButton = !RoughlyEnoughItemsCore.getConfigManager().getConfig().disableCreditsButton; + public void onPressed() { + RoughlyEnoughItemsCore.getConfigManager().getConfig().disableCreditsButton = !RoughlyEnoughItemsCore.getConfigManager().getConfig().disableCreditsButton; try { RoughlyEnoughItemsCore.getConfigManager().saveConfig(); } catch (IOException e) { e.printStackTrace(); - return false; } - return true; } @Override @@ -193,16 +172,13 @@ public class ConfigScreen extends Screen { })); entryListWidget.configAddEntry(new ConfigEntry.ButtonConfigEntry(new TranslatableTextComponent("text.rei.config.enable_util_buttons"), new ConfigEntry.ButtonConfigEntry.ConfigEntryButtonProvider() { @Override - public boolean onPressed(int button, double mouseX, double mouseY) { - if (button == 0) - RoughlyEnoughItemsCore.getConfigManager().getConfig().showUtilsButtons = !RoughlyEnoughItemsCore.getConfigManager().getConfig().showUtilsButtons; + public void onPressed() { + RoughlyEnoughItemsCore.getConfigManager().getConfig().showUtilsButtons = !RoughlyEnoughItemsCore.getConfigManager().getConfig().showUtilsButtons; try { RoughlyEnoughItemsCore.getConfigManager().saveConfig(); } catch (IOException e) { e.printStackTrace(); - return false; } - return true; } @Override @@ -212,16 +188,13 @@ public class ConfigScreen extends Screen { })); entryListWidget.configAddEntry(new ConfigEntry.ButtonConfigEntry(new TranslatableTextComponent("text.r |