From 983e921f04bd626c4e599e0510020144b2a036bf Mon Sep 17 00:00:00 2001 From: slprime Date: Sat, 26 Jul 2025 11:07:06 +0300 Subject: [PATCH 1/2] Add the ability to create a chain of items with zero --- .../codechicken/nei/bookmark/BookmarkGrid.java | 14 +++++++------- .../nei/bookmark/RecipeChainDetails.java | 5 +++-- .../nei/recipe/chain/RecipeChainMath.java | 18 +++++++++--------- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/main/java/codechicken/nei/bookmark/BookmarkGrid.java b/src/main/java/codechicken/nei/bookmark/BookmarkGrid.java index dee644b5..e4de3c1a 100644 --- a/src/main/java/codechicken/nei/bookmark/BookmarkGrid.java +++ b/src/main/java/codechicken/nei/bookmark/BookmarkGrid.java @@ -1116,16 +1116,16 @@ public class BookmarkGrid extends ItemsGrid 0 && outputRecipes.stream().anyMatch(recipeId -> item.equalsRecipe(recipeId, targetGroupId))) { final long multiplier = recipeMultipliers.getOrDefault(item.recipeId, (long) Integer.MAX_VALUE); - final boolean isOutputRecipe = group.crafting != null - && !group.crafting.recipeInMiddle.contains(item.recipeId); + final boolean recipeInMiddle = group.crafting != null + && group.crafting.recipeInMiddle.contains(item.recipeId); recipeMultipliers.put( item.recipeId, Math.min( shiftMultiplier( - Math.max(isOutputRecipe ? 1 : 0, item.getMultiplier()), + Math.max(recipeInMiddle ? 1 : 0, item.getMultiplier()), shift, - isOutputRecipe ? 1 : 0), + recipeInMiddle ? 1 : 0), multiplier)); items.add(item); } @@ -1148,16 +1148,16 @@ public class BookmarkGrid extends ItemsGrid 0) { multiplier = Math.min( shiftMultiplier( - Math.max(isOutputRecipe ? 1 : 0, item.getMultiplier()), + Math.max(recipeInMiddle ? 1 : 0, item.getMultiplier()), shift, - isOutputRecipe ? 1 : 0), + recipeInMiddle ? 1 : 0), multiplier); } } diff --git a/src/main/java/codechicken/nei/bookmark/RecipeChainDetails.java b/src/main/java/codechicken/nei/bookmark/RecipeChainDetails.java index 445ff145..c24e497a 100644 --- a/src/main/java/codechicken/nei/bookmark/RecipeChainDetails.java +++ b/src/main/java/codechicken/nei/bookmark/RecipeChainDetails.java @@ -179,9 +179,10 @@ public class RecipeChainDetails { if (itemIndex >= 0 && this.calculatedItems.containsKey(itemIndex)) { final BookmarkItem item = entry.getValue(); if (this.recipeInMiddle.contains(item.recipeId)) { - this.calculatedItems.get(itemIndex).setRealAmount(item.amount); + this.calculatedItems.get(itemIndex) + .setRealAmount(Math.max(0, item.factor * (item.getMultiplier() - 1))); } else { - this.calculatedItems.get(itemIndex).setRealAmount(Math.max(item.factor, item.amount)); + this.calculatedItems.get(itemIndex).setRealAmount(item.amount); } } } diff --git a/src/main/java/codechicken/nei/recipe/chain/RecipeChainMath.java b/src/main/java/codechicken/nei/recipe/chain/RecipeChainMath.java index 2c672db3..cb3bbec9 100644 --- a/src/main/java/codechicken/nei/recipe/chain/RecipeChainMath.java +++ b/src/main/java/codechicken/nei/recipe/chain/RecipeChainMath.java @@ -116,18 +116,18 @@ public class RecipeChainMath { } for (Map.Entry entry : multipliers.entrySet()) { - if (!this.outputRecipes.containsKey(entry.getKey()) && this.preferredItems.values().stream() - .noneMatch(resItem -> resItem.recipeId.equals(entry.getKey()))) { - this.outputRecipes.put(entry.getKey(), entry.getValue()); + final RecipeId recipeId = entry.getKey(); + final boolean isOutputRecipe = this.outputRecipes.containsKey(recipeId); + final boolean recipeInMiddle = this.preferredItems.values().stream() + .anyMatch(resItem -> resItem.recipeId.equals(recipeId)); + + if (!isOutputRecipe && !recipeInMiddle) { + this.outputRecipes.put(recipeId, entry.getValue()); + } else if (isOutputRecipe && recipeInMiddle) { + this.outputRecipes.put(recipeId, Math.max(0, entry.getValue() - 1)); } } - for (Map.Entry entry : this.outputRecipes.entrySet()) { - if (entry.getValue() == 0 && this.preferredItems.values().stream() - .noneMatch(prefItem -> prefItem.recipeId.equals(entry.getKey()))) { - entry.setValue(1L); - } - } } private void collectPreferredItems(RecipeId recipeId, Map preferredItems, From 167d6fdec5a94a2f6569c3f11a24b6358a252a8a Mon Sep 17 00:00:00 2001 From: slprime Date: Sun, 3 Aug 2025 21:55:11 +0300 Subject: [PATCH 2/2] restore ctrl modifier --- src/main/java/codechicken/nei/BookmarkPanel.java | 13 ++++++++----- .../codechicken/nei/api/ShortcutInputHandler.java | 7 ++++++- .../java/codechicken/nei/bookmark/BookmarkGrid.java | 12 ++++++++---- .../codechicken/nei/recipe/GuiOverlayButton.java | 7 ++++++- src/main/resources/assets/nei/lang/en_US.lang | 4 ++-- 5 files changed, 30 insertions(+), 13 deletions(-) diff --git a/src/main/java/codechicken/nei/BookmarkPanel.java b/src/main/java/codechicken/nei/BookmarkPanel.java index 216c286d..1bdbff7f 100644 --- a/src/main/java/codechicken/nei/BookmarkPanel.java +++ b/src/main/java/codechicken/nei/BookmarkPanel.java @@ -207,11 +207,11 @@ public class BookmarkPanel extends PanelWidget { return false; } - public boolean addRecipe(Recipe recipe, int groupId) { + public boolean addRecipe(Recipe recipe, int multiplier, int groupId) { final RecipeId recipeId = recipe.getRecipeId(); if (recipe != null && this.grid.getGroup(groupId) != null && !this.grid.existsRecipe(recipeId, groupId)) { - this.grid.addRecipe(recipe, groupId); + this.grid.addRecipe(recipe, multiplier, groupId); return true; } @@ -234,7 +234,7 @@ public class BookmarkPanel extends PanelWidget { if (item instanceof Recipe recipe) { if (uniqueRecipe.add(recipe.getRecipeId())) { - this.grid.addRecipe(recipe, groupId); + this.grid.addRecipe(recipe, 1, groupId); } } else if (item instanceof RecipeId recipeId) { @@ -1195,7 +1195,10 @@ public class BookmarkPanel extends PanelWidget { && !handlerName.isEmpty() && ingredients != null && !ingredients.isEmpty()) { - addRecipe(Recipe.of(Arrays.asList(stack), handlerName, ingredients), BookmarkGrid.DEFAULT_GROUP_ID); + addRecipe( + Recipe.of(Arrays.asList(stack), handlerName, ingredients), + saveSize ? 1 : 0, + BookmarkGrid.DEFAULT_GROUP_ID); } else { addItem(stack, saveSize); } @@ -1209,7 +1212,7 @@ public class BookmarkPanel extends PanelWidget { @Deprecated public void addRecipe(BookmarkRecipe recipe, boolean saveSize, int groupId) { - addRecipe(recipe.getRecipe(), groupId); + addRecipe(recipe.getRecipe(), saveSize ? 1 : 0, groupId); } @Deprecated diff --git a/src/main/java/codechicken/nei/api/ShortcutInputHandler.java b/src/main/java/codechicken/nei/api/ShortcutInputHandler.java index a39d39b0..b511e34e 100644 --- a/src/main/java/codechicken/nei/api/ShortcutInputHandler.java +++ b/src/main/java/codechicken/nei/api/ShortcutInputHandler.java @@ -262,7 +262,8 @@ public abstract class ShortcutInputHandler { recipe.getIngredients()); singleRecipe.setCustomRecipeId(recipe.getRecipeId()); - ItemPanels.bookmarkPanel.addRecipe(singleRecipe, BookmarkGrid.DEFAULT_GROUP_ID); + ItemPanels.bookmarkPanel + .addRecipe(singleRecipe, saveStackSize ? 1 : 0, BookmarkGrid.DEFAULT_GROUP_ID); } } else { @@ -407,6 +408,10 @@ public abstract class ShortcutInputHandler { } if (recipeId != null) { + hotkeys.put( + NEIClientConfig + .getKeyName("gui.bookmark", NEIClientUtils.SHIFT_HASH + NEIClientUtils.CTRL_HASH), + NEIClientUtils.translate("bookmark.add_item_with_recipe_and_count")); hotkeys.put( NEIClientConfig.getKeyName("gui.bookmark", NEIClientUtils.SHIFT_HASH), NEIClientUtils.translate("bookmark.add_item_with_recipe")); diff --git a/src/main/java/codechicken/nei/bookmark/BookmarkGrid.java b/src/main/java/codechicken/nei/bookmark/BookmarkGrid.java index e4de3c1a..31228d0a 100644 --- a/src/main/java/codechicken/nei/bookmark/BookmarkGrid.java +++ b/src/main/java/codechicken/nei/bookmark/BookmarkGrid.java @@ -866,7 +866,7 @@ public class BookmarkGrid extends ItemsGrid results = recipe.getResults().stream().map(res -> res.getItemStack()) .collect(Collectors.toList()); @@ -874,15 +874,19 @@ public class BookmarkGrid extends ItemsGrid