From 29fe442671b099ee9bcce21691c1f459fc605254 Mon Sep 17 00:00:00 2001 From: miozune Date: Mon, 10 Jan 2022 04:06:24 +0900 Subject: [PATCH] add config --- .../java/codechicken/nei/NEIClientConfig.java | 5 +++++ .../java/codechicken/nei/recipe/GuiRecipe.java | 4 +++- .../codechicken/nei/recipe/GuiUsageRecipe.java | 17 ++++++++++++----- .../codechicken/nei/recipe/RecipeCatalysts.java | 4 +++- .../nei/recipe/TemplateRecipeHandler.java | 2 -- src/main/resources/assets/nei/lang/en_US.lang | 3 +++ 6 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/main/java/codechicken/nei/NEIClientConfig.java b/src/main/java/codechicken/nei/NEIClientConfig.java index 7ba15986..56f87ca5 100644 --- a/src/main/java/codechicken/nei/NEIClientConfig.java +++ b/src/main/java/codechicken/nei/NEIClientConfig.java @@ -188,6 +188,8 @@ public class NEIClientConfig { API.addOption(new OptionToggleButtonBoubs("inventory.jei_style_tabs", true)); tag.getTag("inventory.jei_style_item_presence_overlay").setComment("Enable/disable JEI Style item presence overlay on ?-hover").getBooleanValue(true); API.addOption(new OptionToggleButton("inventory.jei_style_item_presence_overlay", true)); + tag.getTag("inventory.jei_style_recipe_catalyst").setComment("Enable/disable JEI Style Recipe Catalysts [experimental]").getBooleanValue(false); + API.addOption(new OptionToggleButton("inventory.jei_style_recipe_catalyst", true)); tag.getTag("inventory.creative_tab_style").setComment("Creative or JEI style tabs").getBooleanValue(false); @@ -376,6 +378,9 @@ public class NEIClientConfig { public static boolean isJEIStyleItemPresenceOverlayVisible() { return getBooleanSetting("inventory.jei_style_item_presence_overlay"); } + public static boolean areJEIStyleRecipeCatalystsVisible() { + return getBooleanSetting("inventory.jei_style_recipe_catalyst"); + } public static boolean useCreativeTabStyle() { return getBooleanSetting("inventory.creative_tab_style"); } diff --git a/src/main/java/codechicken/nei/recipe/GuiRecipe.java b/src/main/java/codechicken/nei/recipe/GuiRecipe.java index 696c8ace..4a4af083 100644 --- a/src/main/java/codechicken/nei/recipe/GuiRecipe.java +++ b/src/main/java/codechicken/nei/recipe/GuiRecipe.java @@ -597,7 +597,9 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve RenderHelper.enableGUIStandardItemLighting(); OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240f, 240f); recipeTabs.draw(mouseX, mouseY); - guiRecipeCatalyst.draw(); + if (NEIClientConfig.areJEIStyleRecipeCatalystsVisible()) { + guiRecipeCatalyst.draw(); + } RenderHelper.disableStandardItemLighting(); } diff --git a/src/main/java/codechicken/nei/recipe/GuiUsageRecipe.java b/src/main/java/codechicken/nei/recipe/GuiUsageRecipe.java index acbd83fb..207baeaf 100644 --- a/src/main/java/codechicken/nei/recipe/GuiUsageRecipe.java +++ b/src/main/java/codechicken/nei/recipe/GuiUsageRecipe.java @@ -28,11 +28,18 @@ public class GuiUsageRecipe extends GuiRecipe handlers = serialUsageHandlers.stream().map(h -> h.getUsageHandler(inputId, ingredients)) .filter(h -> h.numRecipes() > 0) .collect(Collectors.toCollection(ArrayList::new)); - - handlers.addAll(ItemList.forkJoinPool.submit(() -> usagehandlers.parallelStream() - .map(h -> h.getUsageAndCatalystHandler(inputId, ingredients)) - .filter(h -> h.numRecipes() > 0) - .collect(Collectors.toCollection(ArrayList::new))).get()); + + if (NEIClientConfig.areJEIStyleRecipeCatalystsVisible()) { + handlers.addAll(ItemList.forkJoinPool.submit(() -> usagehandlers.parallelStream() + .map(h -> h.getUsageAndCatalystHandler(inputId, ingredients)) + .filter(h -> h.numRecipes() > 0) + .collect(Collectors.toCollection(ArrayList::new))).get()); + } else { + handlers.addAll(ItemList.forkJoinPool.submit(() -> usagehandlers.parallelStream() + .map(h -> h.getUsageHandler(inputId, ingredients)) + .filter(h -> h.numRecipes() > 0) + .collect(Collectors.toCollection(ArrayList::new))).get()); + } } catch (InterruptedException | ExecutionException e) { e.printStackTrace(); return false; diff --git a/src/main/java/codechicken/nei/recipe/RecipeCatalysts.java b/src/main/java/codechicken/nei/recipe/RecipeCatalysts.java index 2bd0ac8f..48ed3b66 100644 --- a/src/main/java/codechicken/nei/recipe/RecipeCatalysts.java +++ b/src/main/java/codechicken/nei/recipe/RecipeCatalysts.java @@ -29,7 +29,9 @@ public class RecipeCatalysts { } public static List getRecipeCatalysts(Class handler) { - if (!NEIClientConfig.areJEIStyleTabsVisible()) return Collections.emptyList(); + if (!NEIClientConfig.areJEIStyleTabsVisible() || !NEIClientConfig.areJEIStyleRecipeCatalystsVisible()) { + return Collections.emptyList(); + } return positionedRecipeCatalystMap.getOrDefault(handler, Collections.emptyList()); } diff --git a/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java b/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java index f21fbad4..e8ead7c4 100644 --- a/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java +++ b/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java @@ -556,8 +556,6 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH * Fallback to {@link TemplateRecipeHandler#getUsageHandler}. */ public IUsageHandler getUsageAndCatalystHandler(String inputId, Object... ingredients) { - if (!NEIClientConfig.areJEIStyleTabsVisible()) return this.getUsageHandler(inputId, ingredients); - TemplateRecipeHandler handler = newInstance(); if (inputId.equals("item")) { ItemStack candidate = (ItemStack) ingredients[0]; diff --git a/src/main/resources/assets/nei/lang/en_US.lang b/src/main/resources/assets/nei/lang/en_US.lang index 77a2abd7..ae42ad32 100644 --- a/src/main/resources/assets/nei/lang/en_US.lang +++ b/src/main/resources/assets/nei/lang/en_US.lang @@ -117,6 +117,9 @@ nei.options.inventory.jei_style_tabs.false=No [Weirdo] nei.options.inventory.jei_style_item_presence_overlay=JEI Style Item Overlay on ?-Hover nei.options.inventory.jei_style_item_presence_overlay.true=Yes nei.options.inventory.jei_style_item_presence_overlay.false=No +nei.options.inventory.jei_style_recipe_catalyst=JEI Style Recipe Catalysts [experimental] +nei.options.inventory.jei_style_recipe_catalyst.true=Yes +nei.options.inventory.jei_style_recipe_catalyst.false=No nei.options.inventory.saveCurrentRecipeInBookmarksEnabled=Save Current Recipe in Bookmarks nei.options.inventory.saveCurrentRecipeInBookmarksEnabled.true=Enabled nei.options.inventory.saveCurrentRecipeInBookmarksEnabled.false=Disabled