diff --git a/src/main/java/codechicken/nei/NEIClientConfig.java b/src/main/java/codechicken/nei/NEIClientConfig.java index 97abe0ad..d83ab16b 100644 --- a/src/main/java/codechicken/nei/NEIClientConfig.java +++ b/src/main/java/codechicken/nei/NEIClientConfig.java @@ -267,6 +267,10 @@ public class NEIClientConfig { .getBooleanValue(false); API.addOption(new OptionToggleButton("inventory.optimize_gui_overlap_computation", true)); + tag.getTag("inventory.jei_style_cycled_ingredients").setComment("JEI styled cycled ingredients") + .getBooleanValue(true); + API.addOption(new OptionToggleButton("inventory.jei_style_cycled_ingredients", true)); + tag.getTag("tools.handler_load_from_config").setComment("ADVANCED: Load handlers from config") .getBooleanValue(false); API.addOption(new OptionToggleButton("tools.handler_load_from_config", true) { @@ -570,6 +574,10 @@ public class NEIClientConfig { return getBooleanSetting("inventory.optimize_gui_overlap_computation"); } + public static boolean useJEIStyledCycledIngredients() { + return getBooleanSetting("inventory.jei_style_cycled_ingredients"); + } + public static boolean isEnabled() { return enabledOverride && getBooleanSetting("inventory.widgetsenabled"); } diff --git a/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java b/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java index 6e12c1d9..80cd8d65 100644 --- a/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java +++ b/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java @@ -182,8 +182,12 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH public List getCycledIngredients(int cycle, List ingredients) { if (!NEIClientUtils.shiftKey()) { - for (int itemIndex = 0; itemIndex < ingredients.size(); itemIndex++) { - randomRenderPermutation(ingredients.get(itemIndex), cycle + itemIndex); + if (NEIClientConfig.useJEIStyledCycledIngredients()) { + jeiStyledRenderPermutation(ingredients, cycle); + } else { + for (int itemIndex = 0; itemIndex < ingredients.size(); itemIndex++) { + randomRenderPermutation(ingredients.get(itemIndex), cycle + itemIndex); + } } } @@ -195,6 +199,12 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH stack.setPermutationToRender(Math.abs(rand.nextInt()) % stack.items.length); } + public void jeiStyledRenderPermutation(List stacks, long cycle) { + for (PositionedStack stack : stacks) { + stack.setPermutationToRender((int) (cycle % stack.items.length)); + } + } + public void setIngredientPermutation(Collection ingredients, ItemStack ingredient) { for (PositionedStack stack : ingredients) { for (int i = 0; i < stack.items.length; i++) { diff --git a/src/main/resources/assets/nei/lang/en_US.lang b/src/main/resources/assets/nei/lang/en_US.lang index 0a265a6b..4419f140 100644 --- a/src/main/resources/assets/nei/lang/en_US.lang +++ b/src/main/resources/assets/nei/lang/en_US.lang @@ -166,6 +166,9 @@ nei.options.inventory.ignore_potion_overlap.false=No nei.options.inventory.optimize_gui_overlap_computation=Optimize computation for GUI overlap nei.options.inventory.optimize_gui_overlap_computation.true=Yes nei.options.inventory.optimize_gui_overlap_computation.false=No +nei.options.inventory.jei_style_cycled_ingredients=JEI styled cycled ingredients +nei.options.inventory.jei_style_cycled_ingredients.true=Yes +nei.options.inventory.jei_style_cycled_ingredients.false=No nei.options.inventory.widgetsenabled.true=NEI Enabled nei.options.inventory.widgetsenabled.false=NEI Disabled nei.options.inventory.cheatmode.0=Recipe Mode