So true (#744)

7 files changed, 112 insertions, 16 deletions

diff --git a/constants/reforgestones.json b/constants/reforgestones.json
index a61745bb..e3e796b1 100644
--- a/constants/reforgestones.json
+++ b/constants/reforgestones.json
@@ -2041,6 +2041,60 @@
       }
     }
   },
+  "SHINY_PRISM": {
+    "internalName": "SHINY_PRISM",
+    "reforgeName": "Glistering",
+    "reforgeType": "blacksmith/reforge_stone",
+    "itemTypes": "EQUIPMENT",
+    "requiredRarities": [
+      "COMMON",
+      "UNCOMMON",
+      "RARE",
+      "EPIC",
+      "LEGENDARY",
+      "MYTHIC",
+      "DIVINE"
+    ],
+    "reforgeCosts": {
+      "COMMON": 7500,
+      "UNCOMMON": 15000,
+      "RARE": 30000,
+      "EPIC": 75000,
+      "LEGENDARY": 150000,
+      "MYTHIC": 300000,
+      "DIVINE": 400000
+    },
+    "reforgeStats": {
+      "COMMON": {
+        "intelligence": 2,
+        "mining_fortune": 5
+      },
+      "UNCOMMON": {
+        "intelligence": 3,
+        "mining_fortune": 6
+      },
+      "RARE": {
+        "intelligence": 4,
+        "mining_fortune": 8
+      },
+      "EPIC": {
+        "intelligence": 5,
+        "mining_fortune": 10
+      },
+      "LEGENDARY": {
+        "intelligence": 6,
+        "mining_fortune": 12
+      },
+      "MYTHIC": {
+        "intelligence": 7,
+        "mining_fortune": 15
+      },
+      "DIVINE": {
+        "intelligence": 8,
+        "mining_fortune": 16
+      }
+    }
+  },
   "TOIL_LOG": {
     "internalName": "TOIL_LOG",
     "reforgeName": "Toil",
diff --git a/items/AMALGAMATED_CRIMSONITE.json b/items/AMALGAMATED_CRIMSONITE.json
new file mode 100644
index 00000000..9b47f616
--- /dev/null
+++ b/items/AMALGAMATED_CRIMSONITE.json
@@ -0,0 +1,16 @@
+{
+  "itemid": "minecraft:spawn_egg",
+  "displayname": "§f§f§9Amalgamated Crimsonite (Old)",
+  "nbttag": "{ench:[],HideFlags:254,display:{Lore:[0:\"§eRight-click to view recipes!\",1:\"\",2:\"§9§lRARE\"],Name:\"§f§f§9Amalgamated Crimsonite (Old)\"},ExtraAttributes:{id:\"AMALGAMATED_CRIMSONITE\"}}",
+  "damage": 52,
+  "lore": [
+    "§eRight-click to view recipes!",
+    "",
+    "§9§lRARE"
+  ],
+  "internalname": "AMALGAMATED_CRIMSONITE",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "2.1.0-REL",
+  "infoType": ""
+}
\ No newline at end of file
diff --git a/items/GABAGOEY_MIXIN.json b/items/GABAGOEY_MIXIN.json
new file mode 100644
index 00000000..55191a7a
--- /dev/null
+++ b/items/GABAGOEY_MIXIN.json
@@ -0,0 +1,28 @@
+{
+  "itemid": "minecraft:skull",
+  "displayname": "§f§f§9Gabagoey Mixin",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"adb13032-a750-31e4-8b67-63775e61dc10\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0Njc0NzQ4NDE3MiwKICAicHJvZmlsZUlkIiA6ICI0MWQzYWJjMmQ3NDk0MDBjOTA5MGQ1NDM0ZDAzODMxYiIsCiAgInByb2ZpbGVOYW1lIiA6ICJNZWdha2xvb24iLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDFlODEzYTNhMzgwZTNlYjIwMWMyNGI5NjYxZjZlZGIzOWJkZjQyYTg4OTg5ZjgxYTkwZjc3MTk5N2Q2ZjVjZCIKICAgIH0KICB9Cn0\u003d\"}]}},display:{Lore:[0:\"§8Brewing Ingredient\",1:\"\",2:\"§7§7Mixins provide a buff that can\",3:\"§7be added to §cGod Potions §7in a\",4:\"§7brewing stand and lasts for the\",5:\"§7full duration.\",6:\"\",7:\"§7Increases your §f❂ True Defense\",8:\"§f§7by §a5%§7.\",9:\"\",10:\"§7§4☠ §cRequires §5Blaze Slayer 8.\",11:\"§9§lRARE\"],Name:\"§f§f§9Gabagoey Mixin\"},ExtraAttributes:{id:\"GABAGOEY_MIXIN\"}}",
+  "damage": 3,
+  "lore": [
+    "§8Brewing Ingredient",
+    "",
+    "§7§7Mixins provide a buff that can",
+    "§7be added to §cGod Potions §7in a",
+    "§7brewing stand and lasts for the",
+    "§7full duration.",
+    "",
+    "§7Increases your §f❂ True Defense",
+    "§f§7by §a5%§7.",
+    "",
+    "§7§4☠ §cRequires §5Blaze Slayer 8.",
+    "§9§lRARE"
+  ],
+  "internalname": "GABAGOEY_MIXIN",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "2.1.0-REL",
+  "infoType": "WIKI_URL",
+  "info": [
+    "https://hypixel-skyblock.fandom.com/wiki/Mixins"
+  ]
+}
\ No newline at end of file
diff --git a/items/GEMSTONE_FUEL_TANK.json b/items/GEMSTONE_FUEL_TANK.json
index c037a261..536c4eb0 100644
--- a/items/GEMSTONE_FUEL_TANK.json
+++ b/items/GEMSTONE_FUEL_TANK.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§9Gemstone Fuel Tank",
-  "nbttag": "{overrideMeta:1b,HideFlags:254,SkullOwner:{Id:\"9afc5422-ee63-3293-b316-80fad0938c70\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYxMDYzNjAyNzQzOCwKICAicHJvZmlsZUlkIiA6ICI5MWZlMTk2ODdjOTA0NjU2YWExZmMwNTk4NmRkM2ZlNyIsCiAgInByb2ZpbGVOYW1lIiA6ICJoaGphYnJpcyIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9mYjkwNTE0ODVlMTU3MDA0MTgwMjJlMzhhNWRiMjhhMDQ5YTJlNjI3YzVmZmE1NmZkMzEzYmNkZWFkNDA2YThlIgogICAgfQogIH0KfQ\u003d\u003d\"}]}},display:{Lore:[0:\"§8Drill Part\",1:\"\",2:\"§7Part Type: §6Fuel Tank\",3:\"\",4:\"§7Increases the fuel capacity to\",5:\"§7§250,000§7.\",6:\"\",7:\"§7Can be applied to Drills by\",8:\"§7talking to §2Jotraeline\",9:\"§2Greatforge §7in the §2Dwarven\",10:\"§2Mines§7!\",11:\"\",12:\"§7§4❣ §cRequires §5Heart of the\",13:\"§5Mountain Tier 5.\",14:\"§9§lRARE\",15:\"\",16:\"§eItems Required\",17:\"§9Titanium-Infused Fuel Tank §7x1\",18:\"§9Control Switch §7x30\",19:\"§9Gemstone Mixture §7x10\",20:\"\",21:\"§7Duration: §b1d 4h\"],Name:\"§9Gemstone Fuel Tank\"},ExtraAttributes:{id:\"GEMSTONE_FUEL_TANK\"},AttributeModifiers:[]}",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"de8d4c78-9bd3-3f01-91a8-0b45dab9f2ed\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYyNTQ5MjY3ODAzMiwKICAicHJvZmlsZUlkIiA6ICI1ZjE4ZmY4NTEyZGQ0NmQ1OGY1MjJlYjg2MDg2ZjU5MiIsCiAgInByb2ZpbGVOYW1lIiA6ICJUYWtlb3MiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOWZlZjcyMmRhMDVhZThiZDgxMzI5MDVhMTFiNWI2ZGZiZjhlN2FlMGFmNTk5YzgyNjZlMTYwZmIwNWU2MTU5YiIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9\"}]}},display:{Lore:[0:\"§8Drill Part\",1:\"\",2:\"§7Part Type: §6Fuel Tank\",3:\"\",4:\"§7Increases the fuel capacity to\",5:\"§7§250,000§7.\",6:\"\",7:\"§7Can be applied to Drills by\",8:\"§7talking to a §2Drill Mechanic§7!\",9:\"\",10:\"§7§4❣ §cRequires §5Heart of the\",11:\"§5Mountain Tier 5.\",12:\"§9§lRARE\",13:\"\",14:\"§eItems Required\",15:\"§9Titanium-Infused Fuel Tank §7x1\",16:\"§9Control Switch §7x30\",17:\"§9Gemstone Mixture §7x10\",18:\"\",19:\"§7Duration: §b1d 4h\"],Name:\"§9Gemstone Fuel Tank\"},ExtraAttributes:{id:\"GEMSTONE_FUEL_TANK\"}}",
   "damage": 3,
   "lore": [
     "§8Drill Part",
@@ -12,9 +12,7 @@
     "§7§250,000§7.",
     "",
     "§7Can be applied to Drills by",
-    "§7talking to §2Jotraeline",
-    "§2Greatforge §7in the §2Dwarven",
-    "§2Mines§7!",
+    "§7talking to a §2Drill Mechanic§7!",
     "",
     "§7§4❣ §cRequires §5Heart of the",
     "§5Mountain Tier 5.",
@@ -30,9 +28,9 @@
   "internalname": "GEMSTONE_FUEL_TANK",
   "crafttext": "",
   "clickcommand": "",
-  "modver": "2.0.0-REL",
+  "modver": "2.1.0-REL",
   "infoType": "WIKI_URL",
   "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Gemstone_Fuel_Tank"
   ]
-}
+}
\ No newline at end of file
diff --git a/items/INFERNO_GENERATOR_10.json b/items/INFERNO_GENERATOR_10.json
index da4f696a..f10e1241 100644
--- a/items/INFERNO_GENERATOR_10.json
+++ b/items/INFERNO_GENERATOR_10.json
@@ -24,13 +24,13 @@
   ],
   "recipe": {
     "A1": "MOLTEN_POWDER:64",
-    "A2": "INFERNO_VORTEX:12",
+    "A2": "INFERNO_VERTEX:12",
     "A3": "MOLTEN_POWDER:64",
-    "B1": "INFERNO_VORTEX:12",
+    "B1": "INFERNO_VERTEX:12",
     "B2": "INFERNO_GENERATOR_9:1",
-    "B3": "INFERNO_VORTEX:12",
+    "B3": "INFERNO_VERTEX:12",
     "C1": "MOLTEN_POWDER:64",
-    "C2": "INFERNO_VORTEX:12",
+    "C2": "INFERNO_VERTEX:12",
     "C3": "MOLTEN_POWDER:64"
   },
   "internalname": "INFERNO_GENERATOR_10",
