Setting.getSuggestions List -> Iterable

Author: MukjepScarlet

src/main/java/meteordevelopment/meteorclient/settings/BoolSetting.java

@@ -31,7 +31,7 @@ protected boolean isValueValid(Boolean value) {
     }
 
     @Override
-    public List<String> getSuggestions() {
+    public Iterable<String> getSuggestions() {
         return SUGGESTIONS;
     }
 

src/main/java/meteordevelopment/meteorclient/settings/ColorSetting.java

@@ -43,7 +43,7 @@ protected boolean isValueValid(SettingColor value) {
     }
 
     @Override
-    public List<String> getSuggestions() {
+    public Iterable<String> getSuggestions() {
         return SUGGESTIONS;
     }
 

src/main/java/meteordevelopment/meteorclient/settings/EntityTypeListSetting.java

@@ -88,7 +88,7 @@ protected boolean isValueValid(Set<EntityType<?>> value) {
     }
 
     @Override
-    public List<String> getSuggestions() {
+    public Iterable<String> getSuggestions() {
         if (suggestions == null) {
             suggestions = new ArrayList<>(groups);
             for (EntityType<?> entityType : Registries.ENTITY_TYPE) {

src/main/java/meteordevelopment/meteorclient/settings/EnumSetting.java

@@ -8,7 +8,6 @@
 import it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap;
 import net.minecraft.nbt.NbtCompound;
 
-import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
 
@@ -34,10 +33,9 @@ protected boolean isValueValid(T value) {
         return true;
     }
 
-    @SuppressWarnings("unchecked")
     @Override
-    public List<String> getSuggestions() {
-        return (List<String>) (Object) List.of(nameToValueMap.keySet().toArray());
+    public Iterable<String> getSuggestions() {
+        return nameToValueMap.keySet();
     }
 
     @Override

src/main/java/meteordevelopment/meteorclient/settings/FontFaceSetting.java

@@ -39,7 +39,7 @@ protected FontFace parseImpl(String str) {
     }
 
     @Override
-    public List<String> getSuggestions() {
+    public Iterable<String> getSuggestions() {
         return List.of("JetBrainsMono-Regular", "Arial-Bold");
     }
 

src/main/java/meteordevelopment/meteorclient/settings/ModuleListSetting.java

@@ -49,7 +49,7 @@ protected boolean isValueValid(List<Module> value) {
     }
 
     @Override
-    public List<String> getSuggestions() {
+    public Iterable<String> getSuggestions() {
         if (suggestions == null) {
             suggestions = new ArrayList<>(Modules.get().getAll().size());
             for (Module module : Modules.get().getAll()) suggestions.add(module.name);

src/main/java/meteordevelopment/meteorclient/settings/PacketListSetting.java

@@ -55,7 +55,7 @@ protected boolean isValueValid(Set<Class<? extends Packet<?>>> value) {
     }
 
     @Override
-    public List<String> getSuggestions() {
+    public Iterable<String> getSuggestions() {
         if (suggestions == null) {
             suggestions = new ArrayList<>(PacketUtils.getC2SPackets().size() + PacketUtils.getS2CPackets().size());
 

src/main/java/meteordevelopment/meteorclient/settings/Setting.java

@@ -14,15 +14,11 @@
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
 import java.util.Objects;
 import java.util.function.Consumer;
 
 public abstract class Setting<T> implements IGetter<T>, ISerializable<T> {
-    private static final List<String> NO_SUGGESTIONS = Collections.emptyList();
-
     public final String name, title, description;
     private final IVisible visible;
 
@@ -109,8 +105,8 @@ public Iterable<Identifier> getIdentifierSuggestions() {
         return null;
     }
 
-    public List<String> getSuggestions() {
-        return NO_SUGGESTIONS;
+    public Iterable<String> getSuggestions() {
+        return Collections.emptyList();
     }
 
     protected abstract NbtCompound save(NbtCompound tag);