refactor!: Add properties to customEntry(), as state management requires rows to know their properties

Author: BlayTheNinth

common/src/main/java/net/blay09/mods/balm/client/platform/config/screen/BalmConfigScreenSectionBuilder.java

@@ -61,13 +61,25 @@ default BalmConfigScreenSectionBuilder button(Component label, Component tooltip
 
     BalmConfigScreenSectionBuilder button(Component label, Component tooltip, Component buttonLabel, Consumer<BalmConfigScreen> onPress, Predicate<String> filterPredicate, Predicate<BalmConfigScreenContext> visibilityPredicate);
 
-    default BalmConfigScreenSectionBuilder customEntry(BiFunction<BalmConfigScreen, BalmConfigScreenRowState, ? extends BalmConfigScreenEntry> entryFactory) {
-        return customEntry(entryFactory, String::isEmpty);
+    default BalmConfigScreenSectionBuilder customEntry(ConfiguredProperty<?> property, BiFunction<BalmConfigScreen, BalmConfigScreenRowState, ? extends BalmConfigScreenEntry> entryFactory) {
+        return customEntry(List.of(property), entryFactory);
     }
 
-    default BalmConfigScreenSectionBuilder customEntry(BiFunction<BalmConfigScreen, BalmConfigScreenRowState, ? extends BalmConfigScreenEntry> entryFactory, Predicate<String> filterPredicate) {
-        return customEntry(entryFactory, filterPredicate, _ -> true);
+    default BalmConfigScreenSectionBuilder customEntry(List<ConfiguredProperty<?>> properties, BiFunction<BalmConfigScreen, BalmConfigScreenRowState, ? extends BalmConfigScreenEntry> entryFactory) {
+        return customEntry(properties, entryFactory, String::isEmpty);
     }
 
-    BalmConfigScreenSectionBuilder customEntry(BiFunction<BalmConfigScreen, BalmConfigScreenRowState, ? extends BalmConfigScreenEntry> entryFactory, Predicate<String> filterPredicate, Predicate<BalmConfigScreenContext> visibilityPredicate);
+    default BalmConfigScreenSectionBuilder customEntry(ConfiguredProperty<?> property, BiFunction<BalmConfigScreen, BalmConfigScreenRowState, ? extends BalmConfigScreenEntry> entryFactory, Predicate<String> filterPredicate) {
+        return customEntry(List.of(property), entryFactory, filterPredicate);
+    }
+
+    default BalmConfigScreenSectionBuilder customEntry(List<ConfiguredProperty<?>> properties, BiFunction<BalmConfigScreen, BalmConfigScreenRowState, ? extends BalmConfigScreenEntry> entryFactory, Predicate<String> filterPredicate) {
+        return customEntry(properties, entryFactory, filterPredicate, _ -> true);
+    }
+
+    default BalmConfigScreenSectionBuilder customEntry(ConfiguredProperty<?> property, BiFunction<BalmConfigScreen, BalmConfigScreenRowState, ? extends BalmConfigScreenEntry> entryFactory, Predicate<String> filterPredicate, Predicate<BalmConfigScreenContext> visibilityPredicate) {
+        return customEntry(List.of(property), entryFactory, filterPredicate, visibilityPredicate);
+    }
+
+    BalmConfigScreenSectionBuilder customEntry(List<ConfiguredProperty<?>> properties, BiFunction<BalmConfigScreen, BalmConfigScreenRowState, ? extends BalmConfigScreenEntry> entryFactory, Predicate<String> filterPredicate, Predicate<BalmConfigScreenContext> visibilityPredicate);
 }

common/src/main/java/net/blay09/mods/balm/client/platform/config/screen/internal/BalmConfigScreenCustomEntryRow.java

@@ -4,16 +4,20 @@
 import net.blay09.mods.balm.client.platform.config.screen.BalmConfigScreenContext;
 import net.blay09.mods.balm.client.platform.config.screen.BalmConfigScreenEntry;
 import net.blay09.mods.balm.client.platform.config.screen.BalmConfigScreenRowState;
+import net.blay09.mods.balm.platform.config.schema.ConfiguredProperty;
 
+import java.util.List;
 import java.util.function.BiFunction;
 import java.util.function.Predicate;
 
 public class BalmConfigScreenCustomEntryRow extends BalmConfigScreenRow {
     private final BiFunction<BalmConfigScreen, BalmConfigScreenRowState, BalmConfigScreenEntry> entryFactory;
+    private final List<ConfiguredProperty<?>> properties;
     private final Predicate<String> filterPredicate;
 
-    public BalmConfigScreenCustomEntryRow(BiFunction<BalmConfigScreen, BalmConfigScreenRowState, BalmConfigScreenEntry> entryFactory, Predicate<String> filterPredicate, Predicate<BalmConfigScreenContext> visibilityPredicate) {
+    public BalmConfigScreenCustomEntryRow(List<ConfiguredProperty<?>> properties, BiFunction<BalmConfigScreen, BalmConfigScreenRowState, BalmConfigScreenEntry> entryFactory, Predicate<String> filterPredicate, Predicate<BalmConfigScreenContext> visibilityPredicate) {
         super(visibilityPredicate);
+        this.properties = properties;
         this.entryFactory = entryFactory;
         this.filterPredicate = filterPredicate;
     }
@@ -22,6 +26,11 @@ public BiFunction<BalmConfigScreen, BalmConfigScreenRowState, BalmConfigScreenEn
         return entryFactory;
     }
 
+    @Override
+    public List<ConfiguredProperty<?>> properties() {
+        return properties;
+    }
+
     @Override
     public boolean matchesFilter(String filter) {
         return filterPredicate.test(filter);

common/src/main/java/net/blay09/mods/balm/client/platform/config/screen/internal/BalmConfigScreenSectionBuilderImpl.java

@@ -41,8 +41,8 @@ public BalmConfigScreenSectionBuilder button(Component label, Component tooltip,
     }
 
     @Override
-    public BalmConfigScreenSectionBuilder customEntry(BiFunction<BalmConfigScreen, BalmConfigScreenRowState, ? extends BalmConfigScreenEntry> entryFactory, Predicate<String> filterPredicate, Predicate<BalmConfigScreenContext> visibilityPredicate) {
-        rows.add(new BalmConfigScreenCustomEntryRow(entryFactory::apply, filterPredicate, visibilityPredicate));
+    public BalmConfigScreenSectionBuilder customEntry(List<ConfiguredProperty<?>> properties, BiFunction<BalmConfigScreen, BalmConfigScreenRowState, ? extends BalmConfigScreenEntry> entryFactory, Predicate<String> filterPredicate, Predicate<BalmConfigScreenContext> visibilityPredicate) {
+        rows.add(new BalmConfigScreenCustomEntryRow(List.copyOf(properties), entryFactory::apply, filterPredicate, visibilityPredicate));
         return this;
     }