chore: ConfigGroup -> Config

Also dropped "Abstract" from the editable config object

ConfigGroup was confusing since it's what EditableConfigGroup used to be

Author: desht

common/src/main/java/dev/ftb/mods/ftblibrary/client/config/EditableConfigGroup.java

@@ -6,7 +6,7 @@
 import dev.ftb.mods.ftblibrary.config.manager.ConfigManager;
 import dev.ftb.mods.ftblibrary.icon.Color4I;
 import dev.ftb.mods.ftblibrary.net.SyncConfigToServerPacket;
-import dev.ftb.mods.ftblibrary.config.value.ConfigGroup;
+import dev.ftb.mods.ftblibrary.config.value.Config;
 import dev.ftb.mods.ftblibrary.util.NameMap;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.network.chat.Component;
@@ -21,14 +21,14 @@
 import java.util.regex.Pattern;
 
 /**
- * Represents a collection of {@link AbstractEditableConfigValue} objects, possibly recursively nested in one or more
+ * Represents a collection of {@link EditableConfigValue} objects, possibly recursively nested in one or more
  * subgroups. This object can be passed to an {@link dev.ftb.mods.ftblibrary.client.config.gui.EditConfigScreen} to
  * allow GUI editing of configs.
  */
 public class EditableConfigGroup implements Comparable<EditableConfigGroup> {
     private final String id;
     private final @Nullable EditableConfigGroup parent;
-    private final Map<String, AbstractEditableConfigValue<?>> values;
+    private final Map<String, EditableConfigValue<?>> values;
     private final Map<String, EditableConfigGroup> subgroups;
     private final @Nullable ConfigCallback savedCallback;
     private final int displayOrder;
@@ -70,7 +70,7 @@ public EditableConfigGroup(String id, ConfigCallback savedCallback) {
      * @param serverConfig if true, sync config to server; if false, save locally
      * @return a new config group
      */
-    public static EditableConfigGroup createEditable(ConfigGroup config, String groupName, boolean serverConfig) {
+    public static EditableConfigGroup createEditable(Config config, String groupName, boolean serverConfig) {
         return new EditableConfigGroup(groupName, accepted -> {
             if (accepted) {
                 if (serverConfig) {
@@ -172,11 +172,11 @@ public EditableConfigGroup getOrCreateSubgroup(String id) {
      * @param value the initial value
      * @param setter a consumer to be called to apply changes to the value
      * @param defaultValue the default value
-     * @return the {@link AbstractEditableConfigValue} just added
+     * @return the {@link EditableConfigValue} just added
      * @param <T> the raw type
      * @param <CV> the config value type
      */
-    public <T, CV extends AbstractEditableConfigValue<T>> CV add(String id, CV type, T value, Consumer<T> setter, T defaultValue) {
+    public <T, CV extends EditableConfigValue<T>> CV add(String id, CV type, T value, Consumer<T> setter, T defaultValue) {
         values.put(id, type.init(this, id, value, setter, defaultValue));
         return type;
     }
@@ -294,7 +294,7 @@ public <E> EditableEnum<E> addEnum(String id, E value, Consumer<E> setter, NameM
 
     /**
      * Add a new list config item to this group. This variant has a default setter callback which updates the list
-     * passed as {@code value}; see the {@link #addList(String, List, AbstractEditableConfigValue, Consumer, Object)} overload if
+     * passed as {@code value}; see the {@link #addList(String, List, EditableConfigValue, Consumer, Object)} overload if
      * you want a custom setter.
      *
      * @param id a unique id for this config item
@@ -305,7 +305,7 @@ public <E> EditableEnum<E> addEnum(String id, E value, Consumer<E> setter, NameM
      * @param <E> the list type
      * @param <CV> the config value type which wraps the list type {@code E}
      */
-    public <E, CV extends AbstractEditableConfigValue<E>> EditableList<E, CV> addList(String id, List<E> value, CV type, E def) {
+    public <E, CV extends EditableConfigValue<E>> EditableList<E, CV> addList(String id, List<E> value, CV type, E def) {
         type.setDefaultValue(def);
         return add(id, new EditableList<>(type), value, c -> {
             value.clear();
@@ -325,7 +325,7 @@ public <E, CV extends AbstractEditableConfigValue<E>> EditableList<E, CV> addLis
      * @param <E> the list type
      * @param <CV> the config value type which wraps the list type {@code E}
      */
-    public <E, CV extends AbstractEditableConfigValue<E>> EditableList<E, CV> addList(String id, List<E> value, CV type, Consumer<List<E>> setter, E def) {
+    public <E, CV extends EditableConfigValue<E>> EditableList<E, CV> addList(String id, List<E> value, CV type, Consumer<List<E>> setter, E def) {
         type.setDefaultValue(def);
         return add(id, new EditableList<>(type), value, setter, Collections.emptyList());
     }
@@ -455,7 +455,7 @@ public EditableColor addColor(String id, Color4I value, Consumer<Color4I> setter
         return add(id, new EditableColor(), value, setter, def);
     }
 
-    public final Collection<AbstractEditableConfigValue<?>> getValues() {
+    public final Collection<EditableConfigValue<?>> getValues() {
         return values.values();
     }
 
@@ -469,7 +469,7 @@ public String getPath() {
 
     public void save(boolean accepted) {
         if (accepted) {
-            values.values().forEach(AbstractEditableConfigValue::applyValue);
+            values.values().forEach(EditableConfigValue::applyValue);
         }
 
         for (var group : subgroups.values()) {

common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableBoolean.java

@@ -8,7 +8,7 @@
 import net.minecraft.network.chat.Component;
 import org.jspecify.annotations.Nullable;
 
-public class EditableBoolean extends AbstractEditableVariantConfig<Boolean> {
+public class EditableBoolean extends EditableVariantConfig<Boolean> {
     public static final Component TRUE_TEXT = Component.literal("True");
     public static final Component FALSE_TEXT = Component.literal("False");
 

common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableColor.java

@@ -9,7 +9,7 @@
 import net.minecraft.network.chat.Component;
 import org.jspecify.annotations.Nullable;
 
-public class EditableColor extends AbstractEditableConfigValue<Color4I> {
+public class EditableColor extends EditableConfigValue<Color4I> {
     private boolean allowAlphaEdit = false;
 
     public EditableColor() {

…ditable/AbstractEditableConfigValue.java …config/editable/EditableConfigValue.javacommon/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/AbstractEditableConfigValue.java renamed to common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableConfigValue.java common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/AbstractEditableConfigValue.java renamed to common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableConfigValue.java

@@ -24,7 +24,7 @@
  *
  * @param <T> the type of object being edited
  */
-public abstract class AbstractEditableConfigValue<T> implements Comparable<AbstractEditableConfigValue<T>> {
+public abstract class EditableConfigValue<T> implements Comparable<EditableConfigValue<T>> {
     public static final Component NULL_TEXT = Component.literal("null");
 
     public String id = "";
@@ -48,7 +48,7 @@ public static Component info(String key, Object value) {
 
     /**
      * Initialise this config value; called when it's added to a config group with
-     * {@link EditableConfigGroup#add(String, AbstractEditableConfigValue, Object, Consumer, Object)}
+     * {@link EditableConfigGroup#add(String, EditableConfigValue, Object, Consumer, Object)}
      *
      * @param group the group being added to
      * @param id a unique id for this value
@@ -57,7 +57,7 @@ public static Component info(String key, Object value) {
      * @param defaultValue the default value
      * @return the initialised config value
      */
-    public AbstractEditableConfigValue<T> init(EditableConfigGroup group, String id, T value, Consumer<T> setter, T defaultValue) {
+    public EditableConfigValue<T> init(EditableConfigGroup group, String id, T value, Consumer<T> setter, T defaultValue) {
         this.group = group;
         this.id = id;
         this.value = value == null ? null : copy(value);
@@ -204,7 +204,7 @@ public String getNameKey() {
         return nameKey.isEmpty() ? getPath() : nameKey;
     }
 
-    public AbstractEditableConfigValue<T> setNameKey(String key) {
+    public EditableConfigValue<T> setNameKey(String key) {
         nameKey = key;
         return this;
     }
@@ -218,7 +218,7 @@ public String getTooltip() {
         return I18n.exists(k) ? I18n.get(k) : "";
     }
 
-    public AbstractEditableConfigValue<T> setOrder(int o) {
+    public EditableConfigValue<T> setOrder(int o) {
         order = o;
         return this;
     }
@@ -227,7 +227,7 @@ public boolean getCanEdit() {
         return canEdit;
     }
 
-    public AbstractEditableConfigValue<T> setCanEdit(boolean e) {
+    public EditableConfigValue<T> setCanEdit(boolean e) {
         canEdit = e;
         return this;
     }
@@ -236,7 +236,7 @@ public Icon<?> getIcon() {
         return getIcon(getValue());
     }
 
-    public AbstractEditableConfigValue<T> setIcon(Icon<?> icon) {
+    public EditableConfigValue<T> setIcon(Icon<?> icon) {
         this.icon = icon;
         return this;
     }
@@ -246,7 +246,7 @@ public Icon<?> getIcon(@Nullable T value) {
     }
 
     @Override
-    public int compareTo(AbstractEditableConfigValue<T> o) {
+    public int compareTo(EditableConfigValue<T> o) {
         // sort by group, then ordering, then display name
         var cg = group.compareTo(o.group);
         if (cg != 0) return cg;

common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableDouble.java

@@ -7,7 +7,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 
-public class EditableDouble extends AbstractEditableNumber<Double> {
+public class EditableDouble extends EditableNumber<Double> {
     public EditableDouble(double mn, double mx) {
         super(mn, mx);
         scrollIncrement = 1.0;

common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableEntityFace.java

@@ -14,7 +14,7 @@
 
 import java.util.OptionalLong;
 
-public class EditableEntityFace extends AbstractEditableResource<EntityType<?>> {
+public class EditableEntityFace extends EditableResource<EntityType<?>> {
     // any non-living entity would be ok here
     public static final EntityType<?> NONE = EntityType.AREA_EFFECT_CLOUD;
 

common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableEnum.java

@@ -18,7 +18,7 @@
 import net.minecraft.util.Mth;
 import org.jspecify.annotations.Nullable;
 
-public class EditableEnum<E> extends AbstractEditableVariantConfig<E> {
+public class EditableEnum<E> extends EditableVariantConfig<E> {
     public final NameMap<E> nameMap;
 
     public EditableEnum(NameMap<E> nm) {

common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableFluid.java

@@ -10,7 +10,7 @@
 
 import java.util.OptionalLong;
 
-public class EditableFluid extends AbstractEditableResource<FluidStack> {
+public class EditableFluid extends EditableResource<FluidStack> {
     private final boolean allowEmpty;
     private final boolean isFixedSize;
     private final long fixedSize;

common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableImageResource.java

@@ -16,7 +16,7 @@
 
 import java.util.OptionalLong;
 
-public class EditableImageResource extends AbstractEditableResource<Identifier> {
+public class EditableImageResource extends EditableResource<Identifier> {
     public static final Identifier NONE = FTBLibrary.rl("none");
 
     public EditableImageResource() {

common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableInt.java

@@ -7,7 +7,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 
-public class EditableInt extends AbstractEditableNumber<Integer> {
+public class EditableInt extends EditableNumber<Integer> {
     public EditableInt(int mn, int mx) {
         super(mn, mx);
         scrollIncrement = 1;