diff --git a/items/INFERNO_GENERATOR_9.json b/items/INFERNO_GENERATOR_9.json
index 380f20a3..f3338d10 100644
--- a/items/INFERNO_GENERATOR_9.json
+++ b/items/INFERNO_GENERATOR_9.json
@@ -20,13 +20,13 @@
   ],
   "recipe": {
     "A1": "MOLTEN_POWDER:64",
-    "A2": "INFERNO_VORTEX:4",
+    "A2": "INFERNO_VERTEX:4",
     "A3": "MOLTEN_POWDER:64",
-    "B1": "INFERNO_VORTEX:4",
+    "B1": "INFERNO_VERTEX:4",
     "B2": "INFERNO_GENERATOR_8:1",
-    "B3": "INFERNO_VORTEX:4",
+    "B3": "INFERNO_VERTEX:4",
     "C1": "MOLTEN_POWDER:64",
-    "C2": "INFERNO_VORTEX:4",
+    "C2": "INFERNO_VERTEX:4",
     "C3": "MOLTEN_POWDER:64"
   },
   "internalname": "INFERNO_GENERATOR_9",
diff --git a/items/RUBY_POLISHED_DRILL_ENGINE.json b/items/RUBY_POLISHED_DRILL_ENGINE.json
index 62ef3e5c..44b55ba0 100644
--- a/items/RUBY_POLISHED_DRILL_ENGINE.json
+++ b/items/RUBY_POLISHED_DRILL_ENGINE.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§9Ruby-polished Drill Engine",
-  "nbttag": "{overrideMeta:1b,HideFlags:254,SkullOwner:{Id:\"9afc5422-ee63-3293-b316-80fad0938c70\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYxMDYzNjAyNzQzOCwKICAicHJvZmlsZUlkIiA6ICI5MWZlMTk2ODdjOTA0NjU2YWExZmMwNTk4NmRkM2ZlNyIsCiAgInByb2ZpbGVOYW1lIiA6ICJoaGphYnJpcyIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9mYjkwNTE0ODVlMTU3MDA0MTgwMjJlMzhhNWRiMjhhMDQ5YTJlNjI3YzVmZmE1NmZkMzEzYmNkZWFkNDA2YThlIgogICAgfQogIH0KfQ\u003d\u003d\"}]}},display:{Lore:[0:\"§8Drill Part\",1:\"\",2:\"§7Part Type: §6Drill Engine\",3:\"\",4:\"§7Grants §a+150 §6⸕ Mining\",5:\"§6Speed§7.\",6:\"\",7:\"§7Can be applied to Drills by\",8:\"§7talking to a §2Drill Mechanic§7!\",9:\"\",10:\"§9§lRARE\",11:\"\",12:\"§eItems Required\",13:\"§9Mithril-Plated Drill Engine §7x1\",14:\"§9Superlite Motor §7x10\",15:\"§9❤ §9Fine Ruby Gemstone §7x10\",16:\"\",17:\"§7Duration: §b20h\"],Name:\"§9Ruby-polished Drill Engine\"},ExtraAttributes:{id:\"RUBY_POLISHED_DRILL_ENGINE\"},AttributeModifiers:[]}",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"e5a9b8d8-e1cb-3373-a84b-017b83654bf2\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYyNTQ5MjY0NDU1MywKICAicHJvZmlsZUlkIiA6ICIwNWQ0NTNiZWE0N2Y0MThiOWI2ZDUzODg0MWQxMDY2MCIsCiAgInByb2ZpbGVOYW1lIiA6ICJFY2hvcnJhIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzdmMGI5YzQ1YmJhZTExYjAwZTQzMjNhZjAxMTljMjc4ODNkMzY5MGU4YzQ4YjQ5Y2YyOWIyNDY5ODExNzllMCIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9\"}]}},display:{Lore:[0:\"§8Drill Part\",1:\"\",2:\"§7Part Type: §6Drill Engine\",3:\"\",4:\"§7Grants §a+150 §6⸕ Mining\",5:\"§6Speed§7.\",6:\"\",7:\"§7Can be applied to Drills by\",8:\"§7talking to a §2Drill Mechanic§7!\",9:\"\",10:\"§9§lRARE\",11:\"\",12:\"§eItems Required\",13:\"§9Mithril-Plated Drill Engine §7x1\",14:\"§9Superlite Motor §7x10\",15:\"§9❤ §9Fine Ruby Gemstone §7x10\",16:\"\",17:\"§7Duration: §b20h\"],Name:\"§9Ruby-polished Drill Engine\"},ExtraAttributes:{stored_drill_fuel:8258,id:\"RUBY_POLISHED_DRILL_ENGINE\"}}",
   "damage": 3,
   "lore": [
     "§8Drill Part",
@@ -31,4 +31,4 @@
   "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Ruby-Polished_Drill_Engine"
   ]
-}
+}
\ No newline at end of file