Improve Filter Tooltip + Improve Bound Filter

Nomi-CEu · Dec 29, 2024 · 06d72ef · 06d72ef
1 parent ffa60b0
commit 06d72ef
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/main/java/com/nomiceu/nomilabs/mixin/betterp2p/GuiAdvancedMemoryCardMixin.java b/src/main/java/com/nomiceu/nomilabs/mixin/betterp2p/GuiAdvancedMemoryCardMixin.java
@@ -136,10 +136,10 @@ private void getCustomSortRules(CallbackInfoReturnable<List<String>> cir) {
         cir.setReturnValue(ImmutableList.of(
                 format(translate("nomilabs.gui.advanced_memory_card.filter.title"), BOLD, UNDERLINE),
                 "<name>§7 - " + translate("nomilabs.gui.advanced_memory_card.filter.name"),
-                "§9@in§7 - " + translate("gui.advanced_memory_card.sortinfo2"),
-                "§6@out§7 - " + translate("gui.advanced_memory_card.sortinfo3"),
-                "§a@b§7 - " + translate("gui.advanced_memory_card.sortinfo4"),
-                "§c@u§7 - " + translate("gui.advanced_memory_card.sortinfo5"),
+                "§9@in§7 - " + translate("nomilabs.gui.advanced_memory_card.filter.input"),
+                "§6@out§7 - " + translate("nomilabs.gui.advanced_memory_card.filter.output"),
+                "§a@b§7 - " + translate("nomilabs.gui.advanced_memory_card.filter.bound"),
+                "§c@u§7 - " + translate("nomilabs.gui.advanced_memory_card.filter.unbound"),
                 "§b@distless=<distance>§7 - " + translate("nomilabs.gui.advanced_memory_card.filter.distless"),
                 "§d@distmore=<distance>§7 - " + translate("nomilabs.gui.advanced_memory_card.filter.distmore"),
                 "§e@type=<type1>;<type2>;...§7 - " + translate("nomilabs.gui.advanced_memory_card.filter.type"),

diff --git a/src/main/java/com/nomiceu/nomilabs/mixin/betterp2p/InfoListMixin.java b/src/main/java/com/nomiceu/nomilabs/mixin/betterp2p/InfoListMixin.java
@@ -20,6 +20,7 @@
 import com.nomiceu.nomilabs.integration.betterp2p.AccessibleInfoList;
 import com.nomiceu.nomilabs.integration.betterp2p.AccessibleInfoWrapper;
 import com.nomiceu.nomilabs.integration.betterp2p.SortModes;
+import com.projecturanus.betterp2p.client.gui.Filter;
 import com.projecturanus.betterp2p.client.gui.InfoFilter;
 import com.projecturanus.betterp2p.client.gui.InfoList;
 import com.projecturanus.betterp2p.client.gui.InfoWrapper;
@@ -236,6 +237,13 @@ private void newFilterLogic(CallbackInfo ci) {
                     if (getSelectedInfo() != null && info.getLoc().equals(getSelectedInfo().getLoc())) return true;
 
                     for (var entry : filter.getActiveFilters().entrySet()) {
+                        // Special Case: Bound
+                        // Check for Errors as well as Unbound
+                        if (entry.getKey() == Filter.BOUND) {
+                            return info.getFrequency() != 0 && !info.getError();
+                        }
+
+                        // Normal Filter
                         if (!entry.getKey().getFilter().invoke(info, entry.getValue())) return false;
                     }
                     return true;

diff --git a/src/main/resources/assets/nomilabs/lang/en_us.lang b/src/main/resources/assets/nomilabs/lang/en_us.lang
@@ -180,6 +180,10 @@ nomilabs.gui.advanced_memory_card.hover_info.connections.output.one=§a%s Output
 nomilabs.gui.advanced_memory_card.hover_info.connections.output.multi=§b%s Outputs
 
 nomilabs.gui.advanced_memory_card.filter.title=Filtering Tags:
+nomilabs.gui.advanced_memory_card.filter.input=Show Inputs Only
+nomilabs.gui.advanced_memory_card.filter.output=Show Outputs Only
+nomilabs.gui.advanced_memory_card.filter.bound=Show Bound and Valid Only
+nomilabs.gui.advanced_memory_card.filter.unbound=Show Unbound or Invalid Only
 nomilabs.gui.advanced_memory_card.filter.distless=Set a Maximum Distance
 nomilabs.gui.advanced_memory_card.filter.distmore=Set a Minimum Distance
 nomilabs.gui.advanced_memory_card.filter.type=Filter by Type