feat: added overrides config for per-mod substitution

also added recipe/loot/worldgen subpackages to unification package

Author: desht

src/main/java/dev/ftb/mods/ftbmaterials/FTBMaterials.java

@@ -14,7 +14,7 @@
 import dev.ftb.mods.ftbmaterials.registry.ModGlobalLootModifiers;
 import dev.ftb.mods.ftbmaterials.registry.ModItems;
 import dev.ftb.mods.ftbmaterials.resources.ResourceRegistries;
-import dev.ftb.mods.ftbmaterials.unification.UnifierManager;
+import dev.ftb.mods.ftbmaterials.unification.recipe.UnifierManager;
 import net.minecraft.commands.Commands;
 import net.minecraft.resources.ResourceLocation;
 import net.neoforged.api.distmarker.Dist;

src/main/java/dev/ftb/mods/ftbmaterials/commands/BuildUnifierDB.java

@@ -3,7 +3,7 @@
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
-import dev.ftb.mods.ftbmaterials.unification.UnifierManager;
+import dev.ftb.mods.ftbmaterials.unification.recipe.UnifierManager;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
 import net.minecraft.network.chat.Component;

src/main/java/dev/ftb/mods/ftbmaterials/commands/Reload.java

@@ -3,7 +3,7 @@
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
-import dev.ftb.mods.ftbmaterials.unification.UnifierManager;
+import dev.ftb.mods.ftbmaterials.unification.recipe.UnifierManager;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
 import net.minecraft.network.chat.Component;

src/main/java/dev/ftb/mods/ftbmaterials/config/StartupConfig.java

@@ -6,6 +6,7 @@
 import dev.ftb.mods.ftbmaterials.FTBMaterials;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 
 public interface StartupConfig {
     String KEY = FTBMaterials.MOD_ID + "-startup";
@@ -30,4 +31,22 @@ public interface StartupConfig {
     StringListValue UNIFICATION_BLACKLIST_BLOCKS = BLACKLISTS.addStringList("unification_blacklist_blocks", new ArrayList<>())
             .comment("List of block IDs which should never be automatically added to the unification DB",
                     "These can be wildcarded, e.g. 'somemod:*' blacklists all id's in the 'somemod' namespace");
+
+    SNBTConfig OVERRIDES = CONFIG.addGroup("overrides");
+    StringStringMapValue ITEM_OVERRIDES = OVERRIDES.add(new StringStringMapValue(OVERRIDES, "item_overrides", new HashMap<>()))
+            .comment("Map of <mod-id> -> map of <tag> -> <replacement_tag>",
+                    "Overrides applied to recipe types of the given mod when doing item lookup in the unification DB");
+    StringStringMapValue TAG_OVERRIDES = OVERRIDES.add(new StringStringMapValue(OVERRIDES, "tag_overrides", new HashMap<>()))
+            .comment("Map of <mod-id> -> map of <item> -> <replacement_item>",
+                    "Overrides applied to recipe types of the given mod when doing item tag lookup in the unification DB");
+
+    static String itemOverride(String in, String modId) {
+        var map = ITEM_OVERRIDES.get().get(modId);
+        return map != null ? map.getOrDefault(in, in) : in;
+    }
+
+    static String itemTagOverride(String in, String modId) {
+        var map = TAG_OVERRIDES.get().get(modId);
+        return map != null ? map.getOrDefault(in, in) : in;
+    }
 }

src/main/java/dev/ftb/mods/ftbmaterials/config/StringStringMapValue.java

@@ -0,0 +1,45 @@
+package dev.ftb.mods.ftbmaterials.config;
+
+import dev.ftb.mods.ftblibrary.snbt.SNBTCompoundTag;
+import dev.ftb.mods.ftblibrary.snbt.config.BaseValue;
+import dev.ftb.mods.ftblibrary.snbt.config.SNBTConfig;
+import net.minecraft.Util;
+import net.minecraft.nbt.CompoundTag;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class StringStringMapValue extends BaseValue<Map<String, Map<String,String>>> {
+    protected StringStringMapValue(@Nullable SNBTConfig c, String n, Map<String, Map<String, String>> def) {
+        super(c, n, def);
+
+        super.set(new HashMap<>(def));
+    }
+
+    @Override
+    public void write(SNBTCompoundTag tag) {
+        SNBTCompoundTag mapTag = new SNBTCompoundTag();
+        get().forEach((k, subMap) -> {
+            mapTag.put(k, Util.make(new CompoundTag(), t -> subMap.forEach(t::putString)));
+        });
+
+        tag.put(this.key, mapTag);
+        comment.forEach(c -> tag.comment(key, c));
+    }
+
+    @Override
+    public void read(SNBTCompoundTag tag) {
+        Map<String, Map<String, String>> map = new HashMap<>();
+
+        SNBTCompoundTag mapTag = tag.getCompound(key);
+        for (String key : mapTag.getAllKeys()) {
+            Map<String, String> subMap = new HashMap<>();
+            map.put(key, subMap);
+            CompoundTag subTag = mapTag.getCompound(key);
+            subTag.getAllKeys().forEach(k1 -> subMap.put(k1, subTag.getString(k1)));
+        }
+
+        set(map);
+    }
+}

src/main/java/dev/ftb/mods/ftbmaterials/data/LootModifiersGenerator.java

@@ -1,7 +1,7 @@
 package dev.ftb.mods.ftbmaterials.data;
 
 import dev.ftb.mods.ftbmaterials.FTBMaterials;
-import dev.ftb.mods.ftbmaterials.unification.LootTableUnifier;
+import dev.ftb.mods.ftbmaterials.unification.loot.LootTableUnifier;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.data.PackOutput;
 import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;

src/main/java/dev/ftb/mods/ftbmaterials/mixin/BulkSectionAccessMixin.java

@@ -1,7 +1,7 @@
 package dev.ftb.mods.ftbmaterials.mixin;
 
 import dev.ftb.mods.ftbmaterials.config.StartupConfig;
-import dev.ftb.mods.ftbmaterials.unification.UnifyingLevelChunkSection;
+import dev.ftb.mods.ftbmaterials.unification.worldgen.UnifyingLevelChunkSection;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.chunk.BulkSectionAccess;
 import net.minecraft.world.level.chunk.LevelChunkSection;

src/main/java/dev/ftb/mods/ftbmaterials/mixin/RecipeManagerMixin.java

@@ -2,7 +2,7 @@
 
 import com.google.gson.JsonElement;
 import dev.ftb.mods.ftbmaterials.config.StartupConfig;
-import dev.ftb.mods.ftbmaterials.unification.UnifierManager;
+import dev.ftb.mods.ftbmaterials.unification.recipe.UnifierManager;
 import net.minecraft.world.item.crafting.RecipeManager;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

src/main/java/dev/ftb/mods/ftbmaterials/registry/ModGlobalLootModifiers.java

@@ -2,7 +2,7 @@
 
 import com.mojang.serialization.MapCodec;
 import dev.ftb.mods.ftbmaterials.FTBMaterials;
-import dev.ftb.mods.ftbmaterials.unification.LootTableUnifier;
+import dev.ftb.mods.ftbmaterials.unification.loot.LootTableUnifier;
 import net.neoforged.neoforge.common.loot.IGlobalLootModifier;
 import net.neoforged.neoforge.registries.DeferredRegister;
 import net.neoforged.neoforge.registries.NeoForgeRegistries;