Compare commits

..
Author SHA1 Message Date
Martin Robertz 5576f1ba09 Merge remote-tracking branch 'slprime/bookmarks_groups_and_filter' into dev 2024-02-03 16:33:27 +01:00
slprime d64c270e3a Bookmarks Recipe Chains: fluid cell 2024-02-03 15:33:01 +02:00
Martin Robertz 12da0ba608 Merge remote-tracking branch 'slprime/bookmarks_groups_and_filter' into dev 2024-02-02 15:36:55 +01:00
slprime 3d07a33e3c Bookmarks Recipe Chains: fluid canner 2024-02-01 20:18:44 +02:00
Martin Robertz 4062f6c001 update bs 2024-01-31 23:18:49 +01:00
Martin Robertz 8fbb876a81 Merge remote-tracking branch 'slprime/bookmarks_groups_and_filter' into dev 2024-01-31 23:08:47 +01:00
slprime e050faaa90 fix fast DnD and recipe tooltip 2024-01-29 21:07:18 +02:00
Martin Robertz 576da1468c Merge remote-tracking branch 'slprime/bookmarks_groups_and_filter' into dev 2024-01-29 07:19:44 +01:00
slprime 316494df15 fix creating groups for 2-line recipes 2024-01-28 18:20:41 +02:00
Martin Robertz 66deab6dbd Merge remote-tracking branch 'slprime/bookmarks_groups_and_filter' into dev 2024-01-26 21:30:09 +01:00
slprime 4953edde4b fixed rounding in chain calculation 2024-01-26 19:19:02 +02:00
slprime 9873de760f Change Search Recipe Algorithm 2024-01-26 17:53:31 +02:00
Martin Robertz 355cc5bd0e Merge remote-tracking branch 'slprime/bookmarks_groups_and_filter' into dev 2024-01-22 18:21:53 +01:00
slprime 183e40a6c2 fix recipe extra information 2024-01-22 00:57:27 +02:00
Martin Robertz 79660a09d5 Merge remote-tracking branch 'slprime/bookmarks_groups_and_filter' into dev 2024-01-21 11:16:56 +01:00
slprime b03ae51e3c Add Search Recipe Icon 2024-01-21 12:11:49 +02:00
Martin Robertz 91d57c28b7 Merge remote-tracking branch 'slprime/bookmarks_groups_and_filter' into dev 2024-01-20 21:43:51 +01:00
slprime 06cdea3fd6 fix input V in ME terminal 2024-01-19 23:39:01 +02:00
Martin Robertz ceae486a31 update bs+properties 2024-01-16 22:10:41 +01:00
Martin Robertz d35e77661f Merge remote-tracking branch 'slprime/bookmarks_groups_and_filter' into dev 2024-01-16 22:09:20 +01:00
slprime 4285632807 remove println 2024-01-14 16:02:21 +02:00
slprime b16916dbe6 Optimize Chain Algorithm 2024-01-14 14:51:26 +02:00
Martin Robertz 57db3fa789 Merge remote-tracking branch 'slprime/bookmarks_groups_and_filter' into dev 2024-01-14 10:38:18 +01:00
slprime c5c798c61a Pull all Bookmarked Items: use groups 2024-01-13 18:35:19 +02:00
Martin Robertz f9cba79a22 update deps 2024-01-13 00:09:15 +01:00
slprime 0a24334693 change hiddenhandler handlerId 2024-01-11 23:43:36 +02:00
slprime 8ef88ff9f2 fix crash after DnD; add remove group function 2024-01-11 21:08:08 +02:00
slprime 4cfbe6b3ad Create Bookmarks Groups; Search Recipe 2024-01-10 23:29:03 +02:00
3 changed files with 25 additions and 48 deletions

No files matched your search

