diff options
Diffstat (limited to 'src/main/java/me')
3 files changed, 109 insertions, 49 deletions
diff --git a/src/main/java/me/shedaniel/rei/api/ItemRegistry.java b/src/main/java/me/shedaniel/rei/api/ItemRegistry.java index d64bdd878..93b4510eb 100644 --- a/src/main/java/me/shedaniel/rei/api/ItemRegistry.java +++ b/src/main/java/me/shedaniel/rei/api/ItemRegistry.java @@ -50,9 +50,11 @@ public interface ItemRegistry { * @param stacks the stacks to register */ default void registerItemStack(Item afterItem, ItemStack... stacks) { - for(ItemStack stack : stacks) + for(int i = stacks.length - 1; i >= 0; i--) { + ItemStack stack = stacks[i]; if (stack != null && !stack.isEmpty()) registerItemStack(afterItem, stack); + } } /** @@ -61,9 +63,7 @@ public interface ItemRegistry { * @param stacks the stacks to register */ default void registerItemStack(ItemStack... stacks) { - for(ItemStack stack : stacks) - if (stack != null && !stack.isEmpty()) - registerItemStack(null, stack); + registerItemStack(null, stacks); } /** diff --git a/src/main/java/me/shedaniel/rei/client/ConfigObject.java b/src/main/java/me/shedaniel/rei/client/ConfigObject.java index 24f697471..eadc9532a 100644 --- a/src/main/java/me/shedaniel/rei/client/ConfigObject.java +++ b/src/main/java/me/shedaniel/rei/client/ConfigObject.java @@ -20,7 +20,7 @@ public class ConfigObject { @Comment("The ordering of the items on the item panel.") public boolean isAscending = true; @Comment("To toggle the craftable button next to the search field.") - public boolean enableCraftableOnlyButton = true; + public boolean enableCraftableOnlyButton = false; @Comment("True: search field will be on the side (left / right), false: in the middle") public boolean sideSearchField = false; diff --git a/src/main/java/me/shedaniel/rei/utils/ClothScreenRegistry.java b/src/main/java/me/shedaniel/rei/utils/ClothScreenRegistry.java index e3f58b089..3453b0480 100644 --- a/src/main/java/me/shedaniel/rei/utils/ClothScreenRegistry.java +++ b/src/main/java/me/shedaniel/rei/utils/ClothScreenRegistry.java @@ -9,10 +9,6 @@ import me.shedaniel.cloth.hooks.ScreenHooks; import me.shedaniel.clothconfig2.api.ConfigBuilder; import me.shedaniel.clothconfig2.api.ConfigCategory; import me.shedaniel.clothconfig2.api.ConfigEntryBuilder; -import me.shedaniel.clothconfig2.gui.entries.BooleanListEntry; -import me.shedaniel.clothconfig2.gui.entries.EnumListEntry; -import me.shedaniel.clothconfig2.gui.entries.IntegerSliderEntry; -import me.shedaniel.clothconfig2.gui.entries.StringListEntry; import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.api.ConfigManager; import me.shedaniel.rei.client.ScreenHelper; @@ -30,9 +26,9 @@ import java.util.Locale; import java.util.Optional; public class ClothScreenRegistry { - + public static final String RESET = "text.cloth-config.reset_value"; - + @SuppressWarnings("deprecation") public static Screen getConfigScreen(Screen parent) { final ConfigManager configManager = RoughlyEnoughItemsCore.getConfigManager(); @@ -45,56 +41,120 @@ public class ClothScreenRegistry { }); ConfigEntryBuilder eb = ConfigEntryBuilder.create(); ConfigCategory general = builder.getOrCreateCategory("text.rei.config.general"); - general.addEntry(new BooleanListEntry("text.rei.config.cheating", configManager.getConfig().cheating, RESET, () -> false, bool -> configManager.getConfig().cheating = bool) { - @Override - public Optional<String[]> getTooltip() { - String s = null; - if (!getValue()) - s = I18n.translate("text.rei.cheating_disabled"); - else if (!RoughlyEnoughItemsCore.hasOperatorPermission()) - s = I18n.translate("text.rei.cheating_enabled_no_perms"); - else if (RoughlyEnoughItemsCore.hasPermissionToUsePackets()) - s = I18n.translate("text.rei.cheating_enabled"); - else - s = I18n.translate("text.rei.cheating_limited_enabled"); - return Optional.ofNullable(new String[]{s}); - } - }); + general.addEntry(eb.startBooleanToggle("text.rei.config.cheating", configManager.getConfig().cheating) + .setDefaultValue(false) + .setSaveConsumer(bool -> configManager.getConfig().cheating = bool) + .setTooltipSupplier(bool -> { + String s = null; + if (!bool) + s = I18n.translate("text.rei.cheating_disabled"); + else if (!RoughlyEnoughItemsCore.hasOperatorPermission()) + s = I18n.translate("text.rei.cheating_enabled_no_perms"); + else if (RoughlyEnoughItemsCore.hasPermissionToUsePackets()) + s = I18n.translate("text.rei.cheating_enabled"); + else + s = I18n.translate("text.rei.cheating_limited_enabled"); + return Optional.ofNullable(new String[]{s}); + }) + .build()); ConfigCategory appearance = builder.getOrCreateCategory("text.rei.config.appearance"); - appearance.addEntry(eb.startBooleanToggle("text.rei.config.dark_theme", ScreenHelper.isDarkModeEnabled()).setDefaultValue(() -> false).setSaveConsumer(bool -> configManager.getConfig().darkTheme = bool).setTooltipSupplier(() -> getConfigTooltip("dark_theme")).buildEntry()); - appearance.addEntry(eb.startEnumSelector("text.rei.config.recipe_screen_type", RecipeScreenType.class, configManager.getConfig().screenType).setDefaultValue(() -> RecipeScreenType.UNSET).setSaveConsumer(bool -> configManager.getConfig().screenType = (RecipeScreenType) bool).setTooltipSupplier(() -> getConfigTooltip("recipe_screen_type")).buildEntry()); - appearance.addEntry(eb.startBooleanToggle("text.rei.config.side_search_box", configManager.getConfig().sideSearchField).setDefaultValue(() -> false).setSaveConsumer(bool -> configManager.getConfig().sideSearchField = bool).setTooltipSupplier(() -> getConfigTooltip("side_search_box")).buildEntry()); - appearance.addEntry(eb.startEnumSelector("text.rei.config.list_ordering", ItemListOrderingConfig.class, ItemListOrderingConfig.from(configManager.getConfig().itemListOrdering, configManager.getConfig().isAscending)).setDefaultValue(() -> ItemListOrderingConfig.REGISTRY_ASCENDING).setSaveConsumer(config -> { - configManager.getConfig().itemListOrdering = ((ItemListOrderingConfig) config).getOrdering(); - configManager.getConfig().isAscending = ((ItemListOrderingConfig) config).isAscending(); - }).setTooltipSupplier(() -> getConfigTooltip("list_ordering", ItemListOrderingConfig.REGISTRY_ASCENDING.toString())).buildEntry()); - appearance.addEntry(eb.startBooleanToggle("text.rei.config.item_list_position", configManager.getConfig().mirrorItemPanel).setDefaultValue(() -> false).setYesNoTextSupplier(bool -> I18n.translate(bool ? "text.rei.config.item_list_position.left" : "text.rei.config.item_list_position.right")).setSaveConsumer(bool -> configManager.getConfig().mirrorItemPanel = bool).buildEntry()); - appearance.addEntry(new IntegerSliderEntry("text.rei.config.max_recipes_per_page", 2, 99, configManager.getConfig().maxRecipePerPage, RESET, () -> 3, i -> configManager.getConfig().maxRecipePerPage = i, () -> getConfigTooltip("max_recipes_per_page"))); - appearance.addEntry(new BooleanListEntry("text.rei.config.light_gray_recipe_border", configManager.getConfig().lightGrayRecipeBorder, RESET, () -> false, bool -> configManager.getConfig().lightGrayRecipeBorder = bool, () -> getConfigTooltip("light_gray_recipe_border"))); - appearance.addEntry(new BooleanListEntry("text.rei.config.villager_screen_permanent_scroll_bar", configManager.getConfig().villagerScreenPermanentScrollBar, RESET, () -> false, bool -> configManager.getConfig().villagerScreenPermanentScrollBar = bool, () -> getConfigTooltip("villager_screen_permanent_scroll_bar"))); + appearance.addEntry(eb.startBooleanToggle("text.rei.config.dark_theme", ScreenHelper.isDarkModeEnabled()) + .setDefaultValue(false) + .setSaveConsumer(bool -> configManager.getConfig().darkTheme = bool) + .setTooltip(getConfigTooltip("dark_theme")) + .build()); + appearance.addEntry(eb.startEnumSelector("text.rei.config.recipe_screen_type", RecipeScreenType.class, configManager.getConfig().screenType) + .setDefaultValue(RecipeScreenType.UNSET) + .setSaveConsumer(bool -> configManager.getConfig().screenType = (RecipeScreenType) bool) + .setTooltip(getConfigTooltip("recipe_screen_type")) + .build()); + appearance.addEntry(eb.startBooleanToggle("text.rei.config.side_search_box", configManager.getConfig().sideSearchField) + .setDefaultValue(false) + .setYesNoTextSupplier(bool -> I18n.translate("text.rei.config.side_search_box.text." + bool)) + .setSaveConsumer(bool -> configManager.getConfig().sideSearchField = bool) + .setTooltip(getConfigTooltip("side_search_box")) + .build()); + appearance.addEntry(eb.startEnumSelector("text.rei.config.list_ordering", ItemListOrderingConfig.class, ItemListOrderingConfig.from(configManager.getConfig().itemListOrdering, configManager.getConfig().isAscending)) + .setDefaultValue(ItemListOrderingConfig.REGISTRY_ASCENDING) + .setSaveConsumer(config -> { + configManager.getConfig().itemListOrdering = ((ItemListOrderingConfig) config).getOrdering(); + configManager.getConfig().isAscending = ((ItemListOrderingConfig) config).isAscending(); + }) + .setTooltip(getConfigTooltip("list_ordering", ItemListOrderingConfig.REGISTRY_ASCENDING.toString())) + .build()); + appearance.addEntry(eb.startBooleanToggle("text.rei.config.item_list_position", configManager.getConfig().mirrorItemPanel) + .setDefaultValue(false) + .setYesNoTextSupplier(bool -> I18n.translate(bool ? "text.rei.config.item_list_position.left" : "text.rei.config.item_list_position.right")) + .setSaveConsumer(bool -> configManager.getConfig().mirrorItemPanel = bool) + .setTooltip(getConfigTooltip("item_list_position")) + .build()); + appearance.addEntry(eb.startIntSlider("text.rei.config.max_recipes_per_page", configManager.getConfig().maxRecipePerPage, 2, 99) + .setDefaultValue(3) + .setSaveConsumer(i -> configManager.getConfig().maxRecipePerPage = i) + .setTooltip(getConfigTooltip("max_recipes_per_page")) + .build()); + appearance.addEntry(eb.startBooleanToggle("text.rei.config.light_gray_recipe_border", configManager.getConfig().lightGrayRecipeBorder) + .setDefaultValue(false) + .setYesNoTextSupplier(bool -> I18n.translate("text.rei.config.light_gray_recipe_border.text." + bool)) + .setSaveConsumer(bool -> configManager.getConfig().lightGrayRecipeBorder = bool) + .setTooltip(getConfigTooltip("light_gray_recipe_border")) + .build()); + appearance.addEntry(eb.startBooleanToggle("text.rei.config.villager_screen_permanent_scroll_bar", configManager.getConfig().villagerScreenPermanentScrollBar) + .setYesNoTextSupplier(bool -> I18n.translate("text.rei.config.villager_screen_permanent_scroll_bar.text." + bool)) + .setDefaultValue(false) + .setSaveConsumer(bool -> configManager.getConfig().villagerScreenPermanentScrollBar = bool) + .setTooltip(getConfigTooltip("villager_screen_permanent_scroll_bar")) + .build()); + ConfigCategory action = builder.getOrCreateCategory("text.rei.config.action"); - action.addEntry(new EnumListEntry<>("text.rei.config.item_cheating_mode", ItemCheatingMode.class, configManager.getConfig().itemCheatingMode, RESET, () -> ItemCheatingMode.REI_LIKE, i -> configManager.getConfig().itemCheatingMode = i, e -> { - return I18n.translate("text.rei.config.item_cheating_mode." + e.name().toLowerCase(Locale.ROOT)); - }, () -> getConfigTooltip("item_cheating_mode"))); - action.addEntry(new StringListEntry("text.rei.give_command", configManager.getConfig().giveCommand, RESET, () -> "/give {player_name} {item_identifier}{nbt} {count}", s -> configManager.getConfig().giveCommand = s, () -> getConfigTooltip("give_command"))); - action.addEntry(new StringListEntry("text.rei.gamemode_command", configManager.getConfig().gamemodeCommand, RESET, () -> "/gamemode {gamemode}", s -> configManager.getConfig().gamemodeCommand = s, () -> getConfigTooltip("gamemode_command"))); - action.addEntry(new StringListEntry("text.rei.weather_command", configManager.getConfig().weatherCommand, RESET, () -> "/weather {weather}", s -> configManager.getConfig().weatherCommand = s, () -> getConfigTooltip("weather_command"))); - action.addEntry(new BooleanListEntry("text.rei.config.register_in_other_thread", configManager.getConfig().registerRecipesInAnotherThread, RESET, () -> true, bool -> configManager.getConfig().registerRecipesInAnotherThread = bool, () -> getConfigTooltip("register_in_other_thread"))); + action.addEntry(eb.startEnumSelector("text.rei.config.item_cheating_mode", ItemCheatingMode.class, configManager.getConfig().itemCheatingMode) + .setDefaultValue(ItemCheatingMode.REI_LIKE) + .setSaveConsumer(i -> configManager.getConfig().itemCheatingMode = (i instanceof ItemCheatingMode) ? (ItemCheatingMode) i : ItemCheatingMode.REI_LIKE) + .setEnumNameProvider(e -> I18n.translate("text.rei.config.item_cheating_mode." + ((ItemCheatingMode) e).name().toLowerCase(Locale.ROOT))) + .setTooltip(getConfigTooltip("item_cheating_mode")) + .build()); + action.addEntry(eb.startStrField("text.rei.give_command", configManager.getConfig().giveCommand) + .setDefaultValue("/give {player_name} {item_identifier}{nbt} {count}") + .setSaveConsumer(s -> configManager.getConfig().giveCommand = s) + .setTooltip(getConfigTooltip("give_command")) + .build()); + action.addEntry(eb.startStrField("text.rei.gamemode_command", configManager.getConfig().gamemodeCommand) + .setDefaultValue("/gamemode {gamemode}") + .setSaveConsumer(s -> configManager.getConfig().gamemodeCommand = s) + .setTooltip(getConfigTooltip("gamemode_command")) + .build()); + action.addEntry(eb.startStrField("text.rei.weather_command", configManager.getConfig().weatherCommand) + .setDefaultValue("/weather {weather}") + .setSaveConsumer(s -> configManager.getConfig().weatherCommand = s) + .setTooltip(getConfigTooltip("weather_command")) + .build()); ConfigCategory modules = builder.getOrCreateCategory("text.rei.config.modules"); - modules.addEntry(new BooleanListEntry("text.rei.config.enable_craftable_only", configManager.getConfig().enableCraftableOnlyButton, RESET, () -> true, bool -> configManager.getConfig().enableCraftableOnlyButton = bool, () -> getConfigTooltip("enable_craftable_only"))); - modules.addEntry(new BooleanListEntry("text.rei.config.enable_util_buttons", configManager.getConfig().showUtilsButtons, RESET, () -> false, bool -> configManager.getConfig().showUtilsButtons = bool, () -> getConfigTooltip("enable_util_buttons"))); - modules.addEntry(new BooleanListEntry("text.rei.config.disable_recipe_book", configManager.getConfig().disableRecipeBook, RESET, () -> false, bool -> configManager.getConfig().disableRecipeBook = bool, () -> getConfigTooltip("disable_recipe_book"))); + modules.addEntry(eb.startBooleanToggle("text.rei.config.enable_craftable_only", configManager.getConfig().enableCraftableOnlyButton) + .setDefaultValue(false) + .setSaveConsumer(bool -> configManager.getConfig().enableCraftableOnlyButton = bool) + .setTooltip(getConfigTooltip("enable_craftable_only")) + .build()); + modules.addEntry(eb.startBooleanToggle("text.rei.config.enable_util_buttons", configManager.getConfig().showUtilsButtons) + .setDefaultValue(false) + .setSaveConsumer(bool -> configManager.getConfig().showUtilsButtons = bool) + .setTooltip(getConfigTooltip("enable_util_buttons")) + .build()); + modules.addEntry(eb.startBooleanToggle("text.rei.config.disable_recipe_book", configManager.getConfig().disableRecipeBook) + .setDefaultValue(false) + .setSaveConsumer(bool -> configManager.getConfig().disableRecipeBook = bool) + .setTooltip(getConfigTooltip("disable_recipe_book")) + .build()); return builder.setAfterInitConsumer(screen -> { ButtonWidget w = new ButtonWidget(6, 6, 60, 20, I18n.translate("text.rei.credits"), widget -> MinecraftClient.getInstance().openScreen(new CreditsScreen(MinecraftClient.getInstance().currentScreen))); ((ScreenHooks) screen).cloth_getButtonWidgets().add(0, w); ((ScreenHooks) screen).cloth_getChildren().add(0, w); }).build(); } - + private static Optional<String[]> getConfigTooltip(String s, Object... o) { if (I18n.hasTranslation("tooltip.rei.config." + s)) return Optional.ofNullable(I18n.translate("tooltip.rei.config." + s, o).split("\n")); return Optional.empty(); } - + } |