diff --git a/src/main/java/codechicken/nei/CollapsibleItems.java b/src/main/java/codechicken/nei/CollapsibleItems.java index 2ce2b73f..9d67caab 100644 --- a/src/main/java/codechicken/nei/CollapsibleItems.java +++ b/src/main/java/codechicken/nei/CollapsibleItems.java @@ -7,8 +7,11 @@ import java.util.List; import java.util.Map; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.function.Supplier; import java.util.stream.Collectors; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTBase.NBTPrimitive; @@ -35,6 +38,7 @@ public class CollapsibleItems { public ItemFilter filter; public boolean expanded = false; public String displayName = ""; + public String unlocalizedName; public void setFilter(String filter) { this.filter = ItemStackFilterParser.parse(filter.trim()); @@ -46,6 +50,18 @@ public class CollapsibleItems { this.guid = guid; } + public String getDisplayName() { + if (this.unlocalizedName != null && !this.unlocalizedName.isEmpty()) { + final String translated = StatCollector.translateToLocal(this.unlocalizedName); + + if (!translated.equals(this.unlocalizedName)) { + return translated; + } + } + + return this.displayName; + } + public boolean matches(ItemStack stack) { return this.filter.matches(stack); } @@ -55,6 +71,7 @@ public class CollapsibleItems { protected static File statesFile; protected static final List groups = new ArrayList<>(); + protected static final List> apiGroups = new CopyOnWriteArrayList<>(); protected static final Map cache = new ConcurrentHashMap<>(); private CollapsibleItems() {} @@ -77,11 +94,51 @@ public class CollapsibleItems { ClientHandler.loadSettingsFile( "collapsibleitems.cfg", lines -> parseFile(lines.collect(Collectors.toCollection(ArrayList::new)))); + + for (Supplier apiGroup : CollapsibleItems.apiGroups) { + try { + addGroup(apiGroup.get()); + } catch (Exception e) { + NEIClientConfig.logger.error("Failed to add API group", e); + } + } } loadStates(); } + public static void registerGroup(String unlocalizedName, String filter) { + CollapsibleItems.apiGroups.add(() -> { + GroupItem group = new GroupItem(); + group.setFilter(filter); + group.unlocalizedName = unlocalizedName; + return group; + }); + } + + public static void registerGroup(String unlocalizedName, Iterable items) { + final ItemStackSet filter = new ItemStackSet(); + + for (ItemStack stack : items) { + if (stack != null) filter.add(stack.copy()); + } + + if (filter.isEmpty()) return; + + final String key = unlocalizedName + ";" + + filter.keys().stream() + .map(stack -> Item.itemRegistry.getNameForObject(stack.getItem()) + ":" + stack.getItemDamage()) + .sorted().collect(Collectors.joining(",")); + final String guid = UUID.nameUUIDFromBytes(key.getBytes()).toString(); + + CollapsibleItems.apiGroups.add(() -> { + GroupItem group = new GroupItem(); + group.setFilter(filter, guid); + group.unlocalizedName = unlocalizedName; + return group; + }); + } + private static void parseFile(List itemStrings) { final JsonParser parser = new JsonParser(); GroupItem group = new GroupItem(); @@ -92,17 +149,8 @@ public class CollapsibleItems { if (itemStr.startsWith("; ")) { JsonObject settings = parser.parse(itemStr.substring(2)).getAsJsonObject(); - if (settings.get("displayName") != null) { - group.displayName = settings.get("displayName").getAsString(); - } - if (settings.get("unlocalizedName") != null) { - String unlocalizedName = settings.get("unlocalizedName").getAsString(); - String displayName = StatCollector.translateToLocal(unlocalizedName); - - if (!displayName.equals(unlocalizedName)) { - group.displayName = displayName; - } + group.unlocalizedName = settings.get("unlocalizedName").getAsString(); } if (settings.get("expanded") != null) { @@ -176,7 +224,7 @@ public class CollapsibleItems { public static String getDisplayName(int groupIndex) { if (groupIndex < CollapsibleItems.groups.size()) { - return CollapsibleItems.groups.get(groupIndex).displayName; + return CollapsibleItems.groups.get(groupIndex).getDisplayName(); } return null; diff --git a/src/main/java/codechicken/nei/api/API.java b/src/main/java/codechicken/nei/api/API.java index 0877923b..26d1da19 100644 --- a/src/main/java/codechicken/nei/api/API.java +++ b/src/main/java/codechicken/nei/api/API.java @@ -19,6 +19,7 @@ import org.lwjgl.input.Keyboard; import com.google.common.collect.Sets; import codechicken.nei.BookmarkContainerInfo; +import codechicken.nei.CollapsibleItems; import codechicken.nei.ItemList; import codechicken.nei.ItemSorter; import codechicken.nei.ItemStackSet; @@ -341,6 +342,30 @@ public class API { SubsetWidget.addTag(tag); } + /** + * Registers a group of items that is collapsed into a single entry in the item panel. Groups registered here have + * the lowest priority: an item that matches a preset or a collapsibleitems.cfg group stays there. They are active + * only while the Collapsible Items option is enabled. Must be called while plugins are loading. + * + * @param unlocalizedName Translation key of the name shown for the group + * @param filter A search string for matching items that belong to this group. Also identifies the group + * when its expanded state is saved, so changing it resets the saved state. + */ + public static void addCollapsibleGroup(String unlocalizedName, String filter) { + CollapsibleItems.registerGroup(unlocalizedName, filter); + } + + /** + * Same as {@link #addCollapsibleGroup(String, String)}, but the group is given as a list of item stacks. The stacks + * identify the group when its expanded state is saved, so changing them resets the saved state. + * + * @param unlocalizedName Translation key of the name shown for the group + * @param items Item stacks that belong to this group + */ + public static void addCollapsibleGroup(String unlocalizedName, Iterable items) { + CollapsibleItems.registerGroup(unlocalizedName, items); + } + @Deprecated public static void addSearchProvider(ISearchProvider provider) {}