From 69b8e07f2e4631f1d226202e953afca06da49dab Mon Sep 17 00:00:00 2001
From: Jottyfan <jottyfan@mail.de>
Date: Fri, 14 Jul 2023 14:23:07 +0200
Subject: [PATCH] repaired recipes for blacksmith

---
 gradle.properties                             |   2 +-
 .../quickiefabric/textures/item/stub.png      | Bin 5539 -> 5184 bytes
 .../recipes/lavabucket_from_magmablock.json   |  23 ++++++++++--------
 .../recipes/torch_from_campfire.json          |   4 +--
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 46ed165..5d93061 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@
 	loader_version=0.14.21
 
 # Mod Properties
-	mod_version = 1.20.1.1
+	mod_version = 1.20.1.2
 	maven_group = de.jottyfan.minecraft
 	archives_base_name = quickiefabric
 
diff --git a/src/main/resources/assets/quickiefabric/textures/item/stub.png b/src/main/resources/assets/quickiefabric/textures/item/stub.png
index 84b3b82f92a3cf1b259c04c000594da946dc4abc..cd67920cb1109561a9dbe378c1bfae5c90361d8b 100644
GIT binary patch
delta 1724
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
M$2?ozA<;Si0ox|?{r~^~

delta 2212
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
Y!26zFYqj*t;x#dV?BHr&LG+9N3pEO?-v9sr

diff --git a/src/main/resources/data/quickiefabric/recipes/lavabucket_from_magmablock.json b/src/main/resources/data/quickiefabric/recipes/lavabucket_from_magmablock.json
index 5c6fa3d..ab61b85 100644
--- a/src/main/resources/data/quickiefabric/recipes/lavabucket_from_magmablock.json
+++ b/src/main/resources/data/quickiefabric/recipes/lavabucket_from_magmablock.json
@@ -1,12 +1,15 @@
 {
-    "type": "minecraft:smithing",
-    "base": {
-        "item": "minecraft:bucket"
-    },
-    "addition": {
-        "item": "minecraft:magma_block"
-    },
-    "result": {
-        "item": "minecraft:lava_bucket"
-    }
+	"type": "minecraft:crafting_shapeless",
+	"ingredients": [
+		{
+			"item": "minecraft:bucket"
+		},
+		{
+			"item": "minecraft:magma_block"
+		}
+	],
+	"result": {
+		"item": "minecraft:lava_bucket",
+		"count": 1
+	}
 }
diff --git a/src/main/resources/data/quickiefabric/recipes/torch_from_campfire.json b/src/main/resources/data/quickiefabric/recipes/torch_from_campfire.json
index 8d743c9..1bd27ec 100644
--- a/src/main/resources/data/quickiefabric/recipes/torch_from_campfire.json
+++ b/src/main/resources/data/quickiefabric/recipes/torch_from_campfire.json
@@ -4,6 +4,6 @@
         "item": "quickiefabric:stub"
     },
     "result": "minecraft:torch",
-    "experience": 0,
-    "cookingtime": 50
+    "experience": 0.1,
+    "cookingtime": 20
 }