Tag support for massRegistryGet

Author: MehVahdJukaar

src/main/java/org/violetmoon/zeta/util/RegistryUtil.java

@@ -1,63 +1,75 @@
 package org.violetmoon.zeta.util;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.function.Function;
-
-import org.jetbrains.annotations.Nullable;
-import org.violetmoon.zeta.Zeta;
-import org.violetmoon.zeta.block.IZetaBlock;
-
+import com.google.common.collect.ImmutableList;
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.level.block.Block;
+import org.jetbrains.annotations.Nullable;
+import org.violetmoon.zeta.Zeta;
+import org.violetmoon.zeta.block.IZetaBlock;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
 
 public class RegistryUtil {
-	
-	public static <T> List<T> massRegistryGet(Collection<String> coll, Registry<T> reg) {
-		return coll.stream().map(ResourceLocation::new).map(reg::get).filter(Objects::nonNull).toList();
-	}
-
-	public static <T> List<T> getTagValues(RegistryAccess access, TagKey<T> tag) {
-		return access.registryOrThrow(tag.registry())
-			.getTag(tag)
-			.map(holderset -> holderset.stream().map(Holder::value).toList()) //tag exists, grab all items from it
-			.orElseGet(Collections::emptyList); //tag doesn't exist
-	}
-
-	//TODO: Can be made more 'static' when there's a nicer way to get a block's ID, instead of having to consult a particular Zeta
-	// (this is one reason i want to write the fancier block registry system - quat)
-	// This is just Duct taped as fuck to get quark-specific stuff out of IQuarkBlock so i can make it IZetaBlock
-
-	protected final Zeta z;
-
-	public RegistryUtil(Zeta z) {
-		this.z = z;
-	}
-
-	public @Nullable String inheritQuark(IZetaBlock parent, String format) {
-		return inherit(parent.getBlock(), format);
-	}
-
-	public @Nullable String inherit(Block parent, String format) {
-		ResourceLocation parentName = z.registry.getRegistryName(parent, BuiltInRegistries.BLOCK);
-		if(parentName == null)
-			return null;
-		else
-			return String.format(String.format("%s:%s", z.modid, format), parentName.getPath());
-	}
-
-	public @Nullable String inherit(Block parent, Function<String, String> fun) {
-		ResourceLocation parentName = z.registry.getRegistryName(parent, BuiltInRegistries.BLOCK);
-		if(parentName == null)
-			return null;
-		else
-			return String.format(String.format("%s:%s", z.modid, fun.apply(parentName.getPath())));
-	}
+
+    /**
+     * Gets a list of objects from a collection of strings. These can be either IDS or Tags (prefixed by '#').
+     * For tags to work tho you HAVE to call this AFTER the tags are loaded.
+     */
+    public static <T> List<T> massRegistryGet(Collection<String> coll, Registry<T> reg) {
+        ImmutableList.Builder<T> builder = new ImmutableList.Builder<>();
+        for (String s : coll) {
+            if (s.startsWith("#")) {
+                TagKey<T> tag = new TagKey<>(reg.key(), new ResourceLocation(s.substring(1)));
+                reg.getTagOrEmpty(tag).forEach(tHolder -> builder.add(tHolder.value()));
+            } else {
+                reg.getOptional(new ResourceLocation(s)).ifPresent(builder::add);
+            }
+        }
+        return builder.build();
+    }
+
+    public static <T> List<T> getTagValues(RegistryAccess access, TagKey<T> tag) {
+        return access.registryOrThrow(tag.registry())
+                .getTag(tag)
+                .map(holderset -> holderset.stream().map(Holder::value).toList()) //tag exists, grab all items from it
+                .orElseGet(Collections::emptyList); //tag doesn't exist
+    }
+
+    //TODO: Can be made more 'static' when there's a nicer way to get a block's ID, instead of having to consult a particular Zeta
+    // (this is one reason i want to write the fancier block registry system - quat)
+    // This is just Duct taped as fuck to get quark-specific stuff out of IQuarkBlock so i can make it IZetaBlock
+
+    protected final Zeta z;
+
+    public RegistryUtil(Zeta z) {
+        this.z = z;
+    }
+
+    public @Nullable String inheritQuark(IZetaBlock parent, String format) {
+        return inherit(parent.getBlock(), format);
+    }
+
+    public @Nullable String inherit(Block parent, String format) {
+        ResourceLocation parentName = z.registry.getRegistryName(parent, BuiltInRegistries.BLOCK);
+        if (parentName == null)
+            return null;
+        else
+            return String.format(String.format("%s:%s", z.modid, format), parentName.getPath());
+    }
+
+    public @Nullable String inherit(Block parent, Function<String, String> fun) {
+        ResourceLocation parentName = z.registry.getRegistryName(parent, BuiltInRegistries.BLOCK);
+        if (parentName == null)
+            return null;
+        else
+            return String.format(String.format("%s:%s", z.modid, fun.apply(parentName.getPath())));
+    }
 }