block list

Author: MukjepScarlet

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

@@ -5,5 +5,107 @@
 
 package meteordevelopment.meteorclient.settings;
 
-public abstract class AbstractRegistryListSetting {
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.nbt.NbtElement;
+import net.minecraft.nbt.NbtList;
+import net.minecraft.nbt.NbtString;
+import net.minecraft.registry.Registry;
+import net.minecraft.util.Identifier;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+public abstract class AbstractRegistryListSetting<C extends Collection<V>, V> extends Setting<C> {
+    public final Predicate<V> filter;
+    public final Registry<V> registry;
+
+    protected AbstractRegistryListSetting(String name, String description, C defaultValue, Consumer<C> onChanged, Consumer<Setting<C>> onModuleActivated, IVisible visible, Predicate<V> filter, Registry<V> registry) {
+        super(name, description, defaultValue, onChanged, onModuleActivated, visible);
+        this.filter = filter;
+        this.registry = registry;
+    }
+
+    protected abstract C transferCollection(Collection<V> from);
+
+    @Override
+    public final void resetImpl() {
+        value = transferCollection(defaultValue);
+    }
+
+    @Override
+    protected final C parseImpl(String str) {
+        String[] values = StringUtils.split(str, ',');
+        List<V> items = new ArrayList<>(values.length);
+
+        try {
+            for (String string : values) {
+                V value = parseId(this.registry, string);
+                if (value != null && (filter == null || filter.test(value))) items.add(value);
+            }
+        } catch (Exception ignored) {}
+
+        return transferCollection(items);
+    }
+
+    @Override
+    protected boolean isValueValid(C value) {
+        return true;
+    }
+
+    @Override
+    public final Iterable<Identifier> getIdentifierSuggestions() {
+        return this.registry.getIds();
+    }
+
+    @Override
+    protected final NbtCompound save(NbtCompound tag) {
+        NbtList valueTag = new NbtList();
+        for (V value : get()) {
+            valueTag.add(NbtString.of(this.registry.getId(value).toString()));
+        }
+        tag.put("value", valueTag);
+
+        return tag;
+    }
+
+    @Override
+    protected final C load(NbtCompound tag) {
+        get().clear();
+
+        NbtList valueTag = tag.getListOrEmpty("value");
+        for (NbtElement tagI : valueTag) {
+            V value = this.registry.get(Identifier.of(tagI.asString().orElse("")));
+
+            if (filter == null || filter.test(value)) get().add(value);
+        }
+
+        return get();
+    }
+
+//    public static class Builder extends SettingBuilder<BlockListSetting.Builder, List<Block>, BlockListSetting> {
+//        private Predicate<Block> filter;
+//
+//        public Builder() {
+//            super(new ArrayList<>(0));
+//        }
+//
+//        public BlockListSetting.Builder defaultValue(Block... defaults) {
+//            return defaultValue(defaults != null ? Arrays.asList(defaults) : new ArrayList<>());
+//        }
+//
+//        public BlockListSetting.Builder filter(Predicate<Block> filter) {
+//            this.filter = filter;
+//            return this;
+//        }
+//
+//        @Override
+//        public BlockListSetting build() {
+//            return new BlockListSetting(name, description, defaultValue, onChanged, onModuleActivated, filter, visible);
+//        }
+//    }
+
 }

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

@@ -6,81 +6,23 @@
 package meteordevelopment.meteorclient.settings;
 
 import net.minecraft.block.Block;
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.nbt.NbtElement;
-import net.minecraft.nbt.NbtList;
-import net.minecraft.nbt.NbtString;
 import net.minecraft.registry.Registries;
-import net.minecraft.util.Identifier;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
-public class BlockListSetting extends Setting<List<Block>> {
-    public final Predicate<Block> filter;
-
+public class BlockListSetting extends AbstractRegistryListSetting<List<Block>, Block> {
     public BlockListSetting(String name, String description, List<Block> defaultValue, Consumer<List<Block>> onChanged, Consumer<Setting<List<Block>>> onModuleActivated, Predicate<Block> filter, IVisible visible) {
-        super(name, description, defaultValue, onChanged, onModuleActivated, visible);
-
-        this.filter = filter;
-    }
-
-    @Override
-    public void resetImpl() {
-        value = new ArrayList<>(defaultValue);
-    }
-
-    @Override
-    protected List<Block> parseImpl(String str) {
-        String[] values = str.split(",");
-        List<Block> blocks = new ArrayList<>(values.length);
-
-        try {
-            for (String value : values) {
-                Block block = parseId(Registries.BLOCK, value);
-                if (block != null && (filter == null || filter.test(block))) blocks.add(block);
-            }
-        } catch (Exception ignored) {}
-
-        return blocks;
-    }
-
-    @Override
-    protected boolean isValueValid(List<Block> value) {
-        return true;
+        super(name, description, defaultValue, onChanged, onModuleActivated, visible, filter, Registries.BLOCK);
     }
 
     @Override
-    public Iterable<Identifier> getIdentifierSuggestions() {
-        return Registries.BLOCK.getIds();
-    }
-
-    @Override
-    protected NbtCompound save(NbtCompound tag) {
-        NbtList valueTag = new NbtList();
-        for (Block block : get()) {
-            valueTag.add(NbtString.of(Registries.BLOCK.getId(block).toString()));
-        }
-        tag.put("value", valueTag);
-
-        return tag;
-    }
-
-    @Override
-    protected List<Block> load(NbtCompound tag) {
-        get().clear();
-
-        NbtList valueTag = tag.getListOrEmpty("value");
-        for (NbtElement tagI : valueTag) {
-            Block block = Registries.BLOCK.get(Identifier.of(tagI.asString().orElse("")));
-
-            if (filter == null || filter.test(block)) get().add(block);
-        }
-
-        return get();
+    protected List<Block> transferCollection(Collection<Block> from) {
+        return new ArrayList<>(from);
     }
 
     public static class Builder extends SettingBuilder<Builder, List<Block>, BlockListSetting> {