Added Golden/Dia Goblin, fixed 1 Lore and a reforge stone ability (#1096)

* Added Golden/Dia Goblin, fixed 1 Lore and a reforge stone ability

* Fixed health of diamond goblin

7 files changed, 154 insertions, 8 deletions

diff --git a/constants/reforgestones.json b/constants/reforgestones.json
index f38df0db..4c867f9d 100644
--- a/constants/reforgestones.json
+++ b/constants/reforgestones.json
@@ -2180,7 +2180,7 @@
       "MYTHIC": 500000,
       "DIVINE": 500000
     },
-    "reforgeAbility": "Grants a §a10% §7chance to gain §a1 §7extra §fMithril when mining Mithril Ore.",
+    "reforgeAbility": "Grants a §a10% §7chance to gain §a1 §7extra §fMithril §7when mining Mithril Ore.",
     "reforgeStats": {
       "COMMON": {
         "mining_speed": 6
@@ -3149,4 +3149,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/items/DIAMOND_GOBLIN_MONSTER.json b/items/DIAMOND_GOBLIN_MONSTER.json
new file mode 100644
index 00000000..789430b2
--- /dev/null
+++ b/items/DIAMOND_GOBLIN_MONSTER.json
@@ -0,0 +1,52 @@
+{
+  "itemid": "minecraft:skull",
+  "displayname": "§9Diamond Goblin (Monster)",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"81435058-f0e1-2bda-b932-aa34dbb702c3\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHBzOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzE3Mjg1MDkwNmI3ZjBkOTUyYzBlNTA4MDczY2M0MzlmZDMzNzRjY2Y1Yjg4OWMwNmY3ZThkOTBjYzBjYzI1NWMifX19\"}]},Name:\"81435058-f0e1-2bda-b932-aa34dbb702c3\"},display:{Lore:[0:\"§7The §bDiamond Goblin §7has a §a3.33% §7chance \",1:\"§7to replace a §6Golden Goblin §7when it is spawned.\",2:\"\",3:\"§c❤ Health§8: §c5\"],Name:\"§9Diamond Goblin (Monster)\"},ExtraAttributes:{id:\"DIAMOND_GOBLIN_MONSTER\"}}",
+  "damage": 3,
+  "lore": [
+    "§7The §bDiamond Goblin §7has a §a3.33% §7chance ",
+    "§7to replace a §6Golden Goblin §7when it is spawned.",
+    "",
+    "§c❤ Health§8: §c5"
+  ],
+  "internalname": "DIAMOND_GOBLIN_MONSTER",
+  "clickcommand": "viewrecipe",
+  "modver": "2.1.1-PRE",
+  "infoType": "WIKI_URL",
+  "info": [
+    "https://hypixel-skyblock.fandom.com/wiki/Diamond_Goblin",
+    "https://wiki.hypixel.net/Diamond_Goblin"
+  ],
+  "crafttext": "",
+  "recipes": [
+    {
+      "level": 500,
+      "coins": 250,
+      "xp": 100,
+      "combat_xp": 20,
+      "name": "§cDiamond Goblin",
+      "panorama": "mining_3",
+      "render": "@neurepo:mobs/diamond_goblin.json",
+      "type": "drops",
+      "extra": [
+        "§7Other Drops:",
+        "§7+ §2400 Mithril Powder",
+        "§7+ §d400 Gemstone Powder"
+      ],
+      "drops": [
+        {
+          "id": "ESSENCE_DIAMOND:20",
+          "chance": "100%"
+        },
+        {
+          "id": "MITHRIL_ORE:20",
+          "chance": "100%"
+        },
+        {
+          "id": "PET_ITEM_PURE_MITHRIL_GEM:1",
+          "chance": "1%"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/items/DUNGEON_DECOY.json b/items/DUNGEON_DECOY.json
index 87856a00..2a970cdc 100644
--- a/items/DUNGEON_DECOY.json
+++ b/items/DUNGEON_DECOY.json
@@ -4,13 +4,14 @@
   "displayname": "§aDecoy",
   "clickcommand": "",
   "damage": 0,
-  "nbttag": "{HideFlags:254,display:{Lore:[0:\"§7Runs around and draws\",1:\"§7attention from nearby mobs,\",2:\"§7very handy for creating a\",3:\"§7distraction!\",4:\"\",5:\"§cDungeons only!\",6:\"\",7:\"§a§lUNCOMMON DUNGEON ITEM\"],Name:\"§aDecoy\"},ExtraAttributes:{id:\"DUNGEON_DECOY\"}}",
-  "modver": "2.1.0-REL",
+  "nbttag": "{HideFlags:254,display:{Lore:[0:\"§7§8Brewing Ingredient\",1:\"\",2:\"§7Runs around and draws attention\",3:\"§7from nearby mobs, very handy for\",4:\"§7creating a distraction!\",5:\"\",6:\"§cDungeons only!\",7:\"\",8:\"§a§lUNCOMMON DUNGEON ITEM\"],Name:\"§aDecoy\"},ExtraAttributes:{id:\"DUNGEON_DECOY\"}}",
+  "modver": "2.1.1-PRE",
   "lore": [
-    "§7Runs around and draws",
-    "§7attention from nearby mobs,",
-    "§7very handy for creating a",
-    "§7distraction!",
+    "§7§8Brewing Ingredient",
+    "",
+    "§7Runs around and draws attention",
+    "§7from nearby mobs, very handy for",
+    "§7creating a distraction!",
     "",
     "§cDungeons only!",
     "",
diff --git a/items/GOLDEN_GOBLIN_MONSTER.json b/items/GOLDEN_GOBLIN_MONSTER.json
new file mode 100644
index 00000000..63584466
--- /dev/null
+++ b/items/GOLDEN_GOBLIN_MONSTER.json
@@ -0,0 +1,59 @@
+{
+  "itemid": "minecraft:skull",
+  "displayname": "§9Golden Goblin (Monster)",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"81435058-f0e1-2bda-b932-aa34dbb702c3\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHBzOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzE3Mjg1MDkwNmI3ZjBkOTUyYzBlNTA4MDczY2M0MzlmZDMzNzRjY2Y1Yjg4OWMwNmY3ZThkOTBjYzBjYzI1NWMifX19\"}]},Name:\"81435058-f0e1-2bda-b932-aa34dbb702c3\"},display:{Lore:[0:\"§7Chance to spawn from Eggs:\",1:\"§9Goblin Egg §7- §a2%\",2:\"§aGreen Goblin Egg §7- §a2.5%\",3:\"§eYellow Goblin Egg §7- §a3.33\",4:\"§cRed Goblin Egg §7- §a5%\",5:\"§3Blue Goblin Egg §7- §a10%\",6:\"\",7:\"§7Other Sources:\",8:\"§7Custom Ores (§6Gold §7etc.) §7- §a0.1%\",9:\"§dGemstones §7and §3Mithril §7in the §5Crystal Hollows §7- §a0.1%\",10:\"§7Hard Stone in the §5Crystal Hollows §7- §a0.01%\",11:\"\",12:\"§c❤ Health§8: §c3\"],Name:\"§9Golden Goblin (Monster)\"},ExtraAttributes:{id:\"GOLDEN_GOBLIN_MONSTER\"}}",
+  "damage": 3,
+  "lore": [
+    "§7Chance to spawn from Eggs:",
+    "§9Goblin Egg §7- §a2%",
+    "§aGreen Goblin Egg §7- §a2.5%",
+    "§eYellow Goblin Egg §7- §a3.33",
+    "§cRed Goblin Egg §7- §a5%",
+    "§3Blue Goblin Egg §7- §a10%",
+    "",
+    "§7Other Sources:",
+    "§7Custom Ores (§6Gold §7etc.) §7- §a0.1%",
+    "§dGemstones §7and §3Mithril §7in the §5Crystal Hollows §7- §a0.1%",
+    "§7Hard Stone in the §5Crystal Hollows §7- §a0.01%",
+    "",
+    "§c❤ Health§8: §c3"
+  ],
+  "internalname": "GOLDEN_GOBLIN_MONSTER",
+  "clickcommand": "viewrecipe",
+  "modver": "2.1.1-PRE",
+  "infoType": "WIKI_URL",
+  "info": [
+    "https://hypixel-skyblock.fandom.com/wiki/Golden_Goblin",
+    "https://wiki.hypixel.net/Golden_Goblin"
+  ],
+  "crafttext": "",
+  "recipes": [
+    {
+      "level": 50,
+      "coins": 100,
+      "xp": 50,
+      "combat_xp": 0,
+      "name": "§cGolden Goblin",
+      "panorama": "mining_3",
+      "render": "@neurepo:mobs/golden_goblin.json",
+      "type": "drops",
+      "extra": [
+        "§7Other Drops:",
+        "§7+ §2200 Mithril Powder"
+      ],
+      "drops": [
+        {
+          "id": "ESSENCE_GOLD:1",
+          "chance": "100%",
+          "extra": [
+            "x2-3"
+          ]
+        },
+        {
+          "id": "MITHRIL_ORE:5",
+          "chance": "100%"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/mobs/diamond_goblin.json b/mobs/diamond_goblin.json
new file mode 100644
index 00000000..4e5a7dee
--- /dev/null
+++ b/mobs/diamond_goblin.json
@@ -0,0 +1,17 @@
+{
+  "entity": "Player",
+  "modifiers": [
+    {
+      "type": "playerdata",
+      "skin": "neurepo:mobs/golden_goblin.png",
+      "parts": true
+    },
+    {
+      "type": "equipment",
+      "helmet": "DIAMOND_HELMET",
+      "chestplate": "DIAMOND_CHESTPLATE",
+      "leggings": "DIAMOND_LEGGINGS",
+      "feet": "DIAMOND_BOOTS"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/mobs/golden_goblin.json b/mobs/golden_goblin.json
new file mode 100644
index 00000000..8d97bcbe
--- /dev/null
+++ b/mobs/golden_goblin.json
@@ -0,0 +1,17 @@
+{
+  "entity": "Player",
+  "modifiers": [
+    {
+      "type": "playerdata",
+      "skin": "neurepo:mobs/golden_goblin.png",
+      "parts": true
+    },
+    {
+      "type": "equipment",
+      "helmet": "GOLD_HELMET",
+      "chestplate": "GOLD_CHESTPLATE",
+      "leggings": "GOLD_LEGGINGS",
+      "feet": "GOLD_BOOTS"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/mobs/golden_goblin.png b/mobs/golden_goblin.png
new file mode 100644
index 00000000..f9f81cd4
--- /dev/null
+++ b/mobs/golden_goblin.png