Add recipe and lang entry for soul torch levers

KnightMiner · Mar 5, 2021 · 221b4c2 · 221b4c2
1 parent 184f669
commit 221b4c2
Show file tree

Hide file tree

Showing 5 changed files with 91 additions and 7 deletions.
diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
@@ -358,6 +358,7 @@ fdb5f03014310e285449c00ba11d88981f1b1fda data/inspirations/advancements/recipes/
 fa2b6f8c5f7ec6df7ae08d67aedfda58fc1d8198 data/inspirations/advancements/recipes/redstone/utility/carpeted_trapdoor/yellow.json
 17e8020d8c353b15cced75669b76bbd2b12c3d4d data/inspirations/advancements/recipes/redstone/utility/collector.json
 d224f1c18fda934a202a69fc1ef032be12adc044 data/inspirations/advancements/recipes/redstone/utility/pipe.json
+3af9a289dc4a72516254da0cf586f4fcd2fca477 data/inspirations/advancements/recipes/redstone/utility/soul_torch_lever.json
 fb0d8cd43076f5881559a0d033917f0066821b1f data/inspirations/advancements/recipes/redstone/utility/torch_lever.json
 27c413dbe3df3687750b17237dbed62b3993cf0d data/inspirations/advancements/recipes/tools/tools/barometer.json
 61befad5942a8d4577644598d07db22d5fd7922f data/inspirations/advancements/recipes/tools/tools/charged_arrow.json
@@ -886,6 +887,7 @@ b0f48080d43e7e18a4636efff565826d40b9cbdc data/inspirations/recipes/utility/carpe
 3b2b7e946a7ff92e630165bf2a159c94d2a1769f data/inspirations/recipes/utility/collector.json
 1f59c196afdeb6151090620e0daf10eecc1bb2ff data/inspirations/recipes/utility/pipe.json
 da11abcb530445e176910e9667b5d8747688f8bd data/inspirations/recipes/utility/redstone_book.json
+979232eb902e927e7f26a637aabe84bc10ef7d27 data/inspirations/recipes/utility/soul_torch_lever.json
 11bb6d6c7413b1cffc7cadde117038f0abae3431 data/inspirations/recipes/utility/torch_lever.json
 a7677e2f4b61bec6a66eb117ddf741a3a7225321 data/inspirations/tags/blocks/bookshelves.json
 579234399829919ebd802e353152fc56d36c6319 data/inspirations/tags/blocks/carpeted_pressure_plates.json

diff --git a/...d/resources/data/inspirations/advancements/recipes/redstone/utility/soul_torch_lever.json b/...d/resources/data/inspirations/advancements/recipes/redstone/utility/soul_torch_lever.json
@@ -0,0 +1,43 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "inspirations:utility/soul_torch_lever"
+    ]
+  },
+  "criteria": {
+    "has_soul_torch": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:soul_torch"
+          }
+        ]
+      }
+    },
+    "has_lever": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:lever"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "inspirations:utility/soul_torch_lever"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_soul_torch",
+      "has_lever",
+      "has_the_recipe"
+    ]
+  ]
+}
diff --git a/src/generated/resources/data/inspirations/recipes/utility/soul_torch_lever.json b/src/generated/resources/data/inspirations/recipes/utility/soul_torch_lever.json
@@ -0,0 +1,28 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "conditions": [
+    {
+      "prop": "utility_module",
+      "type": "inspirations:config"
+    },
+    {
+      "prop": "torch_lever",
+      "type": "inspirations:config"
+    }
+  ],
+  "pattern": [
+    "T",
+    "S"
+  ],
+  "key": {
+    "S": {
+      "tag": "forge:cobblestone"
+    },
+    "T": {
+      "item": "minecraft:soul_torch"
+    }
+  },
+  "result": {
+    "item": "inspirations:soul_torch_lever"
+  }
+}
diff --git a/src/main/java/knightminer/inspirations/utility/datagen/UtilityRecipeProvider.java b/src/main/java/knightminer/inspirations/utility/datagen/UtilityRecipeProvider.java
@@ -77,13 +77,23 @@ protected void registerRecipes(Consumer<IFinishedRecipe> consumer) {
 
     // torch lever
     ShapedRecipeBuilder.shapedRecipe(InspirationsUtility.torchLeverItem)
-                       .addCriterion("has_torch", hasItem(Items.TORCH))
-                       .addCriterion("has_lever", hasItem(Items.LEVER))
-                       .key('S', Tags.Items.COBBLESTONE)
-                       .key('T', Items.TORCH)
-                       .patternLine("T")
-                       .patternLine("S")
-                       .build(withCondition(ConfigEnabledCondition.TORCH_LEVER), prefix(InspirationsUtility.torchLeverItem, "utility/"));
+            .addCriterion("has_torch", hasItem(Items.TORCH))
+            .addCriterion("has_lever", hasItem(Items.LEVER))
+            .key('S', Tags.Items.COBBLESTONE)
+            .key('T', Items.TORCH)
+            .patternLine("T")
+            .patternLine("S")
+            .build(withCondition(ConfigEnabledCondition.TORCH_LEVER), prefix(InspirationsUtility.torchLeverItem, "utility/"));
+
+    // soul torch lever
+    ShapedRecipeBuilder.shapedRecipe(InspirationsUtility.soulLeverItem)
+            .addCriterion("has_soul_torch", hasItem(Items.SOUL_TORCH))
+            .addCriterion("has_lever", hasItem(Items.LEVER))
+            .key('S', Tags.Items.COBBLESTONE)
+            .key('T', Items.SOUL_TORCH)
+            .patternLine("T")
+            .patternLine("S")
+            .build(withCondition(ConfigEnabledCondition.TORCH_LEVER), prefix(InspirationsUtility.soulLeverItem, "utility/"));
 
     // carpeted trapdoor.
     Consumer<IFinishedRecipe> trapdoorConfig = withCondition(ConfigEnabledCondition.CARPETED_TRAPDOOR);

diff --git a/src/main/resources/assets/inspirations/lang/en_us.json b/src/main/resources/assets/inspirations/lang/en_us.json
@@ -67,6 +67,7 @@
 
 
     "block.inspirations.torch_lever": "Torch Lever",
+    "block.inspirations.soul_torch_lever": "Soul Torch Lever",
     "block.inspirations.brick_button": "Bricks Button",
     "block.inspirations.nether_brick_button": "Nether Brick Button",
     "block.inspirations.redstone_barrel": "Redstone Barrel",