Fixes (#741)

6 files changed, 22 insertions, 6 deletions

diff --git a/items/MOLTEN_POWDER.json b/items/MOLTEN_POWDER.json
index ccd4f090..9f3efd95 100644
--- a/items/MOLTEN_POWDER.json
+++ b/items/MOLTEN_POWDER.json
@@ -13,7 +13,7 @@
     "A2": "DERELICT_ASHE:32",
     "A3": "",
     "B1": "DERELICT_ASHE:32",
-    "B2": "AMALGAMATED_CRIMSONITE:32",
+    "B2": "AMALGAMATED_CRIMSONITE_NEW:1",
     "B3": "DERELICT_ASHE:32",
     "C1": "",
     "C2": "DERELICT_ASHE:32",
diff --git a/items/OBFUSCATED_FISH_1_BRONZE.json b/items/OBFUSCATED_FISH_1_BRONZE.json
index a0b7223d..f04110bb 100644
--- a/items/OBFUSCATED_FISH_1_BRONZE.json
+++ b/items/OBFUSCATED_FISH_1_BRONZE.json
@@ -1,9 +1,12 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§f§f§f§kObfuscated 1§r §l§8§LBRONZE",
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"6044c06f-fb6e-3de8-9e7f-485b0edfdf3a\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0MzgzMTU4MTI5MywKICAicHJvZmlsZUlkIiA6ICJmYzUwMjkzYTVkMGI0NzViYWYwNDJhNzIwMWJhMzBkMiIsCiAgInByb2ZpbGVOYW1lIiA6ICJDVUNGTDE3IiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2UxZjRkOTFlMWJmOGQzYzQyNThmZTBmMjhlYzJmYTQwNjcwZTI1YmEwNmFjNGI1Y2IxYWJmNTJhODM3MzFhOWMiCiAgICB9CiAgfQp9\"}]}},display:{Lore:[0:\"§7Caught with Corrupted§r§7 Bait.\",1:\"\",2:\"§7Bring this to §fOdger §7at the\",3:\"§7top of the Blazing Volcano.\",4:\"\",5:\"§8§l* §8Soulbound §8§l*\",6:\"§f§lCOMMON TROPHY FISH\"],Name:\"§f§f§f§kObfuscated 1§r §l§8§LBRONZE\"},ExtraAttributes:{id:\"OBFUSCATED_FISH_1_BRONZE\"}}",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"6044c06f-fb6e-3de8-9e7f-485b0edfdf3a\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0MzgzMTU4MTI5MywKICAicHJvZmlsZUlkIiA6ICJmYzUwMjkzYTVkMGI0NzViYWYwNDJhNzIwMWJhMzBkMiIsCiAgInByb2ZpbGVOYW1lIiA6ICJDVUNGTDE3IiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2UxZjRkOTFlMWJmOGQzYzQyNThmZTBmMjhlYzJmYTQwNjcwZTI1YmEwNmFjNGI1Y2IxYWJmNTJhODM3MzFhOWMiCiAgICB9CiAgfQp9\"}]}},display:{Lore:[0:\"§8Fishing Bait\",1:\"§8Consumes on Cast\",2:\"\",3:\"§7Caught with Corrupted§r§7 Bait.\",4:\"\",5:\"§7Bring this to §fOdger §7at the\",6:\"§7top of the Blazing Volcano.\",7:\"\",8:\"§8§l* §8Soulbound §8§l*\",9:\"§f§lCOMMON TROPHY FISH\"],Name:\"§f§f§f§kObfuscated 1§r §l§8§LBRONZE\"},ExtraAttributes:{id:\"OBFUSCATED_FISH_1_BRONZE\"}}",
   "damage": 3,
   "lore": [
+    "§8Fishing Bait",
+    "§8Consumes on Cast",
+    "",
     "§7Caught with Corrupted§r§7 Bait.",
     "",
     "§7Bring this to §fOdger §7at the",
diff --git a/items/OBFUSCATED_FISH_1_DIAMOND.json b/items/OBFUSCATED_FISH_1_DIAMOND.json
index b5eaa945..32301b7a 100644
--- a/items/OBFUSCATED_FISH_1_DIAMOND.json
+++ b/items/OBFUSCATED_FISH_1_DIAMOND.json
@@ -1,9 +1,12 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§f§f§f§kObfuscated 1§r §l§B§LDIAMOND",
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"43d223d6-d53f-339c-b94a-be8dcdd9cd1b\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0MzgzMTU5NTA0MCwKICAicHJvZmlsZUlkIiA6ICIwZjczMDA3NjEyNGU0NGM3YWYxMTE1NDY5YzQ5OTY3OSIsCiAgInByb2ZpbGVOYW1lIiA6ICJPcmVfTWluZXIxMjMiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvY2FhMGI0YjRmNDQzMjU3ZTgzMTc2ZGY0ZmZkNTUwZGU3ZWU4OTg2N2U1MDZiOWMxY2E1M2YzMzYxMTMyNzkyOSIKICAgIH0KICB9Cn0\"}]}},display:{Lore:[0:\"§7Caught with Corrupted§r§7 Bait.\",1:\"\",2:\"§7Bring this to §fOdger §7at the\",3:\"§7top of the Blazing Volcano.\",4:\"\",5:\"§8§l* §8Soulbound §8§l*\",6:\"§f§lCOMMON TROPHY FISH\"],Name:\"§f§f§f§kObfuscated 1§r §l§B§LDIAMOND\"},ExtraAttributes:{id:\"OBFUSCATED_FISH_1_DIAMOND\"}}",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"43d223d6-d53f-339c-b94a-be8dcdd9cd1b\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0MzgzMTU5NTA0MCwKICAicHJvZmlsZUlkIiA6ICIwZjczMDA3NjEyNGU0NGM3YWYxMTE1NDY5YzQ5OTY3OSIsCiAgInByb2ZpbGVOYW1lIiA6ICJPcmVfTWluZXIxMjMiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvY2FhMGI0YjRmNDQzMjU3ZTgzMTc2ZGY0ZmZkNTUwZGU3ZWU4OTg2N2U1MDZiOWMxY2E1M2YzMzYxMTMyNzkyOSIKICAgIH0KICB9Cn0\"}]}},display:{Lore:[0:\"§8Fishing Bait\",1:\"§8Consumes on Cast\",2:\"\",3:\"§7Caught with Corrupted§r§7 Bait.\",4:\"\",5:\"§7Bring this to §fOdger §7at the\",6:\"§7top of the Blazing Volcano.\",7:\"\",8:\"§8§l* §8Soulbound §8§l*\",9:\"§f§lCOMMON TROPHY FISH\"],Name:\"§f§f§f§kObfuscated 1§r §l§B§LDIAMOND\"},ExtraAttributes:{id:\"OBFUSCATED_FISH_1_DIAMOND\"}}",
   "damage": 3,
   "lore": [
+    "§8Fishing Bait",
+    "§8Consumes on Cast",
+    "",
     "§7Caught with Corrupted§r§7 Bait.",
     "",
     "§7Bring this to §fOdger §7at the",
diff --git a/items/OBFUSCATED_FISH_1_GOLD.json b/items/OBFUSCATED_FISH_1_GOLD.json
index 0c43f6a2..d9c8e29f 100644
--- a/items/OBFUSCATED_FISH_1_GOLD.json
+++ b/items/OBFUSCATED_FISH_1_GOLD.json
@@ -1,9 +1,12 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§f§f§f§kObfuscated 1§r §l§6§LGOLD",
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"afa1d686-de82-3ed9-8ebc-db2c6af3f1da\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0MzgzMTYxMTY2MSwKICAicHJvZmlsZUlkIiA6ICJkMWY2OTc0YzE2ZmI0ZjdhYjI1NjU4NzExNjM3M2U2NSIsCiAgInByb2ZpbGVOYW1lIiA6ICJGaW9saWVzdGEiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOGEyYTQ0OTEzZWUxZDViYWJjMTcyZjM3NDM1MWVhN2FkMTUxNmNhMjU2ZDE2YTRlZjcyZDhhMDkyYjUxOWNkMSIKICAgIH0KICB9Cn0\"}]}},display:{Lore:[0:\"§7Caught with Corrupted§r§7 Bait.\",1:\"\",2:\"§7Bring this to §fOdger §7at the\",3:\"§7top of the Blazing Volcano.\",4:\"\",5:\"§8§l* §8Soulbound §8§l*\",6:\"§f§lCOMMON TROPHY FISH\"],Name:\"§f§f§f§kObfuscated 1§r §l§6§LGOLD\"},ExtraAttributes:{id:\"OBFUSCATED_FISH_1_GOLD\"}}",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"afa1d686-de82-3ed9-8ebc-db2c6af3f1da\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0MzgzMTYxMTY2MSwKICAicHJvZmlsZUlkIiA6ICJkMWY2OTc0YzE2ZmI0ZjdhYjI1NjU4NzExNjM3M2U2NSIsCiAgInByb2ZpbGVOYW1lIiA6ICJGaW9saWVzdGEiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOGEyYTQ0OTEzZWUxZDViYWJjMTcyZjM3NDM1MWVhN2FkMTUxNmNhMjU2ZDE2YTRlZjcyZDhhMDkyYjUxOWNkMSIKICAgIH0KICB9Cn0\"}]}},display:{Lore:[0:\"§8Fishing Bait\",1:\"§8Consumes on Cast\",2:\"\",3:\"§7Caught with Corrupted§r§7 Bait.\",4:\"\",5:\"§7Bring this to §fOdger §7at the\",6:\"§7top of the Blazing Volcano.\",7:\"\",8:\"§8§l* §8Soulbound §8§l*\",9:\"§f§lCOMMON TROPHY FISH\"],Name:\"§f§f§f§kObfuscated 1§r §l§6§LGOLD\"},ExtraAttributes:{id:\"OBFUSCATED_FISH_1_GOLD\"}}",
   "damage": 3,
   "lore": [
+    "§8Fishing Bait",
+    "§8Consumes on Cast",
+    "",
     "§7Caught with Corrupted§r§7 Bait.",
     "",
     "§7Bring this to §fOdger §7at the",
diff --git a/items/OBFUSCATED_FISH_1_SILVER.json b/items/OBFUSCATED_FISH_1_SILVER.json
index c638c193..d8d9f000 100644
--- a/items/OBFUSCATED_FISH_1_SILVER.json
+++ b/items/OBFUSCATED_FISH_1_SILVER.json
@@ -1,9 +1,12 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§f§f§f§kObfuscated 1§r §l§7§LSILVER",
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"e6a123b1-fcf0-32e9-bad2-c1d062d3638f\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0MzgzMTYzMTMxMiwKICAicHJvZmlsZUlkIiA6ICJjNTlkMDFlMDI4MWI0MGNhOTczNjc5ODc4NmRmN2FmNiIsCiAgInByb2ZpbGVOYW1lIiA6ICJvWm9va3hQYXJjY2VyIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzQ3OWI1MjM5MWZmMGNkM2M4M2RiMWMxYzIxOGEwMmFiMTNhMmM2YTRhYWExY2YxMjZjNzkxMmJkMzc3ZThmYmYiCiAgICB9CiAgfQp9\"}]}},display:{Lore:[0:\"§7Caught with Corrupted§r§7 bait.\",1:\"\",2:\"§7Bring this to §fOdger §7at the\",3:\"§7top of the Blazing Volcano.\",4:\"\",5:\"§8§l* §8Soulbound §8§l*\",6:\"§f§lCOMMON TROPHY FISH\"],Name:\"§f§f§f§kObfuscated 1§r §l§7§LSILVER\"},ExtraAttributes:{id:\"OBFUSCATED_FISH_1_SILVER\"}}",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"e6a123b1-fcf0-32e9-bad2-c1d062d3638f\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0MzgzMTYzMTMxMiwKICAicHJvZmlsZUlkIiA6ICJjNTlkMDFlMDI4MWI0MGNhOTczNjc5ODc4NmRmN2FmNiIsCiAgInByb2ZpbGVOYW1lIiA6ICJvWm9va3hQYXJjY2VyIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzQ3OWI1MjM5MWZmMGNkM2M4M2RiMWMxYzIxOGEwMmFiMTNhMmM2YTRhYWExY2YxMjZjNzkxMmJkMzc3ZThmYmYiCiAgICB9CiAgfQp9\"}]}},display:{Lore:[0:\"§8Fishing Bait\",1:\"§8Consumes on Cast\",2:\"\",3:\"§7Caught with Corrupted§r§7 bait.\",4:\"\",5:\"§7Bring this to §fOdger §7at the\",6:\"§7top of the Blazing Volcano.\",7:\"\",8:\"§8§l* §8Soulbound §8§l*\",9:\"§f§lCOMMON TROPHY FISH\"],Name:\"§f§f§f§kObfuscated 1§r §l§7§LSILVER\"},ExtraAttributes:{id:\"OBFUSCATED_FISH_1_SILVER\"}}",
   "damage": 3,
   "lore": [
+    "§8Fishing Bait",
+    "§8Consumes on Cast",
+    "",
     "§7Caught with Corrupted§r§7 bait.",
     "",
     "§7Bring this to §fOdger §7at the",
diff --git a/items/TURTLE;4.json b/items/TURTLE;4.json
index 607f114f..97629135 100644
--- a/items/TURTLE;4.json
+++ b/items/TURTLE;4.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§f§f§7[Lvl {LVL}] §6Turtle",
-  "nbttag": "{overrideMeta:1b,HideFlags:254,SkullOwner:{Id:\"f10d652b-906b-3065-adf5-9817983201ca\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjEyYjU4Yzg0MWIzOTQ4NjNkYmNjNTRkZTFjMmFkMjY0OGFmOGYwM2U2NDg5ODhjMWY5Y2VmMGJjMjBlZTIzYyJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Combat Pet\",1:\"\",2:\"§7Defense: §a{DEFENSE}\",3:\"§7Health: §a{HEALTH}\",4:\"\",5:\"§6Turtle Tactics\",6:\"§7§7Gain §a+{0}% §a❈ Defense\",7:\"\",8:\"§6Genius Amniote\",9:\"§7§7Grants §a+{1}❈ Defense §7for\",10:\"§7every player around you, up to 4\",11:\"§7nearby players.\",12:\"\",13:\"§6Unflippable\",14:\"§7§7Gain §aimmunity §7to knockback\",15:\"\",16:\"§7§eRight-click to add this pet to\",17:\"§eyour pet menu!\",18:\"\",19:\"§6§lLEGENDARY\"],Name:\"§f§f§7[Lvl {LVL}] §6Turtle\"},ExtraAttributes:{petInfo:\"{\\\"type\\\":\\\"TURTLE\\\",\\\"active\\\":false,\\\"exp\\\":0.0,\\\"tier\\\":\\\"LEGENDARY\\\",\\\"hideInfo\\\":false}\",id:\"TURTLE;4\"},AttributeModifiers:[]}",
+  "nbttag": "{overrideMeta:1b,HideFlags:254,SkullOwner:{Id:\"f10d652b-906b-3065-adf5-9817983201ca\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjEyYjU4Yzg0MWIzOTQ4NjNkYmNjNTRkZTFjMmFkMjY0OGFmOGYwM2U2NDg5ODhjMWY5Y2VmMGJjMjBlZTIzYyJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Combat Pet\",1:\"\",2:\"§7Defense: §a{DEFENSE}\",3:\"§7Health: §a{HEALTH}\",4:\"\",5:\"§6Turtle Tactics\",6:\"§7§7Gain §a+{0}% §a❈ Defense\",7:\"\",8:\"§6Genius Amniote\",9:\"§7§7Grants §a+{1}❈ Defense §7for\",10:\"§7every player around you, up to 4\",11:\"§7nearby players.\",12:\"\",13:\"§6Unflippable\",14:\"§7§7Gain §aimmunity §7to knockback\",15:\"\",16:\"§6Turtle Shell\",17:\"§7When under §c33% §7maximum HP,\",18:\"§7you take §a+{2}% §7less damage.\",19:\"\",20:\"§7§eRight-click to add this pet to\",21:\"§eyour pet menu!\",22:\"\",23:\"§6§lLEGENDARY\"],Name:\"§f§f§7[Lvl {LVL}] §6Turtle\"},ExtraAttributes:{petInfo:\"{\\\"type\\\":\\\"TURTLE\\\",\\\"active\\\":false,\\\"exp\\\":0.0,\\\"tier\\\":\\\"LEGENDARY\\\",\\\"hideInfo\\\":false}\",id:\"TURTLE;4\"},AttributeModifiers:[]}",
   "damage": 3,
   "lore": [
     "§8Combat Pet",
@@ -20,6 +20,10 @@
     "§6Unflippable",
     "§7§7Gain §aimmunity §7to knockback",
     "",
+    "§6Turtle Shell",
+    "§7When under §c33% §7maximum HP,",
+    "§7you take §a+{2}% §7less damage.",
+    "",
     "§7§eRight-click to add this pet to",
     "§eyour pet menu!",
     "",