chore: now adding vanilla ores to ftb materials ores tags

desht · desht · commit 3d5e2c0928ef · 2026-05-08T17:16:31.000+01:00
There is no equivalent of e.g. iron ore in ftbmaterials:ores/iron, but
we need that for recipe purposes. So we now add those ores which are in
vanilla but not FTB Materials to the corresponding ftbmaterials: tags
diff --git a/src/generated/resources/data/ftbmaterials/tags/item/ores.json b/src/generated/resources/data/ftbmaterials/tags/item/ores.json
@@ -8,12 +8,20 @@
     "ftbmaterials:apatite_deepslate_ore",
     "ftbmaterials:apatite_end_ore",
     "ftbmaterials:apatite_nether_ore",
+    "minecraft:copper_ore",
+    "minecraft:deepslate_copper_ore",
     "ftbmaterials:copper_end_ore",
     "ftbmaterials:copper_nether_ore",
+    "minecraft:diamond_ore",
+    "minecraft:deepslate_diamond_ore",
     "ftbmaterials:diamond_end_ore",
     "ftbmaterials:diamond_nether_ore",
+    "minecraft:gold_ore",
+    "minecraft:deepslate_gold_ore",
     "ftbmaterials:gold_end_ore",
     "ftbmaterials:gold_nether_ore",
+    "minecraft:iron_ore",
+    "minecraft:deepslate_iron_ore",
     "ftbmaterials:iron_end_ore",
     "ftbmaterials:iron_nether_ore",
     "ftbmaterials:lead_stone_ore",
@@ -31,6 +39,7 @@
     "ftbmaterials:quartz_stone_ore",
     "ftbmaterials:quartz_deepslate_ore",
     "ftbmaterials:quartz_end_ore",
+    "minecraft:nether_quartz_ore",
     "ftbmaterials:silver_stone_ore",
     "ftbmaterials:silver_deepslate_ore",
     "ftbmaterials:silver_end_ore",
@@ -51,14 +60,20 @@
     "ftbmaterials:zinc_deepslate_ore",
     "ftbmaterials:zinc_end_ore",
     "ftbmaterials:zinc_nether_ore",
+    "minecraft:redstone_ore",
+    "minecraft:deepslate_redstone_ore",
     "ftbmaterials:redstone_end_ore",
     "ftbmaterials:redstone_nether_ore",
     "ftbmaterials:fluorite_stone_ore",
     "ftbmaterials:fluorite_deepslate_ore",
     "ftbmaterials:fluorite_end_ore",
     "ftbmaterials:fluorite_nether_ore",
+    "minecraft:emerald_ore",
+    "minecraft:deepslate_emerald_ore",
     "ftbmaterials:emerald_end_ore",
     "ftbmaterials:emerald_nether_ore",
+    "minecraft:lapis_ore",
+    "minecraft:deepslate_lapis_ore",
     "ftbmaterials:lapis_lazuli_end_ore",
     "ftbmaterials:lapis_lazuli_nether_ore",
     "ftbmaterials:resonating_ore_stone_ore",
@@ -97,6 +112,8 @@
     "ftbmaterials:platinum_deepslate_ore",
     "ftbmaterials:platinum_end_ore",
     "ftbmaterials:platinum_nether_ore",
+    "minecraft:coal_ore",
+    "minecraft:deepslate_coal_ore",
     "ftbmaterials:coal_end_ore",
     "ftbmaterials:coal_nether_ore",
     "ftbmaterials:cinnabar_stone_ore",