@@ -20,6 +20,8 @@ import codechicken.nei.recipe.BookmarkRecipeId;
import codechicken.nei.recipe.GuiCraftingRecipe;
import codechicken.nei.recipe.GuiRecipe;
import codechicken.nei.recipe.GuiUsageRecipe;
import codechicken.nei.recipe.StackInfo;
import codechicken.nei.recipe.stackinfo.GTFluidStackStringifyHandler;
public abstract class ShortcutInputHandler {
@@ -65,11 +67,11 @@ public abstract class ShortcutInputHandler {
}
if (NEIClientConfig.isKeyHashDown("gui.recipe")) {
return GuiCraftingRecipe.openRecipeGui("item", stackover);
return GuiCraftingRecipe.openRecipeGui("item", normalizeItemStack(stackover));
}
if (NEIClientConfig.isKeyHashDown("gui.usage")) {
return GuiUsageRecipe.openRecipeGui("item", stackover);
return GuiUsageRecipe.openRecipeGui("item", normalizeItemStack(stackover));
}
if (NEIClientConfig.isKeyHashDown("gui.bookmark")) {
@@ -99,6 +101,7 @@ public abstract class ShortcutInputHandler {
if (stackover != null) {
final int button = Mouse.getEventButton();
stackover = stackover.copy();
if (button == 0) {
return GuiCraftingRecipe.openRecipeGui("item", stackover);
@@ -164,4 +167,10 @@ public abstract class ShortcutInputHandler {
return false;
}
private static ItemStack normalizeItemStack(ItemStack stack) {
GTFluidStackStringifyHandler.replaceAE2FCFluidDrop = true;
stack = StackInfo.loadFromNBT(StackInfo.itemStackToNBT(stack));
GTFluidStackStringifyHandler.replaceAE2FCFluidDrop = false;
return stack;
}
}
@@ -18,7 +18,6 @@ import codechicken.nei.ItemPanels;
import codechicken.nei.NEIClientConfig;
import codechicken.nei.NEIClientUtils;
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.stackinfo.GTFluidStackStringifyHandler;
public class GuiCraftingRecipe extends GuiRecipe<ICraftingHandler> {
@@ -34,7 +33,6 @@ public class GuiCraftingRecipe extends GuiRecipe<ICraftingHandler> {
final BookmarkRecipeId recipeId;
if ("item".equals(outputId)) {
results = Arrays.asList(results).stream().map(rslt -> normalizeItemStack((ItemStack) rslt)).toArray();
recipeId = getRecipeId(mc.currentScreen, (ItemStack) results[0]);
} else if ("recipeId".equals(outputId)) {
recipeId = (BookmarkRecipeId) results[1];
@@ -116,13 +114,6 @@ public class GuiCraftingRecipe extends GuiRecipe<ICraftingHandler> {
return GuiRecipeTab.getHandlerInfo(handler).getHandlerName();
}
private static ItemStack normalizeItemStack(ItemStack stack) {
GTFluidStackStringifyHandler.replaceAE2FCFluidDrop = true;
stack = StackInfo.loadFromNBT(StackInfo.itemStackToNBT(stack));
GTFluidStackStringifyHandler.replaceAE2FCFluidDrop = false;
return stack;
}
protected static BookmarkRecipeId getRecipeId(GuiScreen gui, ItemStack stackover) {
if (gui instanceof GuiRecipe) {
@@ -4,11 +4,9 @@ import java.util.ArrayList;
import java.util.Arrays;
import net.minecraft.client.Minecraft;
import net.minecraft.item.ItemStack;
import codechicken.nei.NEIClientConfig;
import codechicken.nei.NEIClientUtils;
import codechicken.nei.recipe.stackinfo.GTFluidStackStringifyHandler;
public class GuiUsageRecipe extends GuiRecipe<IUsageHandler> {
@@ -16,50 +14,29 @@ public class GuiUsageRecipe extends GuiRecipe<IUsageHandler> {
public static ArrayList<IUsageHandler> serialUsageHandlers = new ArrayList<>();
public static boolean openRecipeGui(String inputId, Object... ingredients) {
if ("item".equals(inputId)) {
ingredients = Arrays.asList(ingredients).stream().map(ingr -> normalizeItemStack((ItemStack) ingr))
.toArray();
}
final ArrayList<IUsageHandler> handlers = getUsageHandlers(inputId, ingredients);
if (!handlers.isEmpty()) {
final Minecraft mc = NEIClientUtils.mc();
final BookmarkRecipeId recipeId = getCurrentRecipe(mc.currentScreen);
final GuiUsageRecipe gui = new GuiUsageRecipe(handlers);
mc.displayGuiScreen(gui);
gui.openTargetRecipe(recipeId);
return true;
}
return false;
}
private GuiUsageRecipe(ArrayList<IUsageHandler> handlers) {
super(NEIClientUtils.mc().currentScreen);
this.currenthandlers = handlers;
}
public static ArrayList<IUsageHandler> getUsageHandlers(String inputId, Object... ingredients) {
final RecipeHandlerQuery<IUsageHandler> recipeQuery = new RecipeHandlerQuery<>(
RecipeHandlerQuery<IUsageHandler> recipeQuery = new RecipeHandlerQuery<>(
h -> getUsageOrCatalystHandler(h, inputId, ingredients),
usagehandlers,
serialUsageHandlers,
"Error while looking up usage recipe",
"inputId: " + inputId,
"ingredients: " + Arrays.toString(ingredients));
ArrayList<IUsageHandler> handlers = recipeQuery.runWithProfiling("recipe.concurrent.usage");
if (handlers.isEmpty()) return false;
return recipeQuery.runWithProfiling("recipe.concurrent.usage");
Minecraft mc = NEIClientUtils.mc();
BookmarkRecipeId recipeId = getCurrentRecipe(mc.currentScreen);
GuiUsageRecipe gui = new GuiUsageRecipe(handlers);
mc.displayGuiScreen(gui);
gui.openTargetRecipe(recipeId);
return true;
}
private static ItemStack normalizeItemStack(ItemStack stack) {
GTFluidStackStringifyHandler.replaceAE2FCFluidDrop = true;
stack = StackInfo.loadFromNBT(StackInfo.itemStackToNBT(stack));
GTFluidStackStringifyHandler.replaceAE2FCFluidDrop = false;
return stack;
private GuiUsageRecipe(ArrayList<IUsageHandler> handlers) {
super(NEIClientUtils.mc().currentScreen);
this.currenthandlers = handlers;
}
public static void registerUsageHandler(IUsageHandler handler) {