Generify dropdown menu builder (#20)

* Make DropdownMenuBuilder's function chains return parameterized types instead of raw types

* Make SelectorBuilder's function chains return parameterized types instead of raw types

* Make EnumSelectorBuilder's function chains return parameterized types instead of raw types

* Update gradle.properties

Co-authored-by: shedaniel <daniel@shedaniel.me>

gradle.properties

@@ -2,6 +2,6 @@ minecraft_version=1.15
 yarn_version=1.15+build.1
 fabric_loader_version=0.7.2+build.174
 fabric_version=0.4.20+build.273-1.15
-mod_version=2.7
+mod_version=2.7.1
 modmenu_version=1.7.14-unstable.19w42a+build.10
 nec_version=1.1.5+1.15.1

src/main/java/me/shedaniel/clothconfig2/impl/builders/DropdownMenuBuilder.java

@@ -35,52 +35,52 @@ public class DropdownMenuBuilder<T> extends FieldBuilder<T, DropdownBoxEntry<T>>
         this.cellCreator = Objects.requireNonNull(cellCreator);
     }
     
-    public DropdownMenuBuilder setSelections(Iterable<T> selections) {
+    public DropdownMenuBuilder<T> setSelections(Iterable<T> selections) {
         this.selections = selections;
         return this;
     }
     
-    public DropdownMenuBuilder setDefaultValue(Supplier<T> defaultValue) {
+    public DropdownMenuBuilder<T> setDefaultValue(Supplier<T> defaultValue) {
         this.defaultValue = defaultValue;
         return this;
     }
     
-    public DropdownMenuBuilder setDefaultValue(T defaultValue) {
+    public DropdownMenuBuilder<T> setDefaultValue(T defaultValue) {
         this.defaultValue = () -> Objects.requireNonNull(defaultValue);
         return this;
     }
     
-    public DropdownMenuBuilder setSaveConsumer(Consumer<T> saveConsumer) {
+    public DropdownMenuBuilder<T> setSaveConsumer(Consumer<T> saveConsumer) {
         this.saveConsumer = saveConsumer;
         return this;
     }
     
-    public DropdownMenuBuilder setTooltipSupplier(Supplier<Optional<String[]>> tooltipSupplier) {
+    public DropdownMenuBuilder<T> setTooltipSupplier(Supplier<Optional<String[]>> tooltipSupplier) {
         this.tooltipSupplier = str -> tooltipSupplier.get();
         return this;
     }
     
-    public DropdownMenuBuilder setTooltipSupplier(Function<T, Optional<String[]>> tooltipSupplier) {
+    public DropdownMenuBuilder<T> setTooltipSupplier(Function<T, Optional<String[]>> tooltipSupplier) {
         this.tooltipSupplier = tooltipSupplier;
         return this;
     }
     
-    public DropdownMenuBuilder setTooltip(Optional<String[]> tooltip) {
+    public DropdownMenuBuilder<T> setTooltip(Optional<String[]> tooltip) {
         this.tooltipSupplier = str -> tooltip;
         return this;
     }
     
-    public DropdownMenuBuilder setTooltip(String... tooltip) {
+    public DropdownMenuBuilder<T> setTooltip(String... tooltip) {
         this.tooltipSupplier = str -> Optional.ofNullable(tooltip);
         return this;
     }
     
-    public DropdownMenuBuilder requireRestart() {
+    public DropdownMenuBuilder<T> requireRestart() {
         requireRestart(true);
         return this;
     }
     
-    public DropdownMenuBuilder setErrorSupplier(Function<T, Optional<String>> errorSupplier) {
+    public DropdownMenuBuilder<T> setErrorSupplier(Function<T, Optional<String>> errorSupplier) {
         this.errorSupplier = errorSupplier;
         return this;
     }

src/main/java/me/shedaniel/clothconfig2/impl/builders/EnumSelectorBuilder.java

@@ -34,43 +34,43 @@ public class EnumSelectorBuilder<T extends Enum<?>> extends FieldBuilder<T, Enum
         return this;
     }
     
-    public EnumSelectorBuilder setSaveConsumer(Consumer<T> saveConsumer) {
+    public EnumSelectorBuilder<T> setSaveConsumer(Consumer<T> saveConsumer) {
         this.saveConsumer = saveConsumer;
         return this;
     }
     
-    public EnumSelectorBuilder setDefaultValue(Supplier<T> defaultValue) {
+    public EnumSelectorBuilder<T> setDefaultValue(Supplier<T> defaultValue) {
         this.defaultValue = defaultValue;
         return this;
     }
     
-    public EnumSelectorBuilder setDefaultValue(T defaultValue) {
+    public EnumSelectorBuilder<T> setDefaultValue(T defaultValue) {
         Objects.requireNonNull(defaultValue);
         this.defaultValue = () -> defaultValue;
         return this;
     }
     
-    public EnumSelectorBuilder setTooltipSupplier(Function<T, Optional<String[]>> tooltipSupplier) {
+    public EnumSelectorBuilder<T> setTooltipSupplier(Function<T, Optional<String[]>> tooltipSupplier) {
         this.tooltipSupplier = tooltipSupplier;
         return this;
     }
     
-    public EnumSelectorBuilder setTooltipSupplier(Supplier<Optional<String[]>> tooltipSupplier) {
+    public EnumSelectorBuilder<T> setTooltipSupplier(Supplier<Optional<String[]>> tooltipSupplier) {
         this.tooltipSupplier = e -> tooltipSupplier.get();
         return this;
     }
     
-    public EnumSelectorBuilder setTooltip(Optional<String[]> tooltip) {
+    public EnumSelectorBuilder<T> setTooltip(Optional<String[]> tooltip) {
         this.tooltipSupplier = e -> tooltip;
         return this;
     }
     
-    public EnumSelectorBuilder setTooltip(String... tooltip) {
+    public EnumSelectorBuilder<T> setTooltip(String... tooltip) {
         this.tooltipSupplier = e -> Optional.ofNullable(tooltip);
         return this;
     }
     
-    public EnumSelectorBuilder setEnumNameProvider(Function<Enum, String> enumNameProvider) {
+    public EnumSelectorBuilder<T> setEnumNameProvider(Function<Enum, String> enumNameProvider) {
         Objects.requireNonNull(enumNameProvider);
         this.enumNameProvider = enumNameProvider;
         return this;
@@ -85,4 +85,4 @@ public class EnumSelectorBuilder<T extends Enum<?>> extends FieldBuilder<T, Enum
         return entry;
     }
     
-}
+}

src/main/java/me/shedaniel/clothconfig2/impl/builders/SelectorBuilder.java

@@ -33,43 +33,43 @@ public class SelectorBuilder<T> extends FieldBuilder<T, SelectionListEntry<T>> {
         return this;
     }
     
-    public SelectorBuilder setSaveConsumer(Consumer<T> saveConsumer) {
+    public SelectorBuilder<T> setSaveConsumer(Consumer<T> saveConsumer) {
         this.saveConsumer = saveConsumer;
         return this;
     }
     
-    public SelectorBuilder setDefaultValue(Supplier<T> defaultValue) {
+    public SelectorBuilder<T> setDefaultValue(Supplier<T> defaultValue) {
         this.defaultValue = defaultValue;
         return this;
     }
     
-    public SelectorBuilder setDefaultValue(T defaultValue) {
+    public SelectorBuilder<T> setDefaultValue(T defaultValue) {
         Objects.requireNonNull(defaultValue);
         this.defaultValue = () -> defaultValue;
         return this;
     }
     
-    public SelectorBuilder setTooltipSupplier(Function<T, Optional<String[]>> tooltipSupplier) {
+    public SelectorBuilder<T> setTooltipSupplier(Function<T, Optional<String[]>> tooltipSupplier) {
         this.tooltipSupplier = tooltipSupplier;
         return this;
     }
     
-    public SelectorBuilder setTooltipSupplier(Supplier<Optional<String[]>> tooltipSupplier) {
+    public SelectorBuilder<T> setTooltipSupplier(Supplier<Optional<String[]>> tooltipSupplier) {
         this.tooltipSupplier = e -> tooltipSupplier.get();
         return this;
     }
     
-    public SelectorBuilder setTooltip(Optional<String[]> tooltip) {
+    public SelectorBuilder<T> setTooltip(Optional<String[]> tooltip) {
         this.tooltipSupplier = e -> tooltip;
         return this;
     }
     
-    public SelectorBuilder setTooltip(String... tooltip) {
+    public SelectorBuilder<T> setTooltip(String... tooltip) {
         this.tooltipSupplier = e -> Optional.ofNullable(tooltip);
         return this;
     }
     
-    public SelectorBuilder setNameProvider(Function<T, String> enumNameProvider) {
+    public SelectorBuilder<T> setNameProvider(Function<T, String> enumNameProvider) {
         this.nameProvider = enumNameProvider;
         return this;
     }
@@ -83,4 +83,4 @@ public class SelectorBuilder<T> extends FieldBuilder<T, SelectionListEntry<T>> {
         return entry;
     }
     
-}
+}