diff --git a/src/generated/resources/data/ftbmaterials/tags/item/ores/coal.json b/src/generated/resources/data/ftbmaterials/tags/item/ores/coal.json
@@ -1,5 +1,7 @@
 {
   "values": [
+    "minecraft:coal_ore",
+    "minecraft:deepslate_coal_ore",
     "ftbmaterials:coal_end_ore",
     "ftbmaterials:coal_nether_ore"
   ]
diff --git a/src/generated/resources/data/ftbmaterials/tags/item/ores/copper.json b/src/generated/resources/data/ftbmaterials/tags/item/ores/copper.json
@@ -1,5 +1,7 @@
 {
   "values": [
+    "minecraft:copper_ore",
+    "minecraft:deepslate_copper_ore",
     "ftbmaterials:copper_end_ore",
     "ftbmaterials:copper_nether_ore"
   ]
diff --git a/src/generated/resources/data/ftbmaterials/tags/item/ores/diamond.json b/src/generated/resources/data/ftbmaterials/tags/item/ores/diamond.json
@@ -1,5 +1,7 @@
 {
   "values": [
+    "minecraft:diamond_ore",
+    "minecraft:deepslate_diamond_ore",
     "ftbmaterials:diamond_end_ore",
     "ftbmaterials:diamond_nether_ore"
   ]
diff --git a/src/generated/resources/data/ftbmaterials/tags/item/ores/emerald.json b/src/generated/resources/data/ftbmaterials/tags/item/ores/emerald.json
@@ -1,5 +1,7 @@
 {
   "values": [
+    "minecraft:emerald_ore",
+    "minecraft:deepslate_emerald_ore",
     "ftbmaterials:emerald_end_ore",
     "ftbmaterials:emerald_nether_ore"
   ]
diff --git a/src/generated/resources/data/ftbmaterials/tags/item/ores/gold.json b/src/generated/resources/data/ftbmaterials/tags/item/ores/gold.json
@@ -1,5 +1,7 @@
 {
   "values": [
+    "minecraft:gold_ore",
+    "minecraft:deepslate_gold_ore",
     "ftbmaterials:gold_end_ore",
     "ftbmaterials:gold_nether_ore"
   ]
diff --git a/src/generated/resources/data/ftbmaterials/tags/item/ores/iron.json b/src/generated/resources/data/ftbmaterials/tags/item/ores/iron.json
@@ -1,5 +1,7 @@
 {
   "values": [
+    "minecraft:iron_ore",
+    "minecraft:deepslate_iron_ore",
     "ftbmaterials:iron_end_ore",
     "ftbmaterials:iron_nether_ore"
   ]
diff --git a/src/generated/resources/data/ftbmaterials/tags/item/ores/lapis.json b/src/generated/resources/data/ftbmaterials/tags/item/ores/lapis.json
@@ -1,5 +1,7 @@
 {
   "values": [
+    "minecraft:lapis_ore",
+    "minecraft:deepslate_lapis_ore",
     "ftbmaterials:lapis_lazuli_end_ore",
     "ftbmaterials:lapis_lazuli_nether_ore"
   ]
diff --git a/src/generated/resources/data/ftbmaterials/tags/item/ores/quartz.json b/src/generated/resources/data/ftbmaterials/tags/item/ores/quartz.json
@@ -2,6 +2,7 @@
   "values": [
     "ftbmaterials:quartz_stone_ore",
     "ftbmaterials:quartz_deepslate_ore",
-    "ftbmaterials:quartz_end_ore"
+    "ftbmaterials:quartz_end_ore",
+    "minecraft:nether_quartz_ore"
   ]
 }
diff --git a/src/generated/resources/data/ftbmaterials/tags/item/ores/redstone.json b/src/generated/resources/data/ftbmaterials/tags/item/ores/redstone.json
@@ -1,5 +1,7 @@
 {
   "values": [
+    "minecraft:redstone_ore",
+    "minecraft:deepslate_redstone_ore",
     "ftbmaterials:redstone_end_ore",
     "ftbmaterials:redstone_nether_ore"
   ]
diff --git a/src/main/java/dev/ftb/mods/ftbmaterials/data/ItemTagsGenerator.java b/src/main/java/dev/ftb/mods/ftbmaterials/data/ItemTagsGenerator.java
@@ -25,8 +25,8 @@
 import java.util.concurrent.CompletableFuture;
 
 public class ItemTagsGenerator extends ItemTagsProvider {
-    public static final TagKey<Item> SILICON = TagKey.create(Registries.ITEM, conventional("silicon"));
-    public static final TagKey<Item> DUST_WOODS = TagKey.create(Registries.ITEM, conventional("dusts/wood"));
+    public static final TagKey<Item> C_SILICON = TagKey.create(Registries.ITEM, conventional("silicon"));
+    public static final TagKey<Item> C_DUSTS_WOOD = TagKey.create(Registries.ITEM, conventional("dusts/wood"));
 
     public ItemTagsGenerator(PackOutput output, CompletableFuture<HolderLookup.Provider> provider, CompletableFuture<TagLookup<Block>> blockTags, @Nullable ExistingFileHelper existingFileHelper) {
         super(output, provider, blockTags, FTBMaterials.MOD_ID, existingFileHelper);
@@ -39,14 +39,23 @@ protected void addTags(HolderLookup.Provider provider) {
         for (ResourceRegistryHolder holder : ResourceRegistries.allHolders()) {
             Resource resource = holder.getResource();
 
-            for (ResourceType resourceType : resource.getResourceTypes()) {
-                holder.getItemFromType(resourceType).ifPresent(target -> {
-                    Item item = target.get();
-                    Set<TagKey<Item>> tags = collectTagsForElement(resource, resourceType, cacheTagKeyLookup);
-                    for (var tag : tags) {
-                        tag(tag).add(item);
-                    }
-                });
+            for (ResourceType resourceType : ResourceType.values()) {
+                holder.getItemFromType(resourceType).ifPresentOrElse(
+                        itemHolder -> {
+                            for (var tag : collectTagsForElement(resource, resourceType, cacheTagKeyLookup)) {
+                                tag(tag).add(itemHolder.get());
+                            }
+                        },
+                        () -> resource.getVanillaEquivalentItem(resourceType).ifPresent(itemHolder -> {
+                            // there isn't a FTB Materials item for this resource & type, but there is a vanilla equivalent
+                            // - add that to any ftbmaterials: tags we know about
+                            for (var tag : collectTagsForElement(resource, resourceType, cacheTagKeyLookup)) {
+                                if (tag.location().getNamespace().equals(FTBMaterials.MOD_ID)) {
+                                    tag(tag).add(itemHolder.value());
+                                }
+                            }
+                        })
+                );
             }
         }
 
@@ -57,11 +66,11 @@ protected void addTags(HolderLookup.Provider provider) {
                 var resourceType = deferredItemPairEntry.getValue().right();
 
                 if (resource.equals(Resource.SILICON) && resourceType.equals(ResourceType.GEM)) {
-                    tag(SILICON).add(deferredItemPairEntry.getKey().get());
+                    tag(C_SILICON).add(deferredItemPairEntry.getKey().get());
                 }
 
                 if (resource.equals(Resource.SAW) && resourceType.equals(ResourceType.DUST)) {
-                    tag(DUST_WOODS).add(deferredItemPairEntry.getKey().get());
+                    tag(C_DUSTS_WOOD).add(deferredItemPairEntry.getKey().get());
                 }
             }
         }
diff --git a/src/main/java/dev/ftb/mods/ftbmaterials/resources/Resource.java b/src/main/java/dev/ftb/mods/ftbmaterials/resources/Resource.java
diff --git a/src/main/java/dev/ftb/mods/ftbmaterials/unification/UnifierDB.java b/src/main/java/dev/ftb/mods/ftbmaterials/unification/UnifierDB.java
diff --git a/src/main/java/dev/ftb/mods/ftbmaterials/util/CachedTagKeyLookup.java b/src/main/java/dev/ftb/mods/ftbmaterials/util/CachedTagKeyLookup.java
diff --git a/src/main/java/dev/ftb/mods/ftbmaterials/util/VanillaResourceUtils.java b/src/main/java/dev/ftb/mods/ftbmaterials/util/VanillaResourceUtils.java

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"values": [`
	`3`	`+ "minecraft:coal_ore",`
	`4`	`+ "minecraft:deepslate_coal_ore",`
`3`	`5`	`"ftbmaterials:coal_end_ore",`
`4`	`6`	`"ftbmaterials:coal_nether_ore"`
`5`	`7`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"values": [`
	`3`	`+ "minecraft:copper_ore",`
	`4`	`+ "minecraft:deepslate_copper_ore",`
`3`	`5`	`"ftbmaterials:copper_end_ore",`
`4`	`6`	`"ftbmaterials:copper_nether_ore"`
`5`	`7`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"values": [`
	`3`	`+ "minecraft:diamond_ore",`
	`4`	`+ "minecraft:deepslate_diamond_ore",`
`3`	`5`	`"ftbmaterials:diamond_end_ore",`
`4`	`6`	`"ftbmaterials:diamond_nether_ore"`
`5`	`7`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"values": [`
	`3`	`+ "minecraft:emerald_ore",`
	`4`	`+ "minecraft:deepslate_emerald_ore",`
`3`	`5`	`"ftbmaterials:emerald_end_ore",`
`4`	`6`	`"ftbmaterials:emerald_nether_ore"`
`5`	`7`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"values": [`
	`3`	`+ "minecraft:gold_ore",`
	`4`	`+ "minecraft:deepslate_gold_ore",`
`3`	`5`	`"ftbmaterials:gold_end_ore",`
`4`	`6`	`"ftbmaterials:gold_nether_ore"`
`5`	`7`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"values": [`
	`3`	`+ "minecraft:iron_ore",`
	`4`	`+ "minecraft:deepslate_iron_ore",`
`3`	`5`	`"ftbmaterials:iron_end_ore",`
`4`	`6`	`"ftbmaterials:iron_nether_ore"`
`5`	`7`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"values": [`
	`3`	`+ "minecraft:lapis_ore",`
	`4`	`+ "minecraft:deepslate_lapis_ore",`
`3`	`5`	`"ftbmaterials:lapis_lazuli_end_ore",`
`4`	`6`	`"ftbmaterials:lapis_lazuli_nether_ore"`
`5`	`7`	`]`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`"values": [`
`3`	`3`	`"ftbmaterials:quartz_stone_ore",`
`4`	`4`	`"ftbmaterials:quartz_deepslate_ore",`
`5`		`- "ftbmaterials:quartz_end_ore"`
	`5`	`+ "ftbmaterials:quartz_end_ore",`
	`6`	`+ "minecraft:nether_quartz_ore"`
`6`	`7`	`]`
`7`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"values": [`
	`3`	`+ "minecraft:redstone_ore",`
	`4`	`+ "minecraft:deepslate_redstone_ore",`
`3`	`5`	`"ftbmaterials:redstone_end_ore",`
`4`	`6`	`"ftbmaterials:redstone_nether_ore"`
`5`	`7`	`]`