From 167d6fdec5a94a2f6569c3f11a24b6358a252a8a Mon Sep 17 00:00:00 2001 From: slprime Date: Sun, 3 Aug 2025 21:55:11 +0300 Subject: [PATCH] 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