add TagInjector for adding to tags at runtime

Author: gliscowo

build.gradle

@@ -4,6 +4,7 @@ plugins {
     id 'io.github.juuxel.loom-quiltflower-mini' version '1.1.0'
 }
 
+// TODO: declare mc dependency correctly
 version = "${project.mod_version}+${project.minecraft_base_version}"
 group = project.maven_group
 
@@ -46,7 +47,7 @@ dependencies {
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
     modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}"
-    modRuntime "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}"
+    modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}"
 
     testmodImplementation sourceSets.main.output
 }
@@ -96,18 +97,14 @@ javadoc {
     options.addStringOption("Xdoclint:-missing", "-quiet")
 }
 
-// configure the maven publication
 publishing {
     publications {
         mavenJava(MavenPublication) {
             from components.java
         }
     }
 
-    // select the repositories you want to publish to
     repositories {
-        // uncomment to publish to the local maven
-        // mavenLocal()
         maven {
             url ENV.MAVEN_URL
             credentials {

gradle.properties

@@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
 minecraft_base_version=1.18
-minecraft_version=21w40a
-yarn_mappings=21w40a+build.6
-loader_version=0.12.1
+minecraft_version=1.18-pre8
+yarn_mappings=1.18-pre8+build.2
+loader_version=0.12.5
 # Mod Properties
-mod_version=0.3.5
+mod_version=0.3.6
 maven_group=io.wispforest
-archives_base_name=owo
+archives_base_name=owo-lib
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.40.8+1.18
+fabric_version=0.43.0+1.18
 
 # https://www.curseforge.com/minecraft/mc-mods/roughly-enough-items/files
 rei_version=7.0.339

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/io/wispforest/owo/mixin/TagGroupLoaderMixin.java

@@ -0,0 +1,28 @@
+package io.wispforest.owo.mixin;
+
+import io.wispforest.owo.util.TagInjector;
+import net.minecraft.resource.ResourceManager;
+import net.minecraft.tag.Tag;
+import net.minecraft.tag.TagGroupLoader;
+import net.minecraft.util.Identifier;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.Map;
+
+@Mixin(TagGroupLoader.class)
+public class TagGroupLoaderMixin {
+
+    @Inject(method = "loadTags", at = @At("TAIL"))
+    public void injectValues(ResourceManager manager, CallbackInfoReturnable<Map<Identifier, Tag.Builder>> cir) {
+        var map = cir.getReturnValue();
+
+        TagInjector.ADDITIIONS.forEach((identifier, identifiers) -> {
+            var builder = map.computeIfAbsent(identifier, identifier1 -> new Tag.Builder());
+            identifiers.forEach(addition -> builder.add(addition, "owo"));
+        });
+    }
+
+}

src/main/java/io/wispforest/owo/util/TagInjector.java

@@ -0,0 +1,60 @@
+package io.wispforest.owo.util;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+
+import java.util.*;
+
+/**
+ * A simple utility for inserting values into Tags at runtime
+ */
+public class TagInjector {
+
+    public static final HashMap<Identifier, Set<Identifier>> ADDITIIONS = new HashMap<>();
+
+    /**
+     * Injects the given Identifiers into the given Tag.
+     * If the Identifiers don't correspond to an object in the
+     * relevant Registry, you <i>will</i> break the Tag.
+     * If the Tag does not exist, it will be created.
+     *
+     * @param tag    The tag to insert into, this could contain all kinds of values
+     * @param values The values to insert
+     */
+    public static void injectRaw(Identifier tag, Collection<Identifier> values) {
+        ADDITIIONS.computeIfAbsent(tag, identifier -> new HashSet<>()).addAll(values);
+    }
+
+    public static void injectRaw(Identifier tag, Identifier... values) {
+        injectRaw(tag, Arrays.asList(values));
+    }
+
+    /**
+     * A convenience method for directly inserting Blocks into the given Tag.
+     * If any of Blocks are not registered yet, this <i>will</i> throw an
+     * exception.
+     */
+    public static void injectBlocks(Identifier tag, Collection<Block> values) {
+        injectRaw(tag, values.stream().map(Registry.BLOCK::getId).toList());
+    }
+
+    public static void injectBlocks(Identifier tag, Block... values) {
+        injectRaw(tag, Arrays.stream(values).map(Registry.BLOCK::getId).toList());
+    }
+
+    /**
+     * A convenience method for directly inserting Items into the given Tag.
+     * If any of Items are not registered yet, this <i>will</i> throw an
+     * exception.
+     */
+    public static void injectItems(Identifier tag, Collection<Item> values) {
+        injectRaw(tag, values.stream().map(Registry.ITEM::getId).toList());
+    }
+
+    public static void injectItems(Identifier tag, Item... values) {
+        injectRaw(tag, Arrays.stream(values).map(Registry.ITEM::getId).toList());
+    }
+
+}

src/main/resources/owo.mixins.json

@@ -8,7 +8,8 @@
     "ItemMixin",
     "ItemSettingsMixin",
     "LevelInfoMixin",
-    "ScreenHandlerInvoker"
+    "ScreenHandlerInvoker",
+    "TagGroupLoaderMixin"
   ],
   "client": [
     "CreativeInventoryScreenMixin",

src/testmod/java/io/wispforest/uwu/Uwu.java

@@ -5,10 +5,12 @@
 import io.wispforest.owo.itemgroup.gui.ItemGroupButton;
 import io.wispforest.owo.itemgroup.gui.ItemGroupTab;
 import io.wispforest.owo.registration.reflect.FieldRegistrationHandler;
+import io.wispforest.owo.util.TagInjector;
 import io.wispforest.uwu.items.UwuItems;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
 import net.fabricmc.fabric.api.tag.TagFactory;
+import net.minecraft.block.Blocks;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemGroup;
@@ -75,6 +77,8 @@ public void onInitialize() {
 
         FieldRegistrationHandler.register(UwuItems.class, "uwu", true);
 
+        TagInjector.injectBlocks(new Identifier("base_stone_overworld"), Blocks.GLASS);
+
         FOUR_TAB_GROUP.initialize();
         SIX_TAB_GROUP.initialize();
     }