Merge remote-tracking branch 'slprime/bookmarks_groups_and_filter' into dev

This commit is contained in:
Martin Robertz committed 2024-01-14 10:38:18 +01:00
commit cfcb8d6d73
7 files changed
+72 -17

No files matched your search

@@ -456,8 +456,15 @@ public class BookmarkPanel extends PanelWidget {
}
if (NEIClientUtils.shiftKey() && !LayoutManager.bookmarkPanel.inEditingState()) {
final ItemPanelSlot focused = getSlotMouseOver(mousex, mousey);
this.focusedGroupId = focused != null ? this.metadata.get(focused.slotIndex).groupId : -1;
final int rowId = getHoveredRowIndex(true);
if (rowId != -1) {
this.focusedGroupId = getRowGroupId(rowId);
} else {
final ItemPanelSlot focused = getSlotMouseOver(mousex, mousey);
this.focusedGroupId = focused != null ? this.metadata.get(focused.slotIndex).groupId : -1;
}
} else {
this.focusedGroupId = -1;
}
@@ -1138,7 +1145,7 @@ public class BookmarkPanel extends PanelWidget {
if (rightclick) {
return false;
}
return pullBookmarkItems();
return pullBookmarkItems(-1, false);
}
@Override
@@ -1278,6 +1285,12 @@ public class BookmarkPanel extends PanelWidget {
return null;
}
protected int getHoveredGroupId() {
final BookmarkGrid BGrid = (BookmarkGrid) grid;
final int overRowIndex = BGrid.getHoveredRowIndex(true);
return overRowIndex >= 0 ? BGrid.getRowGroupId(overRowIndex) : -1;
}
protected String getNamespaceLabelText(boolean shortFormat) {
String activePage = String.valueOf(activeNamespaceIndex + 1);
@@ -1941,6 +1954,14 @@ public class BookmarkPanel extends PanelWidget {
@Override
public boolean handleKeyPress(int keyID, char keyChar) {
if (NEIClientConfig.isKeyHashDown("gui.bookmark_pull_items")) {
return this.pullBookmarkItems(this.getHoveredGroupId(), false);
}
if (NEIClientConfig.isKeyHashDown("gui.bookmark_pull_items_ingredients")) {
return this.pullBookmarkItems(this.getHoveredGroupId(), true);
}
if (NEIClientConfig.isKeyHashDown("gui.bookmark_recipe")) {
final BookmarkGrid BGrid = (BookmarkGrid) grid;
final int overRowIndex = BGrid.getHoveredRowIndex(true);
@@ -2078,7 +2099,7 @@ public class BookmarkPanel extends PanelWidget {
return null;
}
public boolean pullBookmarkItems() {
public boolean pullBookmarkItems(int groupId, boolean onlyIngredients) {
IBookmarkContainerHandler containerHandler = BookmarkContainerInfo
.getBookmarkContainerHandler(getGuiContainer());
@@ -2086,7 +2107,39 @@ public class BookmarkPanel extends PanelWidget {
return false;
}
containerHandler.pullBookmarkItemsFromContainer(getGuiContainer(), ((BookmarkGrid) grid).realItems);
final BookmarkGrid BGrid = (BookmarkGrid) grid;
final ArrayList<ItemStack> items = new ArrayList<>();
final ItemStackMap<Integer> uniqueItems = new ItemStackMap<>();
final BookmarkGroup group = groupId >= 0 ? BGrid.groups.get(groupId) : null;
ItemStackMetadata meta;
System.out.println("onlyIngredients: " + onlyIngredients);
for (int idx = 0; idx < BGrid.realItems.size(); idx++) {
meta = BGrid.metadata.get(idx);
if (groupId == -1 || groupId == meta.groupId) {
final ItemStack stack = BGrid.getItem(idx);
if (!onlyIngredients || meta.ingredient && (group == null || group.crafting == null
|| group.crafting.inputs.containsKey(BGrid.realItems.get(idx)))) {
final NBTTagCompound nbTag = StackInfo.itemStackToNBT(stack);
uniqueItems.put(stack, uniqueItems.getOrDefault(stack, 0) + nbTag.getInteger("Count"));
}
}
}
for (ItemStackMap.Entry<Integer> entry : uniqueItems.entries()) {
final NBTTagCompound nbTag = StackInfo.itemStackToNBT(entry.key);
items.add(StackInfo.loadFromNBT(nbTag, entry.value));
}
if (items.isEmpty()) {
return false;
}
containerHandler.pullBookmarkItemsFromContainer(getGuiContainer(), items);
return true;
}
}
@@ -218,8 +218,7 @@ public class ClientHandler {
try (FileReader reader = new FileReader(file)) {
NEIClientConfig.logger.info("Loading hidden handlers from file {}", file);
NEIClientConfig.hiddenHandlerRegex = IOUtils.readLines(reader).stream()
.filter((line) -> !line.startsWith("#")).map(Pattern::compile)
NEIClientConfig.hiddenHandlers = IOUtils.readLines(reader).stream().filter((line) -> !line.startsWith("#"))
.collect(Collectors.toCollection(HashSet::new));
} catch (IOException e) {
NEIClientConfig.logger.error("Failed to load hidden handlers from file {}", file, e);
@@ -203,6 +203,11 @@ public class ItemStackMap<T> {
return map == null ? null : map.get(key);
}
public T getOrDefault(ItemStack key, T defaultValue) {
T e = get(key);
return e == null ? defaultValue : e;
}
public void put(ItemStack key, T value) {
if (key == null || key.getItem() == null) return;
@@ -225,10 +225,6 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
return true;
}
if (NEIClientConfig.isKeyHashDown("gui.bookmark_pull_items")) {
return bookmarkPanel.pullBookmarkItems();
}
if (isEnabled() && !isHidden()) {
for (Widget widget : controlWidgets) if (inputFocused == null) widget.lastKeyTyped(keyID, keyChar);
}
@@ -85,9 +85,8 @@ public class NEIClientConfig {
// We use regex here so that we can apply the height hack to entire mods with one entry.
public static HashSet<Pattern> heightHackHandlerRegex = new HashSet<>();
// Set of regexes matching handler Name of handlers that need hide.
// We use regex here so that we can hide to entire mods with one entry.
public static HashSet<Pattern> hiddenHandlerRegex = new HashSet<>();
// Set of handler Name or Id of handlers that need hide.
public static HashSet<String> hiddenHandlers = new HashSet<>();
// Map of handler ID to sort order.
// Handlers will be sorted in ascending order, so smaller numbers show up earlier.
@@ -362,6 +361,7 @@ public class NEIClientConfig {
"gui.bookmark_recipe_count",
Keyboard.KEY_A + NEIClientUtils.SHIFT_HASH + NEIClientUtils.CTRL_HASH);
API.addHashBind("gui.bookmark_pull_items", Keyboard.KEY_V);
API.addHashBind("gui.bookmark_pull_items_ingredients", Keyboard.KEY_V + NEIClientUtils.SHIFT_HASH);
API.addHashBind("gui.overlay", Keyboard.KEY_S);
API.addHashBind("gui.overlay_use", Keyboard.KEY_S + NEIClientUtils.SHIFT_HASH);
API.addHashBind("gui.overlay_hide", Keyboard.KEY_S + NEIClientUtils.CTRL_HASH);
@@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.function.Function;
import java.util.regex.Matcher;
import java.util.stream.Collectors;
import net.minecraft.client.Minecraft;
@@ -13,6 +12,8 @@ import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IChatComponent;
import com.google.common.base.Objects;
import codechicken.core.TaskProfiler;
import codechicken.nei.ItemList;
import codechicken.nei.NEIClientConfig;
@@ -90,8 +91,8 @@ class RecipeHandlerQuery<T extends IRecipeHandler> {
}
private boolean isHidden(T handler) {
return NEIClientConfig.hiddenHandlerRegex.stream()
.map(pattern -> pattern.matcher(RecipeCatalysts.getRecipeID(handler))).anyMatch(Matcher::matches);
final String handlerId = Objects.firstNonNull(handler.getOverlayIdentifier(), handler.getHandlerId());
return NEIClientConfig.hiddenHandlers.stream().anyMatch(h -> h.equals(handlerId));
}
private void printLog(Throwable t) {
@@ -112,6 +112,7 @@ nei.options.keys.gui.bookmark=Add Bookmark
nei.options.keys.gui.bookmark_recipe=Add Bookmark with Recipe
nei.options.keys.gui.bookmark_count=Add Bookmark with Count
nei.options.keys.gui.bookmark_pull_items=Pull all Bookmarked Items
nei.options.keys.gui.bookmark_pull_items_ingredients=Pull all Bookmarked Ingredients
nei.options.keys.gui.bookmark_recipe_count=Add Bookmark with Recipe & Count
nei.options.keys.gui.hide_bookmarks=Toggle Bookmark Panel Visibility
nei.options.keys.gui.overlay=Overlay Recipe