migration

I think BlockSetting and ItemSetting can be removed...

Author: MukjepScarlet

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

@@ -5,5 +5,75 @@
 
 package meteordevelopment.meteorclient.settings;
 
-public abstract class AbstractRegistryItemSetting {
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.registry.Registry;
+import net.minecraft.util.Identifier;
+
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+public abstract class AbstractRegistryItemSetting<V> extends Setting<V> {
+    public final Predicate<V> filter;
+    public final Registry<V> registry;
+
+    protected AbstractRegistryItemSetting(String name, String description, V defaultValue, Consumer<V> onChanged, Consumer<Setting<V>> onModuleActivated, IVisible visible, Predicate<V> filter, Registry<V> registry) {
+        super(name, description, defaultValue, onChanged, onModuleActivated, visible);
+
+        this.filter = filter;
+        this.registry = registry;
+    }
+
+    @Override
+    protected final V parseImpl(String str) {
+        return parseId(registry, str);
+    }
+
+    @Override
+    protected final boolean isValueValid(V value) {
+        return filter == null || filter.test(value);
+    }
+
+    @Override
+    public final Iterable<Identifier> getIdentifierSuggestions() {
+        return registry.getIds();
+    }
+
+    @Override
+    protected final NbtCompound save(NbtCompound tag) {
+        tag.putString("value", registry.getId(get()).toString());
+
+        return tag;
+    }
+
+    @Override
+    protected final V load(NbtCompound tag) {
+        value = registry.get(Identifier.of(tag.getString("value", "")));
+
+        if (filter != null && !filter.test(value)) {
+            for (V t : registry) {
+                if (filter.test(t)) {
+                    value = t;
+                    break;
+                }
+            }
+        }
+
+        return get();
+    }
+
+    @SuppressWarnings("unchecked")
+    protected static abstract class AbstractBuilder<B extends AbstractBuilder<B, V, S>, V, S extends AbstractRegistryItemSetting<V>> extends SettingBuilder<B, V, S> {
+        protected Predicate<V> filter;
+
+        protected AbstractBuilder() {
+            super(null);
+        }
+
+        public B filter(Predicate<V> filter) {
+            this.filter = filter;
+            return (B) this;
+        }
+    }
+
 }
+

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

@@ -6,72 +6,17 @@
 package meteordevelopment.meteorclient.settings;
 
 import net.minecraft.block.Block;
-import net.minecraft.nbt.NbtCompound;
 import net.minecraft.registry.Registries;
-import net.minecraft.util.Identifier;
 
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
-public class BlockSetting extends Setting<Block> {
-    public final Predicate<Block> filter;
-
+public class BlockSetting extends AbstractRegistryItemSetting<Block> {
     public BlockSetting(String name, String description, Block defaultValue, Consumer<Block> onChanged, Consumer<Setting<Block>> onModuleActivated, IVisible visible, Predicate<Block> filter) {
-        super(name, description, defaultValue, onChanged, onModuleActivated, visible);
-
-        this.filter = filter;
-    }
-
-    @Override
-    protected Block parseImpl(String str) {
-        return parseId(Registries.BLOCK, str);
-    }
-
-    @Override
-    protected boolean isValueValid(Block value) {
-        return filter == null || filter.test(value);
-    }
-
-    @Override
-    public Iterable<Identifier> getIdentifierSuggestions() {
-        return Registries.BLOCK.getIds();
-    }
-
-    @Override
-    protected NbtCompound save(NbtCompound tag) {
-        tag.putString("value", Registries.BLOCK.getId(get()).toString());
-
-        return tag;
+        super(name, description, defaultValue, onChanged, onModuleActivated, visible, filter, Registries.BLOCK);
     }
 
-    @Override
-    protected Block load(NbtCompound tag) {
-        value = Registries.BLOCK.get(Identifier.of(tag.getString("value", "")));
-
-        if (filter != null && !filter.test(value)) {
-            for (Block block : Registries.BLOCK) {
-                if (filter.test(block)) {
-                    value = block;
-                    break;
-                }
-            }
-        }
-
-        return get();
-    }
-
-    public static class Builder extends SettingBuilder<Builder, Block, BlockSetting> {
-        private Predicate<Block> filter;
-
-        public Builder() {
-            super(null);
-        }
-
-        public Builder filter(Predicate<Block> filter) {
-            this.filter = filter;
-            return this;
-        }
-
+    public static class Builder extends AbstractBuilder<Builder, Block, BlockSetting> {
         @Override
         public BlockSetting build() {
             return new BlockSetting(name, description, defaultValue, onChanged, onModuleActivated, visible, filter);

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

@@ -6,72 +6,17 @@
 package meteordevelopment.meteorclient.settings;
 
 import net.minecraft.item.Item;
-import net.minecraft.nbt.NbtCompound;
 import net.minecraft.registry.Registries;
-import net.minecraft.util.Identifier;
 
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
-public class ItemSetting extends Setting<Item> {
-    public final Predicate<Item> filter;
-
+public class ItemSetting extends AbstractRegistryItemSetting<Item> {
     public ItemSetting(String name, String description, Item defaultValue, Consumer<Item> onChanged, Consumer<Setting<Item>> onModuleActivated, IVisible visible, Predicate<Item> filter) {
-        super(name, description, defaultValue, onChanged, onModuleActivated, visible);
-
-        this.filter = filter;
-    }
-
-    @Override
-    protected Item parseImpl(String str) {
-        return parseId(Registries.ITEM, str);
-    }
-
-    @Override
-    protected boolean isValueValid(Item value) {
-        return filter == null || filter.test(value);
-    }
-
-    @Override
-    public Iterable<Identifier> getIdentifierSuggestions() {
-        return Registries.ITEM.getIds();
-    }
-
-    @Override
-    public NbtCompound save(NbtCompound tag) {
-        tag.putString("value", Registries.ITEM.getId(get()).toString());
-
-        return tag;
+        super(name, description, defaultValue, onChanged, onModuleActivated, visible, filter, Registries.ITEM);
     }
 
-    @Override
-    public Item load(NbtCompound tag) {
-        value = Registries.ITEM.get(Identifier.of(tag.getString("value","")));
-
-        if (filter != null && !filter.test(value)) {
-            for (Item item : Registries.ITEM) {
-                if (filter.test(item)) {
-                    value = item;
-                    break;
-                }
-            }
-        }
-
-        return get();
-    }
-
-    public static class Builder extends SettingBuilder<Builder, Item, ItemSetting> {
-        private Predicate<Item> filter;
-
-        public Builder() {
-            super(null);
-        }
-
-        public Builder filter(Predicate<Item> filter) {
-            this.filter = filter;
-            return this;
-        }
-
+    public static class Builder extends AbstractBuilder<Builder, Item, ItemSetting> {
         @Override
         public ItemSetting build() {
             return new ItemSetting(name, description, defaultValue, onChanged, onModuleActivated, visible, filter);

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

@@ -158,7 +158,7 @@ public static <T> T parseId(Registry<T> registry, String name) {
 
         Identifier id;
         if (name.contains(":")) id = Identifier.of(name);
-        else id = Identifier.of("minecraft", name);
+        else id = Identifier.ofVanilla(name);
         if (registry.containsId(id)) return registry.get(id);
 
         return null;