Renamed Provider to GuiProvider

lib/src/main/java/me/lortseam/completeconfig/extensions/GuiExtension.java

@@ -1,12 +1,12 @@
 package me.lortseam.completeconfig.extensions;
 
-import me.lortseam.completeconfig.gui.cloth.Provider;
+import me.lortseam.completeconfig.gui.cloth.GuiProvider;
 
 import java.util.Collection;
 
 public interface GuiExtension extends Extension {
 
-    default Collection<Provider> getProviders() {
+    default Collection<GuiProvider> getProviders() {
         return null;
     }
 

lib/src/main/java/me/lortseam/completeconfig/extensions/clothbasicmath/ClothBasicMathGuiExtension.java

@@ -2,7 +2,7 @@ package me.lortseam.completeconfig.extensions.clothbasicmath;
 
 import me.lortseam.completeconfig.data.ColorEntry;
 import me.lortseam.completeconfig.extensions.GuiExtension;
-import me.lortseam.completeconfig.gui.cloth.Provider;
+import me.lortseam.completeconfig.gui.cloth.GuiProvider;
 import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
 import me.shedaniel.math.Color;
 
@@ -12,8 +12,8 @@ import java.util.Collections;
 final class ClothBasicMathGuiExtension implements GuiExtension {
 
     @Override
-    public Collection<Provider> getProviders() {
-        return Collections.singletonList(Provider.create(ColorEntry.class, (ColorEntry<Color> entry) -> ConfigEntryBuilder.create()
+    public Collection<GuiProvider> getProviders() {
+        return Collections.singletonList(GuiProvider.create(ColorEntry.class, (ColorEntry<Color> entry) -> ConfigEntryBuilder.create()
                         .startColorField(entry.getText(), entry.getValue())
                         .setAlphaMode(entry.isAlphaMode())
                         .setDefaultValue(entry.getDefaultValue().getColor())

lib/src/main/java/me/lortseam/completeconfig/gui/cloth/ClothConfigScreenBuilder.java

@@ -31,7 +31,7 @@ public final class ClothConfigScreenBuilder extends ConfigScreenBuilder {
 
     private final Supplier<ConfigBuilder> supplier;
     @Getter
-    private final GuiRegistry registry = new GuiRegistry();
+    private final GuiProviderRegistry registry = new GuiProviderRegistry();
 
     public ClothConfigScreenBuilder(@NonNull Supplier<ConfigBuilder> supplier) {
         this.supplier = supplier;

lib/src/main/java/me/lortseam/completeconfig/gui/cloth/Provider.java → lib/src/main/java/me/lortseam/completeconfig/gui/cloth/GuiProvider.java

@@ -13,25 +13,25 @@ import java.util.function.Predicate;
 
 @Environment(EnvType.CLIENT)
 @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
-public final class Provider {
+public final class GuiProvider {
 
-    public static <E extends Entry<?>> Provider create(Class<E> entryType, EntryBuilder<? extends E> builder, Predicate<E> predicate, Type... types) {
-        return new Provider(entry -> {
+    public static <E extends Entry<?>> GuiProvider create(Class<E> entryType, EntryBuilder<? extends E> builder, Predicate<E> predicate, Type... types) {
+        return new GuiProvider(entry -> {
             if (entry.getClass() != (entryType != null ? entryType : Entry.class)) return false;
             if (types.length > 0 && !ArrayUtils.contains(types, entry.getType())) return false;
             return predicate.test((E) entry);
         }, builder);
     }
 
-    public static <E extends Entry<?>> Provider create(Class<E> entryType, EntryBuilder<? extends E> builder, Type... types) {
+    public static <E extends Entry<?>> GuiProvider create(Class<E> entryType, EntryBuilder<? extends E> builder, Type... types) {
         return create(entryType, builder, entry -> true, types);
     }
 
-    public static Provider create(EntryBuilder<?> builder, Predicate<Entry<?>> predicate, Type... types) {
+    public static GuiProvider create(EntryBuilder<?> builder, Predicate<Entry<?>> predicate, Type... types) {
         return create(null, builder, predicate, types);
     }
 
-    public static Provider create(EntryBuilder<?> builder, Type... types) {
+    public static GuiProvider create(EntryBuilder<?> builder, Type... types) {
         if (types.length == 0) {
             throw new IllegalArgumentException("Types must not be empty");
         }

lib/src/main/java/me/lortseam/completeconfig/gui/cloth/GuiRegistry.java → lib/src/main/java/me/lortseam/completeconfig/gui/cloth/GuiProviderRegistry.java

@@ -17,23 +17,23 @@ import java.util.*;
 import java.util.stream.Stream;
 
 @Environment(EnvType.CLIENT)
-public final class GuiRegistry {
+public final class GuiProviderRegistry {
 
-    private static final List<Provider> globalProviders = Lists.newArrayList(
-            Provider.create(BooleanEntry.class, entry -> ConfigEntryBuilder.create()
+    private static final List<GuiProvider> globalProviders = Lists.newArrayList(
+            GuiProvider.create(BooleanEntry.class, entry -> ConfigEntryBuilder.create()
                     .startBooleanToggle(entry.getText(), entry.getValue())
                     .setDefaultValue(entry.getDefaultValue())
                     .setYesNoTextSupplier(entry.getValueTextSupplier())
                     .setTooltip(entry.getTooltip())
                     .setSaveConsumer(entry::setValue),
                     boolean.class, Boolean.class),
-            Provider.create((Entry<Integer> entry) -> ConfigEntryBuilder.create()
+            GuiProvider.create((Entry<Integer> entry) -> ConfigEntryBuilder.create()
                     .startIntField(entry.getText(), entry.getValue())
                     .setDefaultValue(entry.getDefaultValue())
                     .setTooltip(entry.getTooltip())
                     .setSaveConsumer(entry::setValue),
                     int.class, Integer.class),
-            Provider.create(BoundedEntry.class, (BoundedEntry<Integer> entry) -> ConfigEntryBuilder.create()
+            GuiProvider.create(BoundedEntry.class, (BoundedEntry<Integer> entry) -> ConfigEntryBuilder.create()
                     .startIntField(entry.getText(), entry.getValue())
                     .setDefaultValue(entry.getDefaultValue())
                     .setMin(entry.getMin())
@@ -41,27 +41,27 @@ public final class GuiRegistry {
                     .setTooltip(entry.getTooltip())
                     .setSaveConsumer(entry::setValue),
                     int.class, Integer.class),
-            Provider.create(SliderEntry.class, (SliderEntry<Integer> entry) -> ConfigEntryBuilder.create()
+            GuiProvider.create(SliderEntry.class, (SliderEntry<Integer> entry) -> ConfigEntryBuilder.create()
                     .startIntSlider(entry.getText(), entry.getValue(), entry.getMin(), entry.getMax())
                     .setDefaultValue(entry.getDefaultValue())
                     .setTextGetter(entry.getValueTextSupplier())
                     .setTooltip(entry.getTooltip())
                     .setSaveConsumer(entry::setValue),
                     int.class, Integer.class),
-            Provider.create(ColorEntry.class, (ColorEntry<Integer> entry) -> ConfigEntryBuilder.create()
+            GuiProvider.create(ColorEntry.class, (ColorEntry<Integer> entry) -> ConfigEntryBuilder.create()
                     .startColorField(entry.getText(), entry.getValue())
                     .setDefaultValue(entry.getDefaultValue())
                     .setAlphaMode(entry.isAlphaMode())
                     .setTooltip(entry.getTooltip())
                     .setSaveConsumer(entry::setValue),
                     int.class, Integer.class),
-            Provider.create((Entry<Long> entry) -> ConfigEntryBuilder.create()
+            GuiProvider.create((Entry<Long> entry) -> ConfigEntryBuilder.create()
                     .startLongField(entry.getText(), entry.getValue())
                     .setDefaultValue(entry.getDefaultValue())
                     .setTooltip(entry.getTooltip())
                     .setSaveConsumer(entry::setValue),
                     long.class, Long.class),
-            Provider.create(BoundedEntry.class, (BoundedEntry<Long> entry) -> ConfigEntryBuilder.create()
+            GuiProvider.create(BoundedEntry.class, (BoundedEntry<Long> entry) -> ConfigEntryBuilder.create()
                     .startLongField(entry.getText(), entry.getValue())
                     .setDefaultValue(entry.getDefaultValue())
                     .setMin(entry.getMin())
@@ -69,20 +69,20 @@ public final class GuiRegistry {
                     .setTooltip(entry.getTooltip())
                     .setSaveConsumer(entry::setValue),
                     long.class, Long.class),
-            Provider.create(SliderEntry.class, (SliderEntry<Long> entry) -> ConfigEntryBuilder.create()
+            GuiProvider.create(SliderEntry.class, (SliderEntry<Long> entry) -> ConfigEntryBuilder.create()
                     .startLongSlider(entry.getText(), entry.getValue(), entry.getMin(), entry.getMax())
                     .setDefaultValue(entry.getDefaultValue())
                     .setTextGetter(entry.getValueTextSupplier())
                     .setTooltip(entry.getTooltip())
                     .setSaveConsumer(entry::setValue),
                     long.class, Long.class),
-            Provider.create((Entry<Float> entry) -> ConfigEntryBuilder.create()
+            GuiProvider.create((Entry<Float> entry) -> ConfigEntryBuilder.create()
                     .startFloatField(entry.getText(), entry.getValue())
                     .setDefaultValue(entry.getDefaultValue())
                     .setTooltip(entry.getTooltip())
                     .setSaveConsumer(entry::setValue),
                     float.class, Float.class),
-            Provider.create(BoundedEntry.class, (BoundedEntry<Float> entry) -> ConfigEntryBuilder.create()
+            GuiProvider.create(BoundedEntry.class, (BoundedEntry<Float> entry) -> ConfigEntryBuilder.create()
                     .startFloatField(entry.getText(), entry.getValue())
                     .setDefaultValue(entry.getDefaultValue())
                     .setMin(entry.getMin())
@@ -90,13 +90,13 @@ public final class GuiRegistry {
                     .setTooltip(entry.getTooltip())
                     .setSaveConsumer(entry::setValue),
                     float.class, Float.class),
-            Provider.create((Entry<Double> entry) -> ConfigEntryBuilder.create()
+            GuiProvider.create((Entry<Double> entry) -> ConfigEntryBuilder.create()
                     .startDoubleField(entry.getText(), entry.getValue())
                     .setDefaultValue(entry.getDefaultValue())
                     .setTooltip(entry.getTooltip())
                     .setSaveConsumer(entry::setValue),
                     double.class, Double.class),
-            Provider.create(BoundedEntry.class, (BoundedEntry<Double> entry) -> ConfigEntryBuilder.create()
+            GuiProvider.create(BoundedEntry.class, (BoundedEntry<Double> entry) -> ConfigEntryBuilder.create()
                     .startDoubleField(entry.getText(), entry.getValue())
                     .setDefaultValue(entry.getDefaultValue())
                     .setMin(entry.getMin())
@@ -104,19 +104,19 @@ public final class GuiRegistry {
                     .setTooltip(entry.getTooltip())
                     .setSaveConsumer(entry::setValue),
                     double.class, Double.class),
-            Provider.create((Entry<String> entry) -> ConfigEntryBuilder.create()
+            GuiProvider.create((Entry<String> entry) -> ConfigEntryBuilder.create()
                     .startStrField(entry.getText(), entry.getValue())
                     .setDefaultValue(entry.getDefaultValue())
                     .setTooltip(entry.getTooltip())
                     .setSaveConsumer(entry::setValue),
                     String.class),
-            Provider.create(EnumEntry.class, (EnumEntry<Enum<?>> entry) -> ConfigEntryBuilder.create()
+            GuiProvider.create(EnumEntry.class, (EnumEntry<Enum<?>> entry) -> ConfigEntryBuilder.create()
                     .startEnumSelector(entry.getText(), entry.getTypeClass(), entry.getValue())
                     .setDefaultValue(entry.getDefaultValue())
                     .setTooltip(entry.getTooltip())
                     .setEnumNameProvider(entry.getValueTextSupplier())
                     .setSaveConsumer(entry::setValue)),
-            Provider.create(DropdownEntry.class, (DropdownEntry<Enum<?>> entry) -> {
+            GuiProvider.create(DropdownEntry.class, (DropdownEntry<Enum<?>> entry) -> {
                 List<Enum> enumValues = Arrays.asList(((Class<? extends Enum<?>>) entry.getTypeClass()).getEnumConstants());
                 return ConfigEntryBuilder.create()
                         .startDropdownMenu(entry.getText(), DropdownMenuBuilder.TopCellElementBuilder.of(
@@ -129,67 +129,67 @@ public final class GuiRegistry {
                         .setDefaultValue(entry.getDefaultValue())
                         .setSaveConsumer(entry::setValue);
             }),
-            Provider.create((Entry<List<Integer>> entry) -> ConfigEntryBuilder.create()
+            GuiProvider.create((Entry<List<Integer>> entry) -> ConfigEntryBuilder.create()
                     .startIntList(entry.getText(), entry.getValue())
                     .setDefaultValue(entry.getDefaultValue())
                     .setTooltip(entry.getTooltip())
                     .setSaveConsumer(entry::setValue),
                     new TypeToken<List<Integer>>() {}.getType()),
-            Provider.create((Entry<Integer[]> entry) -> ConfigEntryBuilder.create()
+            GuiProvider.create((Entry<Integer[]> entry) -> ConfigEntryBuilder.create()
                     .startIntList(entry.getText(), Arrays.asList(entry.getValue()))
                     .setDefaultValue(Arrays.asList(entry.getDefaultValue()))
                     .setTooltip(entry.getTooltip())
                     .setSaveConsumer(list -> entry.setValue(list.toArray(new Integer[0]))),
                     int[].class, Integer[].class),
-            Provider.create((Entry<List<Long>> entry) -> ConfigEntryBuilder.create()
+            GuiProvider.create((Entry<List<Long>> entry) -> ConfigEntryBuilder.create()
                     .startLongList(entry.getText(), entry.getValue())
                     .setDefaultValue(entry.getDefaultValue())
                     .setTooltip(entry.getTooltip())
                     .setSaveConsumer(entry::setValue),
                     new TypeToken<List<Long>>() {}.getType()),
-            Provider.create((Entry<Long[]> entry) -> ConfigEntryBuilder.create()
+            GuiProvider.create((Entry<Long[]> entry) -> ConfigEntryBuilder.create()
                     .startLongList(entry.getText(), Arrays.asList(entry.getValue()))
                     .setDefaultValue(Arrays.asList(entry.getDefaultValue()))
                     .setTooltip(entry.getTooltip())
                     .setSaveConsumer(list -> entry.setValue(list.toArray(new Long[0]))),
                     long[].class, Long[].class),
-            Provider.create((Entry<List<Float>> entry) -> ConfigEntryBuilder.create()
+            GuiProvider.create((Entry<List<Float>> entry) -> ConfigEntryBuilder.create()
                     .startFloatList(entry.getText(), entry.getValue())
                     .setDefaultValue(entry.getDefaultValue())
                     .setTooltip(entry.getTooltip())
                     .setSaveConsumer(entry::setValue),
                     new TypeToken<List<Float>>() {}.getType()),
-            Provider.create((Entry<Float[]> entry) -> ConfigEntryBuilder.create()
+            GuiProvider.create((Entry<Float[]> entry) -> ConfigEntryBuilder.create()
                     .startFloatList(entry.getText(), Arrays.asList(entry.getValue()))
                     .setDefaultValue(Arrays.asList(entry.getDefaultValue()))
                     .setTooltip(entry.getTooltip())
                     .setSaveConsumer(list -> entry.setValue(list.toArray(new Float[0]))),
                     float[].class, Float[].class),
-            Provider.create((Entry<List<Double>> entry) -> ConfigEntryBuilder.create()
+            GuiProvider.create((Entry<List<Double>> entry) -> ConfigEntryBuilder.create()
                     .startDoubleList(entry.getText(), entry.getValue())
                     .setDefaultValue(entry.getDefaultValue())
                     .setTooltip(entry.getTooltip())
                     .setSaveConsumer(entry::setValue),
                     new TypeToken<List<Double>>() {}.getType()),
-            Provider.create((Entry<Double[]> entry) -> ConfigEntryBuilder.create()
+            GuiProvider.create((Entry<Double[]> entry) -> ConfigEntryBuilder.create()
                     .startDoubleList(entry.getText(), Arrays.asList(entry.getValue()))
                     .setDefaultValue(Arrays.asList(entry.getDefaultValue()))
                     .setTooltip(entry.getTooltip())
                     .setSaveConsumer(list -> entry.setValue(list.toArray(new Double[0]))),
                     double[].class, Double[].class),
-            Provider.create((Entry<List<String>> entry) -> ConfigEntryBuilder.create()
+            GuiProvider.create((Entry<List<String>> entry) -> ConfigEntryBuilder.create()
                     .startStrList(entry.getText(), entry.getValue())
                     .setDefaultValue(entry.getDefaultValue())
                     .setTooltip(entry.getTooltip())
                     .setSaveConsumer(entry::setValue),
                     new TypeToken<List<String>>() {}.getType()),
-            Provider.create((Entry<String[]> entry) -> ConfigEntryBuilder.create()
+            GuiProvider.create((Entry<String[]> entry) -> ConfigEntryBuilder.create()
                     .startStrList(entry.getText(), Arrays.asList(entry.getValue()))
                     .setDefaultValue(Arrays.asList(entry.getDefaultValue()))
                     .setTooltip(entry.getTooltip())
                     .setSaveConsumer(list -> entry.setValue(list.toArray(new String[0]))),
                     String[].class),
-            Provider.create(ColorEntry.class, (ColorEntry<TextColor> entry) -> ConfigEntryBuilder.create()
+            GuiProvider.create(ColorEntry.class, (ColorEntry<TextColor> entry) -> ConfigEntryBuilder.create()
                     .startColorField(entry.getText(), entry.getValue())
                     .setDefaultValue(entry.getDefaultValue())
                     .setTooltip(entry.getTooltip())
@@ -198,14 +198,14 @@ public final class GuiRegistry {
     );
 
     static {
-        for (Collection<Provider> providers : CompleteConfig.collectExtensions(GuiExtension.class, GuiExtension::getProviders)) {
+        for (Collection<GuiProvider> providers : CompleteConfig.collectExtensions(GuiExtension.class, GuiExtension::getProviders)) {
             globalProviders.addAll(providers);
         }
     }
 
-    private final List<Provider> providers = new ArrayList<>();
+    private final List<GuiProvider> providers = new ArrayList<>();
 
-    public void add(Provider... providers) {
+    public void add(GuiProvider... providers) {
         Collections.addAll(this.providers, providers);
     }