fix: raw uraninite not liquefiable

klikli-dev · Aug 17, 2024 · a580ed5 · a580ed5
1 parent a2d9b65
commit a580ed5
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 1 deletion.
diff --git a/src/generated/resources/.cache/a712c7094f0a9eb0bca39d53c159ea6414e2f817 b/src/generated/resources/.cache/a712c7094f0a9eb0bca39d53c159ea6414e2f817
@@ -1,4 +1,4 @@
-// 1.21.1	2024-08-17T19:41:08.6543126	Liquefaction Recipes
+// 1.21.1	2024-08-17T20:07:19.1302697	Liquefaction Recipes
 9ce1a8a698731779295ae7cef9352893261f8e52 data/theurgy/recipe/liquefaction/alchemical_sulfur_acacia_log.json
 401b4a08c4e47941b277be22d557f5c89efe1aed data/theurgy/recipe/liquefaction/alchemical_sulfur_allthemodium_from_ingots_allthemodium.json
 132d15264a84219a79173db633c2347189b73c71 data/theurgy/recipe/liquefaction/alchemical_sulfur_allthemodium_from_ores_allthemodium.json
@@ -319,6 +319,7 @@ ea8ab4b697d4f5a600b1a04852d0ee4858ef1b75 data/theurgy/recipe/liquefaction/alchem
 aa9dc4a717a1bab8a6aabcbe7307bfde9eb3da69 data/theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_ores_uraninite_dense.json
 dca020070b16e05685def53ef4a9733a479a5935 data/theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_ores_uraninite_poor.json
 5c605670fdc8a2cb3d88ae96776c2fb056e3654d data/theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_ores_uraninite_regular.json
+f8c997bdb53d55de7d1cd3ca9247ec6b63a47592 data/theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_raw_materials_uraninite.json
 8f34774ae2c009a0f24fe6fc23101ae59fef8a7d data/theurgy/recipe/liquefaction/alchemical_sulfur_uranium_from_ingots_uranium.json
 9a157e49922be7a9b213df4957bb606ca7560614 data/theurgy/recipe/liquefaction/alchemical_sulfur_uranium_from_ores_uranium.json
 e1d8a0d4d86e943246f0e64e3b0f965ee0588e6b data/theurgy/recipe/liquefaction/alchemical_sulfur_uranium_from_raw_materials_uranium.json

diff --git a/...theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_raw_materials_uraninite.json b/...theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_raw_materials_uraninite.json
@@ -0,0 +1,28 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:not",
+      "value": {
+        "type": "neoforge:tag_empty",
+        "tag": "c:raw_materials/uraninite"
+      }
+    }
+  ],
+  "type": "theurgy:liquefaction",
+  "category": "misc",
+  "ingredient": {
+    "tag": "c:raw_materials/uraninite"
+  },
+  "result": {
+    "type": "theurgy:item",
+    "count": 3,
+    "id": "theurgy:alchemical_sulfur_uraninite"
+  },
+  "solvent": {
+    "amount": 10,
+    "ingredient": {
+      "fluid": "theurgy:sal_ammoniac"
+    }
+  },
+  "time": 100
+}
diff --git a/src/main/java/com/klikli_dev/theurgy/datagen/recipe/LiquefactionRecipeProvider.java b/src/main/java/com/klikli_dev/theurgy/datagen/recipe/LiquefactionRecipeProvider.java
@@ -336,6 +336,7 @@ public void buildRecipes(BiConsumer<ResourceLocation, JsonObject> recipeConsumer
         this.makeRecipe(SulfurRegistry.COPPER.get(), 3, Tags.Items.RAW_MATERIALS_COPPER, salAmmoniac, 10);
         this.makeRecipe(SulfurRegistry.GOLD.get(), 3, Tags.Items.RAW_MATERIALS_GOLD, salAmmoniac, 15);
         this.makeRecipe(SulfurRegistry.URANIUM.get(), 3, ItemTagRegistry.RAW_MATERIALS_URANIUM, salAmmoniac, 10);
+        this.makeRecipe(SulfurRegistry.URANINITE.get(), 3, ItemTagRegistry.RAW_MATERIALS_URANINITE, salAmmoniac, 10);
         this.makeRecipe(SulfurRegistry.AZURE_SILVER.get(), 3, ItemTagRegistry.RAW_MATERIALS_AZURE_SILVER, salAmmoniac, 10);
         this.makeRecipe(SulfurRegistry.SILVER.get(), 3, ItemTagRegistry.RAW_MATERIALS_SILVER, salAmmoniac, 10);
         this.makeRecipe(SulfurRegistry.ZINC.get(), 3, ItemTagRegistry.RAW_MATERIALS_ZINC, salAmmoniac, 10);

diff --git a/src/main/java/com/klikli_dev/theurgy/registry/ItemTagRegistry.java b/src/main/java/com/klikli_dev/theurgy/registry/ItemTagRegistry.java
@@ -305,6 +305,7 @@ public class ItemTagRegistry {
 
     //Common Raw Materials
     public static final TagKey<Item> RAW_MATERIALS_URANIUM = cTag("raw_materials/uranium");
+    public static final TagKey<Item> RAW_MATERIALS_URANINITE = cTag("raw_materials/uraninite");
     public static final TagKey<Item> RAW_MATERIALS_AZURE_SILVER = cTag("raw_materials/azure_silver");
     public static final TagKey<Item> RAW_MATERIALS_SILVER = cTag("raw_materials/silver");
     public static final TagKey<Item> RAW_MATERIALS_ZINC = cTag("raw_materials/zinc");