Added missing npc's and fixed some lore (#1141)

6 files changed, 45 insertions, 11 deletions

diff --git a/items/FLAMEBREAKER_CHESTPLATE.json b/items/FLAMEBREAKER_CHESTPLATE.json
index f0b4fabc..2f653179 100644
--- a/items/FLAMEBREAKER_CHESTPLATE.json
+++ b/items/FLAMEBREAKER_CHESTPLATE.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:chainmail_chestplate",
   "displayname": "§f§f§aEmber Ash Chestplate",
-  "nbttag": "{overrideMeta:1b,Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Mining Speed: §a+15\",1:\"§7Mining Fortune: §a+5\",2:\"\",3:\"§7§7An old charred shadow of the\",4:\"§7real thing leaving behind\",5:\"§7streaks of coal on the wearer\",6:\"§7from its shoddy construction.\",7:\"\",8:\"§7§4❣ §cRequires §aHard Stone\",9:\"§aCollection 5§c.\",10:\"§a§lUNCOMMON CHESTPLATE\"],Name:\"§f§f§aEmber Ash Chestplate\"},ExtraAttributes:{modifier:\"wise\",originTag:\"CRAFTING_GRID_SHIFT\",id:\"FLAMEBREAKER_CHESTPLATE\"},AttributeModifiers:[]}",
+  "nbttag": "{overrideMeta:1b,Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Mining Speed: §a+15\",1:\"§7Mining Fortune: §a+5\",2:\"\",3:\"§7§7An old charred shadow of the\",4:\"§7real thing leaving behind\",5:\"§7streaks of coal on the wearer\",6:\"§7from its shoddy construction.\",7:\"\",8:\"§7§8This item can be reforged!\",9:\"§7§4❣ §cRequires §aHard Stone\",10:\"§aCollection 5§c.\",11:\"§a§lUNCOMMON CHESTPLATE\"],Name:\"§f§f§aEmber Ash Chestplate\"},ExtraAttributes:{modifier:\"wise\",originTag:\"CRAFTING_GRID_SHIFT\",id:\"FLAMEBREAKER_CHESTPLATE\"},AttributeModifiers:[]}",
   "damage": 0,
   "lore": [
     "§7Mining Speed: §a+15",
@@ -12,6 +12,7 @@
     "§7streaks of coal on the wearer",
     "§7from its shoddy construction.",
     "",
+    "§7§8This item can be reforged!",
     "§7§4❣ §cRequires §aHard Stone",
     "§aCollection 5§c.",
     "§a§lUNCOMMON CHESTPLATE"
diff --git a/items/FLAMEBREAKER_HELMET.json b/items/FLAMEBREAKER_HELMET.json
index bc130582..16b1e715 100644
--- a/items/FLAMEBREAKER_HELMET.json
+++ b/items/FLAMEBREAKER_HELMET.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:chainmail_helmet",
   "displayname": "§f§f§aEmber Ash Helmet",
-  "nbttag": "{overrideMeta:1b,Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Mining Speed: §a+15\",1:\"§7Mining Fortune: §a+5\",2:\"\",3:\"§7§7An old charred shadow of the\",4:\"§7real thing leaving behind\",5:\"§7streaks of coal on the wearer\",6:\"§7from its shoddy construction.\",7:\"\",8:\"§7§4❣ §cRequires §aHard Stone\",9:\"§aCollection 5§c.\",10:\"§a§lUNCOMMON HELMET\"],Name:\"§f§f§aEmber Ash Helmet\"},ExtraAttributes:{modifier:\"wise\",originTag:\"QUICK_CRAFTING_SHIFT\",id:\"FLAMEBREAKER_HELMET\"},AttributeModifiers:[]}",
+  "nbttag": "{overrideMeta:1b,Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Mining Speed: §a+15\",1:\"§7Mining Fortune: §a+5\",2:\"\",3:\"§7§7An old charred shadow of the\",4:\"§7real thing leaving behind\",5:\"§7streaks of coal on the wearer\",6:\"§7from its shoddy construction.\",7:\"\",8:\"§7§8This item can be reforged!\",9:\"§7§4❣ §cRequires §aHard Stone\",10:\"§aCollection 5§c.\",11:\"§a§lUNCOMMON HELMET\"],Name:\"§f§f§aEmber Ash Helmet\"},ExtraAttributes:{modifier:\"wise\",originTag:\"QUICK_CRAFTING_SHIFT\",id:\"FLAMEBREAKER_HELMET\"},AttributeModifiers:[]}",
   "damage": 0,
   "lore": [
     "§7Mining Speed: §a+15",
@@ -12,6 +12,7 @@
     "§7streaks of coal on the wearer",
     "§7from its shoddy construction.",
     "",
+    "§7§8This item can be reforged!",
     "§7§4❣ §cRequires §aHard Stone",
     "§aCollection 5§c.",
     "§a§lUNCOMMON HELMET"
diff --git a/items/FRED_NPC.json b/items/FRED_NPC.json
new file mode 100644
index 00000000..f8230dfd
--- /dev/null
+++ b/items/FRED_NPC.json
@@ -0,0 +1,16 @@
+{
+  "itemid": "minecraft:skull",
+  "displayname": "§9Fred (NPC)",
+  "nbttag": "{SkullOwner:{Id:\"9a87c4c4-ded6-2ad0-9929-434034381485\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHBzOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzJkZGQ4OWE2YWU5NTdmNzY2ZDMwMDAxMWZmNDQ3MTQ4MWMzYmI2MWI2NzYwNzhhOGM2YzNjNDA4MzIwMWI1YzIifX19\"}]},Name:\"9a87c4c4-ded6-2ad0-9929-434034381485\"},display:{Lore:[0:\"\"],Name:\"§9Fred (NPC)\"},ExtraAttributes:{id:\"FRED_NPC\"}}",
+  "damage": 3,
+  "lore": [
+    ""
+  ],
+  "internalname": "FRED_NPC",
+  "clickcommand": "",
+  "modver": "2.1.1-PRE",
+  "x": -2,
+  "y": 150,
+  "z": -68,
+  "island": "mining_3"
+}
\ No newline at end of file
diff --git a/items/JOEY_MCPIZZA_RIFT_NPC.json b/items/JOEY_MCPIZZA_RIFT_NPC.json
new file mode 100644
index 00000000..c6fa15c1
--- /dev/null
+++ b/items/JOEY_MCPIZZA_RIFT_NPC.json
@@ -0,0 +1,16 @@
+{
+  "itemid": "minecraft:skull",
+  "displayname": "§dJoey McPizza (Rift NPC)",
+  "nbttag": "{SkullOwner:{Id:\"3006de00-5fcd-2c35-af77-f6ef57fb7372\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHBzOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2JkODgyODhkZmU4NjYxZmZiZWM2NmQzYTk1YzM3ODMzNTY1OWM0MGU5M2Y4MTEwZDkxMGE1YTA1ZjA0NGE2ZTMifX19\"}]},Name:\"3006de00-5fcd-2c35-af77-f6ef57fb7372\"},display:{Lore:[0:\"\"],Name:\"§dJoey McPizza (Rift NPC)\"},ExtraAttributes:{id:\"JOEY_MCPIZZA_RIFT_NPC\"}}",
+  "damage": 3,
+  "lore": [
+    ""
+  ],
+  "internalname": "JOEY_MCPIZZA_RIFT_NPC",
+  "clickcommand": "",
+  "modver": "2.1.1-PRE",
+  "x": -105,
+  "y": 73,
+  "z": -102,
+  "island": "rift"
+}
\ No newline at end of file
diff --git a/items/SPIDER;4.json b/items/SPIDER;4.json
index 246d863b..23bcbb3c 100644
--- a/items/SPIDER;4.json
+++ b/items/SPIDER;4.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§f§f§7[Lvl {LVL}] §6Spider",
-  "nbttag": "{overrideMeta:1b,HideFlags:254,SkullOwner:{Id:\"7c63f3cf-a963-311a-aeca-3a075b417806\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvY2Q1NDE1NDFkYWFmZjUwODk2Y2QyNThiZGJkZDRjZjgwYzNiYTgxNjczNTcyNjA3OGJmZTM5MzkyN2U1N2YxIn19fQ\u003d\u003d\"}]}},display:{Lore:[0:\"§8Combat Pet\",1:\"\",2:\"§7Strength: §c{STRENGTH}\",3:\"§7Crit Chance: §c{CRIT_CHANCE}%\",4:\"\",5:\"§6One With The Spider\",6:\"§7§7Applies §c+{0}❁ Strength §7to all\",7:\"§7§4Arachnal Ж §7weapons, armor, and\",8:\"§7equipment you have equipped.\",9:\"\",10:\"§6Web-weaver\",11:\"§7§7Upon hitting a monster, it becomes\",12:\"§7slowed by §a{1}%§7.\",13:\"\",14:\"§6Spider Whisperer\",15:\"§7§7Spider and tarantula minions work\",16:\"§7§a{2}% §7faster while on your island.\",17:\"\",18:\"§6Web Battlefield\",19:\"§7§7Killing mobs grants §c+6❁ Strength\",20:\"§c§7and §b+1✯ Magic Find §7for §a40s §7to all\",21:\"§7players staying within §a20 §7blocks §7of\",22:\"§7where they died. §8Stacks up to 10\",23:\"§8times.\",24:\"\",25:\"§7§eRight-click to add this pet to your\",26:\"§epet menu!\",27:\"\",28:\"§6§lLEGENDARY\"],Name:\"§f§f§7[Lvl {LVL}] §6Spider\"},ExtraAttributes:{petInfo:\"{\\\"type\\\":\\\"SPIDER\\\",\\\"active\\\":false,\\\"exp\\\":0,\\\"tier\\\":\\\"LEGENDARY\\\",\\\"hideInfo\\\":false,\\\"candyUsed\\\":0}\",id:\"SPIDER;4\"},AttributeModifiers:[]}",
+  "nbttag": "{overrideMeta:1b,HideFlags:254,SkullOwner:{Id:\"7c63f3cf-a963-311a-aeca-3a075b417806\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvY2Q1NDE1NDFkYWFmZjUwODk2Y2QyNThiZGJkZDRjZjgwYzNiYTgxNjczNTcyNjA3OGJmZTM5MzkyN2U1N2YxIn19fQ\u003d\u003d\"}]}},display:{Lore:[0:\"§8Combat Pet\",1:\"\",2:\"§7Strength: §c{STRENGTH}\",3:\"§7Crit Chance: §c{CRIT_CHANCE}%\",4:\"\",5:\"§6One With The Spider\",6:\"§7§7Applies §c+{0}❁ Strength §7to all\",7:\"§7§4Arachnal Ж §7weapons, armor, and\",8:\"§7equipment you have equipped.\",9:\"\",10:\"§6Web-weaver\",11:\"§7§7Upon hitting a monster, it becomes\",12:\"§7slowed by §a{1}%§7.\",13:\"\",14:\"§6Spider Whisperer\",15:\"§7§7Spider and tarantula minions work\",16:\"§7§a{2}% §7faster while on your island.\",17:\"\",18:\"§7§eRight-click to add this pet to your\",19:\"§epet menu!\",20:\"\",21:\"§6§lLEGENDARY\"],Name:\"§f§f§7[Lvl {LVL}] §6Spider\"},ExtraAttributes:{petInfo:\"{\\\"type\\\":\\\"SPIDER\\\",\\\"active\\\":false,\\\"exp\\\":0,\\\"tier\\\":\\\"LEGENDARY\\\",\\\"hideInfo\\\":false,\\\"candyUsed\\\":0}\",id:\"SPIDER;4\"},AttributeModifiers:[]}",
   "damage": 3,
   "lore": [
     "§8Combat Pet",
@@ -22,13 +22,6 @@
     "§7§7Spider and tarantula minions work",
     "§7§a{2}% §7faster while on your island.",
     "",
-    "§6Web Battlefield",
-    "§7§7Killing mobs grants §c+6❁ Strength",
-    "§c§7and §b+1✯ Magic Find §7for §a40s §7to all",
-    "§7players staying within §a20 §7blocks §7of",
-    "§7where they died. §8Stacks up to 10",
-    "§8times.",
-    "",
     "§7§eRight-click to add this pet to your",
     "§epet menu!",
     "",
diff --git a/items/SPIDER;5.json b/items/SPIDER;5.json
index ef0dca5f..1a29ccbc 100644
--- a/items/SPIDER;5.json
+++ b/items/SPIDER;5.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§f§f§7[Lvl {LVL}] §dSpider",
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"7c63f3cf-a963-311a-aeca-3a075b417806\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvY2Q1NDE1NDFkYWFmZjUwODk2Y2QyNThiZGJkZDRjZjgwYzNiYTgxNjczNTcyNjA3OGJmZTM5MzkyN2U1N2YxIn19fQ\u003d\u003d\"}]}},display:{Lore:[0:\"§8Combat Pet\",1:\"\",2:\"§7Strength: §c{STRENGTH}\",3:\"§7Crit Chance: §c{CRIT_CHANCE}%\",4:\"\",5:\"§6One With The Spider\",6:\"§7§7Applies §c+{0}❁ Strength §7to all\",7:\"§7§4Arachnal Ж §7weapons, armor, and\",8:\"§7equipment you have equipped.\",9:\"\",10:\"§6Web-weaver\",11:\"§7§7Upon hitting a monster, it becomes\",12:\"§7slowed by §a{1}%§7.\",13:\"\",14:\"§6Spider Whisperer\",15:\"§7§7Spider and tarantula minions work\",16:\"§7§a{2}% §7faster while on your island.\",17:\"\",18:\"§7§eRight-click to add this pet to your\",19:\"§epet menu!\",20:\"\",21:\"§d§lMYTHIC\"],Name:\"§f§f§7[Lvl {LVL}] §dSpider\"},ExtraAttributes:{petInfo:\"{\\\"type\\\":\\\"SPIDER\\\",\\\"active\\\":false,\\\"exp\\\":0,\\\"tier\\\":\\\"MYTHIC\\\",\\\"hideInfo\\\":false,\\\"candyUsed\\\":0,\\\"uuid\\\":\\\"b25630a8-b61a-43e1-8e85-3549b0dddb54\\\",\\\"hideRightClick\\\":false}\",id:\"SPIDER;5\"}}",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"7c63f3cf-a963-311a-aeca-3a075b417806\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvY2Q1NDE1NDFkYWFmZjUwODk2Y2QyNThiZGJkZDRjZjgwYzNiYTgxNjczNTcyNjA3OGJmZTM5MzkyN2U1N2YxIn19fQ\u003d\u003d\"}]}},display:{Lore:[0:\"§8Combat Pet\",1:\"\",2:\"§7Strength: §c{STRENGTH}\",3:\"§7Crit Chance: §c{CRIT_CHANCE}%\",4:\"\",5:\"§6One With The Spider\",6:\"§7§7Applies §c+{0}❁ Strength §7to all\",7:\"§7§4Arachnal Ж §7weapons, armor, and\",8:\"§7equipment you have equipped.\",9:\"\",10:\"§6Web-weaver\",11:\"§7§7Upon hitting a monster, it becomes\",12:\"§7slowed by §a{1}%§7.\",13:\"\",14:\"§6Spider Whisperer\",15:\"§7§7Spider and tarantula minions work\",16:\"§7§a{2}% §7faster while on your island.\",17:\"\",18:\"§6Web Battlefield\",19:\"§7§7Killing mobs grants §c+6❁ Strength\",20:\"§c§7and §b+1✯ Magic Find §7for §a40s §7to all\",21:\"§7players staying within §a20 §7blocks §7of\",22:\"§7where they died. §8Stacks up to 10\",23:\"§8times.\",24:\"\",25:\"§7§eRight-click to add this pet to your\",26:\"§epet menu!\",27:\"\",28:\"§d§lMYTHIC\"],Name:\"§f§f§7[Lvl {LVL}] §dSpider\"},ExtraAttributes:{petInfo:\"{\\\"type\\\":\\\"SPIDER\\\",\\\"active\\\":false,\\\"exp\\\":0,\\\"tier\\\":\\\"MYTHIC\\\",\\\"hideInfo\\\":false,\\\"candyUsed\\\":0,\\\"uuid\\\":\\\"b25630a8-b61a-43e1-8e85-3549b0dddb54\\\",\\\"hideRightClick\\\":false}\",id:\"SPIDER;5\"}}",
   "damage": 3,
   "lore": [
     "§8Combat Pet",
@@ -22,6 +22,13 @@
     "§7§7Spider and tarantula minions work",
     "§7§a{2}% §7faster while on your island.",
     "",
+    "§6Web Battlefield",
+    "§7§7Killing mobs grants §c+6❁ Strength",
+    "§c§7and §b+1✯ Magic Find §7for §a40s §7to all",
+    "§7players staying within §a20 §7blocks §7of",
+    "§7where they died. §8Stacks up to 10",
+    "§8times.",
+    "",
     "§7§eRight-click to add this pet to your",
     "§epet menu!",
     "",