Fixes #5524: Provide convention tags for iron and gold nuggets to mak…

…e both valid matter cannon ammo even when no other mod adds these convention tags.
AppliedEnergistics · Oct 22, 2021 · 186f7ee · 186f7ee
1 parent b97a76d
commit 186f7ee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/appeng/datagen/providers/recipes/MatterCannonAmmoProvider.java b/src/main/java/appeng/datagen/providers/recipes/MatterCannonAmmoProvider.java
@@ -28,6 +28,7 @@
 
 import appeng.core.AppEng;
 import appeng.core.definitions.AEItems;
+import appeng.datagen.providers.tags.ConventionTags;
 
 public class MatterCannonAmmoProvider extends AE2RecipeProvider {
     public MatterCannonAmmoProvider(DataGenerator generator) {
@@ -63,8 +64,8 @@ protected void buildAE2CraftingRecipes(Consumer<FinishedRecipe> consumer) {
         registerAmmoTag(consumer, "nuggets/titanium", new ResourceLocation("forge:nuggets/titanium"), 47.867f);
         registerAmmoTag(consumer, "nuggets/vanadium", new ResourceLocation("forge:nuggets/vanadium"), 50.9415f);
         registerAmmoTag(consumer, "nuggets/manganese", new ResourceLocation("forge:nuggets/manganese"), 54.938f);
-        registerAmmoTag(consumer, "nuggets/iron", new ResourceLocation("forge:nuggets/iron"), 55.845f);
-        registerAmmoTag(consumer, "nuggets/gold", new ResourceLocation("forge:nuggets/gold"), 196.96655f);
+        registerAmmoTag(consumer, "nuggets/iron", ConventionTags.IRON_NUGGET.getName(), 55.845f);
+        registerAmmoTag(consumer, "nuggets/gold", ConventionTags.GOLD_NUGGET.getName(), 196.96655f);
         registerAmmoTag(consumer, "nuggets/nickel", new ResourceLocation("forge:nuggets/nickel"), 58.6934f);
         registerAmmoTag(consumer, "nuggets/cobalt", new ResourceLocation("forge:nuggets/cobalt"), 58.9332f);
         registerAmmoTag(consumer, "nuggets/copper", new ResourceLocation("forge:nuggets/copper"), 63.546f);

diff --git a/src/main/java/appeng/datagen/providers/tags/ConventionTags.java b/src/main/java/appeng/datagen/providers/tags/ConventionTags.java
@@ -69,9 +69,11 @@ private ConventionTags() {
     public static Tag.Named<Item> FLUIX_DUST = tag("forge:dusts/fluix");
     public static Tag.Named<Item> FLUIX_CRYSTAL = tag("forge:gems/fluix");
 
+    public static Tag.Named<Item> GOLD_NUGGET = Tags.Items.NUGGETS_GOLD;
     public static Tag.Named<Item> GOLD_INGOT = Tags.Items.INGOTS_GOLD;
     public static Tag.Named<Item> GOLD_ORE = Tags.Items.ORES_GOLD;
 
+    public static Tag.Named<Item> IRON_NUGGET = Tags.Items.NUGGETS_IRON;
     public static Tag.Named<Item> IRON_INGOT = Tags.Items.INGOTS_IRON;
     public static Tag.Named<Item> IRON_ORE = Tags.Items.ORES_IRON;