From 39dde9870cf0e86204143f461a30123223c5c17c Mon Sep 17 00:00:00 2001
From: Lulonaut <67191924+Lulonaut@users.noreply.github.com>
Date: Thu, 26 May 2022 21:42:16 +0200
Subject: Hypixeling (#745)

* flaming fist not craftable

* Burststopper artifact recipe + parents

* misc.json

* recipe
---
 constants/misc.json              |  3 +++
 constants/parents.json           |  3 +++
 items/BURSTSTOPPER_ARTIFACT.json | 10 +++++-----
 items/FLAMING_FIST.json          | 13 -------------
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/constants/misc.json b/constants/misc.json
index 1ef56de4..72866bc4 100644
--- a/constants/misc.json
+++ b/constants/misc.json
@@ -888,6 +888,9 @@
     ],
     "ODGERS_GOLD_TOOTH": [
       "ODGERS_DIAMOND_TOOTH"
+    ],
+    "BURSTSTOPPER_TALISMAN": [
+      "BURSTSTOPPER_ARTIFACT"
     ]
   },
   "special_bois": [
diff --git a/constants/parents.json b/constants/parents.json
index cd1ac2dc..aa7a3f99 100644
--- a/constants/parents.json
+++ b/constants/parents.json
@@ -2849,5 +2849,8 @@
     "ULTIMATE_INFERNO;3",
     "ULTIMATE_INFERNO;4",
     "ULTIMATE_INFERNO;5"
+  ],
+  "BURSTSTOPPER_ARTIFACT" : [
+    "BURSTSTOPPER_TALISMAN"
   ]
 }
diff --git a/items/BURSTSTOPPER_ARTIFACT.json b/items/BURSTSTOPPER_ARTIFACT.json
index 83ba823a..517b8bf6 100644
--- a/items/BURSTSTOPPER_ARTIFACT.json
+++ b/items/BURSTSTOPPER_ARTIFACT.json
@@ -16,13 +16,13 @@
   ],
   "recipe": {
     "A1": "MOLTEN_POWDER:32",
-    "A2": "COMPACT_OOZE:20",
+    "A2": "WHIPPED_MAGMA_CREAM:20",
     "A3": "MOLTEN_POWDER:32",
-    "B1": "COMPACT_OOZE:20",
-    "B2": "REFINED_TITANIUM:64",
-    "B3": "COMPACT_OOZE:20",
+    "B1": "WHIPPED_MAGMA_CREAM:20",
+    "B2": "BURSTSTOPPER_TALISMAN:1",
+    "B3": "WHIPPED_MAGMA_CREAM:20",
     "C1": "MOLTEN_POWDER:32",
-    "C2": "COMPACT_OOZE:20",
+    "C2": "WHIPPED_MAGMA_CREAM:20",
     "C3": "MOLTEN_POWDER:32"
   },
   "internalname": "BURSTSTOPPER_ARTIFACT",
diff --git a/items/FLAMING_FIST.json b/items/FLAMING_FIST.json
index 565566a1..38862313 100644
--- a/items/FLAMING_FIST.json
+++ b/items/FLAMING_FIST.json
@@ -17,20 +17,7 @@
     "§7§8This item can be reforged!",
     "§5§lEPIC GLOVES"
   ],
-  "recipe": {
-    "A1": "FLAMES:1",
-    "A2": "FLAMES:1",
-    "A3": "FLAMES:1",
-    "B1": "LEATHER_CLOTH:6",
-    "B2": "LEATHER_CLOTH:6",
-    "B3": "LEATHER_CLOTH:6",
-    "C1": "LEATHER_CLOTH:6",
-    "C2": "LEATHER_CLOTH:6",
-    "C3": "LEATHER_CLOTH:6"
-  },
   "internalname": "FLAMING_FIST",
-  "crafttext": "",
-  "clickcommand": "viewrecipe",
   "modver": "2.1.0-REL",
   "infoType": "WIKI_URL",
   "info": [
-- 
cgit