From fbc37f1d2e976867c8b3ebcebe988b3b02f475dc Mon Sep 17 00:00:00 2001
From: isXander <xander@isxander.dev>
Date: Mon, 29 May 2023 07:07:38 +0100
Subject: Fix ListOption still using type class

---
 .../src/main/java/dev/isxander/yacl/api/ListOption.java  | 12 ++++++------
 .../main/java/dev/isxander/yacl/impl/ListOptionImpl.java | 16 ++--------------
 2 files changed, 8 insertions(+), 20 deletions(-)

(limited to 'common/src/main/java/dev/isxander/yacl')

diff --git a/common/src/main/java/dev/isxander/yacl/api/ListOption.java b/common/src/main/java/dev/isxander/yacl/api/ListOption.java
index 19a365d..53d9119 100644
--- a/common/src/main/java/dev/isxander/yacl/api/ListOption.java
+++ b/common/src/main/java/dev/isxander/yacl/api/ListOption.java
@@ -28,11 +28,6 @@ public interface ListOption<T> extends OptionGroup, Option<List<T>> {
     @Override
     @NotNull ImmutableList<ListOptionEntry<T>> options();
 
-    /**
-     * Class of the entry type
-     */
-    @NotNull Class<T> elementTypeClass();
-
     @ApiStatus.Internal
     ListOptionEntry<T> insertNewEntryToTop();
 
@@ -48,8 +43,13 @@ public interface ListOption<T> extends OptionGroup, Option<List<T>> {
     @ApiStatus.Internal
     void addRefreshListener(Runnable changedListener);
 
+    static <T> Builder<T> createBuilder() {
+        return new ListOptionImpl.BuilderImpl<>();
+    }
+
+    @Deprecated
     static <T> Builder<T> createBuilder(Class<T> typeClass) {
-        return new ListOptionImpl.BuilderImpl<>(typeClass);
+        return createBuilder();
     }
 
     interface Builder<T> {
diff --git a/common/src/main/java/dev/isxander/yacl/impl/ListOptionImpl.java b/common/src/main/java/dev/isxander/yacl/impl/ListOptionImpl.java
index 4b37e9e..474a5f8 100644
--- a/common/src/main/java/dev/isxander/yacl/impl/ListOptionImpl.java
+++ b/common/src/main/java/dev/isxander/yacl/impl/ListOptionImpl.java
@@ -25,13 +25,12 @@ public final class ListOptionImpl<T> implements ListOption<T> {
     private final List<ListOptionEntry<T>> entries;
     private final boolean collapsed;
     private boolean available;
-    private final Class<T> typeClass;
     private final ImmutableSet<OptionFlag> flags;
     private final EntryFactory entryFactory;
     private final List<BiConsumer<Option<List<T>>, List<T>>> listeners;
     private final List<Runnable> refreshListeners;
 
-    public ListOptionImpl(@NotNull Component name, @NotNull OptionDescription description, @NotNull Binding<List<T>> binding, @NotNull T initialValue, @NotNull Class<T> typeClass, @NotNull Function<ListOptionEntry<T>, Controller<T>> controllerFunction, ImmutableSet<OptionFlag> flags, boolean collapsed, boolean available, Collection<BiConsumer<Option<List<T>>, List<T>>> listeners) {
+    public ListOptionImpl(@NotNull Component name, @NotNull OptionDescription description, @NotNull Binding<List<T>> binding, @NotNull T initialValue, @NotNull Function<ListOptionEntry<T>, Controller<T>> controllerFunction, ImmutableSet<OptionFlag> flags, boolean collapsed, boolean available, Collection<BiConsumer<Option<List<T>>, List<T>>> listeners) {
         this.name = name;
         this.description = description;
         this.binding = binding;
@@ -39,7 +38,6 @@ public final class ListOptionImpl<T> implements ListOption<T> {
         this.entryFactory = new EntryFactory(controllerFunction);
         this.entries = createEntries(binding().getValue());
         this.collapsed = collapsed;
-        this.typeClass = typeClass;
         this.flags = flags;
         this.available = available;
         this.listeners = new ArrayList<>();
@@ -78,11 +76,6 @@ public final class ListOptionImpl<T> implements ListOption<T> {
         return binding;
     }
 
-    @Override
-    public @NotNull Class<T> elementTypeClass() {
-        return typeClass;
-    }
-
     @Override
     public boolean collapsed() {
         return collapsed;
@@ -221,11 +214,6 @@ public final class ListOptionImpl<T> implements ListOption<T> {
         private boolean collapsed = false;
         private boolean available = true;
         private final List<BiConsumer<Option<List<T>>, List<T>>> listeners = new ArrayList<>();
-        private final Class<T> typeClass;
-
-        public BuilderImpl(Class<T> typeClass) {
-            this.typeClass = typeClass;
-        }
 
         @Override
         public Builder<T> name(@NotNull Component name) {
@@ -323,7 +311,7 @@ public final class ListOptionImpl<T> implements ListOption<T> {
             Validate.notNull(binding, "`binding` must not be null");
             Validate.notNull(initialValue, "`initialValue` must not be null");
 
-            return new ListOptionImpl<>(name, description, binding, initialValue, typeClass, controllerFunction, ImmutableSet.copyOf(flags), collapsed, available, listeners);
+            return new ListOptionImpl<>(name, description, binding, initialValue, controllerFunction, ImmutableSet.copyOf(flags), collapsed, available, listeners);
         }
     }
 }
-- 
cgit