Only accept "cheap" ingot variants for the muffling upgrade

mekanism · Mar 11, 2024 · cd8a383 · cd8a383 · thiakil · Mar 11, 2024
1 parent 9211ac5
commit cd8a383
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 5 deletions.
diff --git a/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -1,4 +1,4 @@
-// Recipes	2024-03-10T15:05:05.328037	Recipes
+// Recipes	2024-03-10T19:34:57.6309729	Recipes
 b574fccc069b2808af98aa53c8b809e72bcd053d data/mekanism/recipes/antiprotonic_nucleosynthesizer.json
 6be89827224a18f3aef522df254ae09cfe93304f data/mekanism/recipes/atomic_disassembler.json
 2f33c48a639876d68a3a712c24540c3f78c5e86f data/mekanism/recipes/bin/advanced.json
@@ -4402,6 +4402,6 @@ de8e375626a75786126f24a242733844097ab7b9 data/mekanism/recipes/upgrade/anchor.js
 cef06df9831191d825a1a542aab9755efb35482b data/mekanism/recipes/upgrade/energy.json
 ff120cbf055793ef20bd53be9b2825f20405ca88 data/mekanism/recipes/upgrade/filter.json
 9558e646abd005ff9c75cd050687c029dd877ad7 data/mekanism/recipes/upgrade/gas.json
-8c7b81d17b5adae6b33cb0f47c74aa4dfab1b754 data/mekanism/recipes/upgrade/muffling.json
+db442fea6590899c8a8f0c128fcdc32fbd6224b9 data/mekanism/recipes/upgrade/muffling.json
 7d046833eaca367eb0e3d23676aafcf18e049ec7 data/mekanism/recipes/upgrade/speed.json
 3add88d7d1cede13d03074ebff140f77aab99d8f data/mekanism/recipes/upgrade/stone_generator.json
diff --git a/src/datagen/generated/mekanism/.cache/f4271571320fe007f5d8ba9eb4461ed6922f6a93 b/src/datagen/generated/mekanism/.cache/f4271571320fe007f5d8ba9eb4461ed6922f6a93
@@ -1,4 +1,4 @@
-// 1.20.4	2024-03-04T10:26:37.326104	Tags: mekanism
+// 1.20.4	2024-03-10T19:34:57.618972	Tags: mekanism
 8a89da3b810e00ad44b7ee4d062a88db6298c8fe data/create/tags/fluids/no_infinite_draining.json
 b6ed3f4920042490a8f14b25e1284bb270aafaea data/forge/tags/blocks/barrels.json
 adb3ecfd3180c123cdc984320eab5ce930bdc5be data/forge/tags/blocks/barrels/personal.json
@@ -216,6 +216,7 @@ e6375720adf130f0a959afb693ee69be811e8878 data/mekanism/tags/items/dirty_dusts/ur
 dca316bda51ed84e85e6cbfbf3951b15f8e970da data/mekanism/tags/items/enriched/redstone.json
 5252b1c1d9854e26952208625d740c80abd4495f data/mekanism/tags/items/enriched/tin.json
 2637a7099be4b951892b8d1c163837011868e91b data/mekanism/tags/items/mekasuit_hud_renderer.json
+fd85493572fbede8abcb04af4cbb9c2dda216f99 data/mekanism/tags/items/muffling_center.json
 a58ddd5a8f5be0c88b72a84ee584f41d15b7b367 data/mekanism/tags/items/personal_storage.json
 eeb29577fadceb1aba3a7629a1d1030ec8a2db2f data/mekanism/tags/items/shards.json
 aa846e8c0cda0c5e08a95429c424058ff83f8cb6 data/mekanism/tags/items/shards/copper.json

diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/upgrade/muffling.json b/src/datagen/generated/mekanism/data/mekanism/recipes/upgrade/muffling.json
@@ -6,7 +6,7 @@
       "tag": "minecraft:wool"
     },
     "I": {
-      "tag": "forge:ingots"
+      "tag": "mekanism:muffling_center"
     }
   },
   "pattern": [

diff --git a/src/datagen/generated/mekanism/data/mekanism/tags/items/muffling_center.json b/src/datagen/generated/mekanism/data/mekanism/tags/items/muffling_center.json
@@ -0,0 +1,10 @@
+{
+  "values": [
+    "#forge:ingots/brick",
+    "#forge:ingots/iron",
+    "#forge:ingots/gold",
+    "#forge:ingots/osmium",
+    "#forge:ingots/tin",
+    "#forge:gems/fluorite"
+  ]
+}
diff --git a/src/datagen/main/java/mekanism/common/recipe/impl/UpgradeRecipeProvider.java b/src/datagen/main/java/mekanism/common/recipe/impl/UpgradeRecipeProvider.java
@@ -39,7 +39,7 @@ public void addRecipes(RecipeOutput consumer) {
                     TripleLine.of(Pattern.CONSTANT, Pattern.INGOT, Pattern.CONSTANT),
                     TripleLine.of(Pattern.EMPTY, Pattern.CONSTANT, Pattern.EMPTY)))
               .key(Pattern.CONSTANT, ItemTags.WOOL)
-              .key(Pattern.INGOT, Tags.Items.INGOTS)
+              .key(Pattern.INGOT, MekanismTags.Items.MUFFLING_CENTER)
               .build(consumer, Mekanism.rl(basePath + getSaveName(MekanismItems.MUFFLING_UPGRADE)));
         addUpgradeRecipe(consumer, MekanismItems.SPEED_UPGRADE, MekanismTags.Items.PROCESSED_RESOURCES.get(ResourceType.DUST, PrimaryResource.OSMIUM), basePath);
         ExtendedShapedRecipeBuilder.shapedRecipe(MekanismItems.STONE_GENERATOR_UPGRADE)

diff --git a/src/datagen/main/java/mekanism/common/tag/MekanismTagProvider.java b/src/datagen/main/java/mekanism/common/tag/MekanismTagProvider.java
@@ -109,6 +109,14 @@ protected void registerTags(HolderLookup.Provider registries) {
         );
         addToTag(MekanismTags.Items.MEKASUIT_HUD_RENDERER, MekanismItems.MEKASUIT_HELMET);
         getItemBuilder(MekanismTags.Items.STONE_CRAFTING_MATERIALS).add(ItemTags.STONE_CRAFTING_MATERIALS, Tags.Items.COBBLESTONE_NORMAL);
+        getItemBuilder(MekanismTags.Items.MUFFLING_CENTER).add(
+              Tags.Items.INGOTS_BRICK,
+              Tags.Items.INGOTS_IRON,
+              Tags.Items.INGOTS_GOLD,
+              MekanismTags.Items.PROCESSED_RESOURCES.get(ResourceType.INGOT, PrimaryResource.OSMIUM),
+              MekanismTags.Items.PROCESSED_RESOURCES.get(ResourceType.INGOT, PrimaryResource.TIN),
+              MekanismTags.Items.GEMS_FLUORITE
+        );
         addEntities();
         getBlockBuilder(MekanismTags.Blocks.MINER_BLACKLIST);
         addHarvestRequirements();

diff --git a/src/main/java/mekanism/common/tags/MekanismTags.java b/src/main/java/mekanism/common/tags/MekanismTags.java
@@ -155,6 +155,7 @@ private Items() {
         public static final TagKey<Item> GEMS_FLUORITE = forgeTag("gems/fluorite");
         public static final TagKey<Item> MEKASUIT_HUD_RENDERER = tag("mekasuit_hud_renderer");
         public static final TagKey<Item> STONE_CRAFTING_MATERIALS = tag("stone_crafting_materials");
+        public static final TagKey<Item> MUFFLING_CENTER = tag("muffling_center");
 
         public static final TagKey<Item> COLORABLE_WOOL = tag("colorable/wool");
         public static final TagKey<Item> COLORABLE_CARPETS = tag("colorable/carpets");