Fixes (#699)

* Added Frozen Blaze Pet Skin

* uuid and timestamp away

* Fixed the things from discord

8 files changed, 57 insertions, 25 deletions

diff --git a/items/ARMOR_OF_THE_RESISTANCE_BOOTS.json b/items/ARMOR_OF_THE_RESISTANCE_BOOTS.json
index 14cf96d8..d2a614e8 100644
--- a/items/ARMOR_OF_THE_RESISTANCE_BOOTS.json
+++ b/items/ARMOR_OF_THE_RESISTANCE_BOOTS.json
@@ -1,11 +1,11 @@
 {
   "itemid": "minecraft:leather_boots",
   "displayname": "§5Boots of the Rising Sun",
-  "nbttag": "{Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Health: §a+15\",1:\"§7Defense: §a+15\",2:\"§7Intelligence: §a+150\",3:\"\",4:\"§6Full Set Bonus: Power of the Resistance\",5:\"§7Provides a damage bonus while\",6:\"§7fighting against Dante, and\",7:\"§7reduces damage taken from Dante.\",8:\"\",9:\"§7§8This item can be reforged!\",10:\"§5§lEPIC BOOTS\"],color:10454537,Name:\"§5Boots of the Rising Sun\"},ExtraAttributes:{color:\"159:134:9\",leaderVotes:0,leaderPosition:0,originTag:\"REWARD_SERAPHINE:ARMOR_OF_THE_RESISTANCE_BOOTS\",id:\"ARMOR_OF_THE_RESISTANCE_BOOTS\"}}",
+  "nbttag": "{Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Health: §a+8\",1:\"§7Defense: §a+8\",2:\"§7Intelligence: §a+150\",3:\"\",4:\"§6Full Set Bonus: Power of the Resistance\",5:\"§7Provides a damage bonus while\",6:\"§7fighting against Dante, and\",7:\"§7reduces damage taken from Dante.\",8:\"\",9:\"§7§8This item can be reforged!\",10:\"§5§lEPIC BOOTS\"],color:10454537,Name:\"§5Boots of the Rising Sun\"},ExtraAttributes:{color:\"159:134:9\",leaderVotes:0,leaderPosition:0,originTag:\"REWARD_SERAPHINE:ARMOR_OF_THE_RESISTANCE_BOOTS\",id:\"ARMOR_OF_THE_RESISTANCE_BOOTS\"}}",
   "damage": 0,
   "lore": [
-    "§7Health: §a+15",
-    "§7Defense: §a+15",
+    "§7Health: §a+8",
+    "§7Defense: §a+8",
     "§7Intelligence: §a+150",
     "",
     "§6Full Set Bonus: Power of the Resistance",
@@ -19,7 +19,7 @@
   "internalname": "ARMOR_OF_THE_RESISTANCE_BOOTS",
   "crafttext": "",
   "clickcommand": "",
-  "modver": "2.0.0-REL",
+  "modver": "2.1.0-REL",
   "infoType": "WIKI_URL",
   "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Armor_of_the_Rising_Sun"
diff --git a/items/ARMOR_OF_THE_RESISTANCE_CHESTPLATE.json b/items/ARMOR_OF_THE_RESISTANCE_CHESTPLATE.json
index 8942d004..05a4f108 100644
--- a/items/ARMOR_OF_THE_RESISTANCE_CHESTPLATE.json
+++ b/items/ARMOR_OF_THE_RESISTANCE_CHESTPLATE.json
@@ -1,11 +1,11 @@
 {
   "itemid": "minecraft:golden_chestplate",
   "displayname": "§5Chestplate of the Rising Sun",
-  "nbttag": "{Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Health: §a+30\",1:\"§7Defense: §a+30\",2:\"§7Intelligence: §a+150\",3:\"\",4:\"§6Full Set Bonus: Power of the Resistance\",5:\"§7Provides a damage bonus while\",6:\"§7fighting against Dante, and\",7:\"§7reduces damage taken from Dante.\",8:\"\",9:\"§7§8This item can be reforged!\",10:\"§5§lEPIC CHESTPLATE\"],Name:\"§5Chestplate of the Rising Sun\"},ExtraAttributes:{leaderVotes:0,leaderPosition:0,originTag:\"REWARD_SERAPHINE:ARMOR_OF_THE_RESISTANCE_CHESTPLATE\",id:\"ARMOR_OF_THE_RESISTANCE_CHESTPLATE\"}}",
+  "nbttag": "{Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Health: §a+15\",1:\"§7Defense: §a+15\",2:\"§7Intelligence: §a+150\",3:\"\",4:\"§6Full Set Bonus: Power of the Resistance\",5:\"§7Provides a damage bonus while\",6:\"§7fighting against Dante, and\",7:\"§7reduces damage taken from Dante.\",8:\"\",9:\"§7§8This item can be reforged!\",10:\"§5§lEPIC CHESTPLATE\"],Name:\"§5Chestplate of the Rising Sun\"},ExtraAttributes:{leaderVotes:0,leaderPosition:0,originTag:\"REWARD_SERAPHINE:ARMOR_OF_THE_RESISTANCE_CHESTPLATE\",id:\"ARMOR_OF_THE_RESISTANCE_CHESTPLATE\"}}",
   "damage": 0,
   "lore": [
-    "§7Health: §a+30",
-    "§7Defense: §a+30",
+    "§7Health: §a+15",
+    "§7Defense: §a+15",
     "§7Intelligence: §a+150",
     "",
     "§6Full Set Bonus: Power of the Resistance",
@@ -19,7 +19,7 @@
   "internalname": "ARMOR_OF_THE_RESISTANCE_CHESTPLATE",
   "crafttext": "",
   "clickcommand": "",
-  "modver": "2.0.0-REL",
+  "modver": "2.1.0-REL",
   "infoType": "WIKI_URL",
   "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Armor_of_the_Rising_Sun"
diff --git a/items/ARMOR_OF_THE_RESISTANCE_HELMET.json b/items/ARMOR_OF_THE_RESISTANCE_HELMET.json
index 586ee8b9..4b059772 100644
--- a/items/ARMOR_OF_THE_RESISTANCE_HELMET.json
+++ b/items/ARMOR_OF_THE_RESISTANCE_HELMET.json
@@ -1,11 +1,11 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§5Helmet of the Rising Sun",
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"1a136205-4ff3-3028-bb5b-c2ef8a047399\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYxODIzMzEwNTIyOSwKICAicHJvZmlsZUlkIiA6ICIzYTNmNzhkZmExZjQ0OTllYjE5NjlmYzlkOTEwZGYwYyIsCiAgInByb2ZpbGVOYW1lIiA6ICJOb19jcmVyYXIiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzRjZjNjNWYyNGM5YmY4YjkwMzFlOGFlZDUzMzdiNmEwN2Y4MTljZGU4YzYyMjA4NTU0NTE2MmY4YTY5MzA2MCIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9\"}]}},display:{Lore:[0:\"§7Health: §a+20\",1:\"§7Defense: §a+20\",2:\"§7Intelligence: §a+150\",3:\"\",4:\"§6Full Set Bonus: Power of the Resistance\",5:\"§7Provides a damage bonus while\",6:\"§7fighting against Dante, and\",7:\"§7reduces damage taken from Dante.\",8:\"\",9:\"§7§8This item can be reforged!\",10:\"§5§lEPIC HELMET\"],Name:\"§5Helmet of the Rising Sun\"},ExtraAttributes:{leaderVotes:0,leaderPosition:0,originTag:\"REWARD_SERAPHINE:ARMOR_OF_THE_RESISTANCE_HELMET\",id:\"ARMOR_OF_THE_RESISTANCE_HELMET\"}}",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"1a136205-4ff3-3028-bb5b-c2ef8a047399\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYxODIzMzEwNTIyOSwKICAicHJvZmlsZUlkIiA6ICIzYTNmNzhkZmExZjQ0OTllYjE5NjlmYzlkOTEwZGYwYyIsCiAgInByb2ZpbGVOYW1lIiA6ICJOb19jcmVyYXIiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzRjZjNjNWYyNGM5YmY4YjkwMzFlOGFlZDUzMzdiNmEwN2Y4MTljZGU4YzYyMjA4NTU0NTE2MmY4YTY5MzA2MCIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9\"}]}},display:{Lore:[0:\"§7Health: §a+10\",1:\"§7Defense: §a+10\",2:\"§7Intelligence: §a+150\",3:\"\",4:\"§6Full Set Bonus: Power of the Resistance\",5:\"§7Provides a damage bonus while\",6:\"§7fighting against Dante, and\",7:\"§7reduces damage taken from Dante.\",8:\"\",9:\"§7§8This item can be reforged!\",10:\"§5§lEPIC HELMET\"],Name:\"§5Helmet of the Rising Sun\"},ExtraAttributes:{leaderVotes:0,leaderPosition:0,originTag:\"REWARD_SERAPHINE:ARMOR_OF_THE_RESISTANCE_HELMET\",id:\"ARMOR_OF_THE_RESISTANCE_HELMET\"}}",
   "damage": 3,
   "lore": [
-    "§7Health: §a+20",
-    "§7Defense: §a+20",
+    "§7Health: §a+10",
+    "§7Defense: §a+10",
     "§7Intelligence: §a+150",
     "",
     "§6Full Set Bonus: Power of the Resistance",
@@ -19,7 +19,7 @@
   "internalname": "ARMOR_OF_THE_RESISTANCE_HELMET",
   "crafttext": "",
   "clickcommand": "",
-  "modver": "2.0.0-REL",
+  "modver": "2.1.0-REL",
   "infoType": "WIKI_URL",
   "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Armor_of_the_Rising_Sun"
diff --git a/items/ARMOR_OF_THE_RESISTANCE_LEGGINGS.json b/items/ARMOR_OF_THE_RESISTANCE_LEGGINGS.json
index 34c2a252..3d64b532 100644
--- a/items/ARMOR_OF_THE_RESISTANCE_LEGGINGS.json
+++ b/items/ARMOR_OF_THE_RESISTANCE_LEGGINGS.json
@@ -1,11 +1,11 @@
 {
   "itemid": "minecraft:leather_leggings",
   "displayname": "§5Leggings of the Rising Sun",
-  "nbttag": "{Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Health: §a+25\",1:\"§7Defense: §a+25\",2:\"§7Intelligence: §a+150\",3:\"\",4:\"§6Full Set Bonus: Power of the Resistance\",5:\"§7Provides a damage bonus while\",6:\"§7fighting against Dante, and\",7:\"§7reduces damage taken from Dante.\",8:\"\",9:\"§7§8This item can be reforged!\",10:\"§5§lEPIC LEGGINGS\"],color:14597141,Name:\"§5Leggings of the Rising Sun\"},ExtraAttributes:{color:\"222:188:21\",leaderVotes:0,leaderPosition:0,originTag:\"REWARD_SERAPHINE:ARMOR_OF_THE_RESISTANCE_LEGGINGS\",id:\"ARMOR_OF_THE_RESISTANCE_LEGGINGS\"}}",
+  "nbttag": "{Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Health: §a+12\",1:\"§7Defense: §a+12\",2:\"§7Intelligence: §a+150\",3:\"\",4:\"§6Full Set Bonus: Power of the Resistance\",5:\"§7Provides a damage bonus while\",6:\"§7fighting against Dante, and\",7:\"§7reduces damage taken from Dante.\",8:\"\",9:\"§7§8This item can be reforged!\",10:\"§5§lEPIC LEGGINGS\"],color:14597141,Name:\"§5Leggings of the Rising Sun\"},ExtraAttributes:{color:\"222:188:21\",leaderVotes:0,leaderPosition:0,originTag:\"REWARD_SERAPHINE:ARMOR_OF_THE_RESISTANCE_LEGGINGS\",id:\"ARMOR_OF_THE_RESISTANCE_LEGGINGS\"}}",
   "damage": 0,
   "lore": [
-    "§7Health: §a+25",
-    "§7Defense: §a+25",
+    "§7Health: §a+12",
+    "§7Defense: §a+12",
     "§7Intelligence: §a+150",
     "",
     "§6Full Set Bonus: Power of the Resistance",
@@ -19,7 +19,7 @@
   "internalname": "ARMOR_OF_THE_RESISTANCE_LEGGINGS",
   "crafttext": "",
   "clickcommand": "",
-  "modver": "2.0.0-REL",
+  "modver": "2.1.0-REL",
   "infoType": "WIKI_URL",
   "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Armor_of_the_Rising_Sun"
diff --git a/items/FIRE_PROTECTION;2.json b/items/FIRE_PROTECTION;2.json
index b7c7fcd6..fdc76345 100644
--- a/items/FIRE_PROTECTION;2.json
+++ b/items/FIRE_PROTECTION;2.json
@@ -1,11 +1,11 @@
 {
   "itemid": "minecraft:enchanted_book",
   "displayname": "§fEnchanted Book",
-  "nbttag": "{ench:[],HideFlags:254,display:{Lore:[0:\"§9Fire Protection II\",1:\"§7Grants §a+§f14❂ True Defense\",2:\"§a§7against fire and lava.\",3:\"\",4:\"§7Use this on an item in an Anvil\",5:\"§7to apply it!\",6:\"\",7:\"§6Source:\",8:\"§aI-V: §7Enchantment Table,\",9:\"§7Magma Cream Collection\",10:\"\",11:\"§6Applied To:\",12:\"§7- §fArmor\",13:\"\",14:\"§6Conflicts:\",15:\"§7- §cBlast Protection\",16:\"§7- §cProtection\",17:\"§7- §cProjectile Protection\",18:\"\",19:\"§f§lCOMMON\"],Name:\"§fEnchanted Book\"},ExtraAttributes:{id:\"FIRE_PROTECTION;2\",enchantments:{fire_protection:2}}}",
+  "nbttag": "{ench:[],HideFlags:254,display:{Lore:[0:\"§9Fire Protection II\",1:\"§7Grants §a+§f4❂ True Defense\",2:\"§a§7against fire and lava.\",3:\"\",4:\"§7Use this on an item in an Anvil\",5:\"§7to apply it!\",6:\"\",7:\"§6Source:\",8:\"§aI-V: §7Enchantment Table,\",9:\"§7Magma Cream Collection\",10:\"\",11:\"§6Applied To:\",12:\"§7- §fArmor\",13:\"\",14:\"§6Conflicts:\",15:\"§7- §cBlast Protection\",16:\"§7- §cProtection\",17:\"§7- §cProjectile Protection\",18:\"\",19:\"§f§lCOMMON\"],Name:\"§fEnchanted Book\"},ExtraAttributes:{id:\"FIRE_PROTECTION;2\",enchantments:{fire_protection:2}}}",
   "damage": 0,
   "lore": [
     "§9Fire Protection II",
-    "§7Grants §a+§f14❂ True Defense",
+    "§7Grants §a+§f4❂ True Defense",
     "§a§7against fire and lava.",
     "",
     "§7Use this on an item in an Anvil",
@@ -29,6 +29,6 @@
   "parent": "FIRE_PROTECTION;4",
   "crafttext": "",
   "clickcommand": "",
-  "modver": "2.0.0-REL",
+  "modver": "2.1.0-REL",
   "infoType": ""
-}
+}
\ No newline at end of file
diff --git a/items/FIRE_PROTECTION;3.json b/items/FIRE_PROTECTION;3.json
index 776d4b8a..74f9e14c 100644
--- a/items/FIRE_PROTECTION;3.json
+++ b/items/FIRE_PROTECTION;3.json
@@ -1,11 +1,11 @@
 {
   "itemid": "minecraft:enchanted_book",
   "displayname": "§fEnchanted Book",
-  "nbttag": "{ench:[],HideFlags:254,display:{Lore:[0:\"§9Fire Protection III\",1:\"§7Grants §a+§f16❂ True Defense\",2:\"§a§7against fire and lava.\",3:\"\",4:\"§7Use this on an item in an Anvil\",5:\"§7to apply it!\",6:\"\",7:\"§6Source:\",8:\"§aI-V: §7Enchantment Table,\",9:\"§7Magma Cream Collection\",10:\"\",11:\"§6Applied To:\",12:\"§7- §fArmor\",13:\"\",14:\"§6Conflicts:\",15:\"§7- §cBlast Protection\",16:\"§7- §cProtection\",17:\"§7- §cProjectile Protection\",18:\"\",19:\"§f§lCOMMON\"],Name:\"§fEnchanted Book\"},ExtraAttributes:{id:\"FIRE_PROTECTION;3\",enchantments:{fire_protection:3}}}",
+  "nbttag": "{ench:[],HideFlags:254,display:{Lore:[0:\"§9Fire Protection III\",1:\"§7Grants §a+§f6❂ True Defense\",2:\"§a§7against fire and lava.\",3:\"\",4:\"§7Use this on an item in an Anvil\",5:\"§7to apply it!\",6:\"\",7:\"§6Source:\",8:\"§aI-V: §7Enchantment Table,\",9:\"§7Magma Cream Collection\",10:\"\",11:\"§6Applied To:\",12:\"§7- §fArmor\",13:\"\",14:\"§6Conflicts:\",15:\"§7- §cBlast Protection\",16:\"§7- §cProtection\",17:\"§7- §cProjectile Protection\",18:\"\",19:\"§f§lCOMMON\"],Name:\"§fEnchanted Book\"},ExtraAttributes:{id:\"FIRE_PROTECTION;3\",enchantments:{fire_protection:3}}}",
   "damage": 0,
   "lore": [
     "§9Fire Protection III",
-    "§7Grants §a+§f16❂ True Defense",
+    "§7Grants §a+§f6❂ True Defense",
     "§a§7against fire and lava.",
     "",
     "§7Use this on an item in an Anvil",
@@ -29,6 +29,6 @@
   "parent": "FIRE_PROTECTION;4",
   "crafttext": "",
   "clickcommand": "",
-  "modver": "2.0.0-REL",
+  "modver": "2.1.0-REL",
   "infoType": ""
-}
+}
\ No newline at end of file
diff --git a/items/NETHER_WARTS_GENERATOR_1.json b/items/NETHER_WARTS_GENERATOR_1.json
index d8ae6066..3c76c9dd 100644
--- a/items/NETHER_WARTS_GENERATOR_1.json
+++ b/items/NETHER_WARTS_GENERATOR_1.json
@@ -19,7 +19,7 @@
     "A2": "NETHER_STALK:10",
     "A3": "NETHER_STALK:10",
     "B1": "NETHER_STALK:10",
-    "B2": "WOOD_PICKAXE:1",
+    "B2": "WOOD_HOE:1",
     "B3": "NETHER_STALK:10",
     "C1": "NETHER_STALK:10",
     "C2": "NETHER_STALK:10",
diff --git a/items/PET_SKIN_BLAZE_FROZEN.json b/items/PET_SKIN_BLAZE_FROZEN.json
new file mode 100644
index 00000000..33d06a99
--- /dev/null
+++ b/items/PET_SKIN_BLAZE_FROZEN.json
@@ -0,0 +1,32 @@
+{
+  "itemid": "minecraft:skull",
+  "displayname": "§dFrozen Blaze Skin",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"c142988e-3a90-35ef-9fa6-a7c1ab3cfa8c\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYzOTI4ODk2NjczMiwKICAicHJvZmlsZUlkIiA6ICIyMWUzNjdkNzI1Y2Y0ZTNiYjI2OTJjNGEzMDBhNGRlYiIsCiAgInByb2ZpbGVOYW1lIiA6ICJHZXlzZXJNQyIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS85NjE3YTM0YzhmZjQ2N2ZkYjQ1YmUzZmYxNzg2M2ZjZmY3ZTg0MjRjOGRkOWI5OTY2NmVkZDEzYjQ0YjMyZThjIgogICAgfQogIH0KfQ\"}]}},display:{Lore:[0:\"§8Consumed on use\",1:\"\",2:\"§7§7Pet skins change the look and\",3:\"§7particle trail of your pet but\",4:\"§7only one skin can be active at a\",5:\"§7time!\",6:\"\",7:\"§7§7This skin can only be applied\",8:\"§7to Blaze pets.\",9:\"\",10:\"§dThis skin is animated!\",11:\"\",12:\"§7§eRight click on your pet to\",13:\"§eapply this skin!\",14:\"\",15:\"§d§lMYTHIC COSMETIC\"],Name:\"§dFrozen Blaze Skin\"},ExtraAttributes:{originTag:\"FIRE_SALE\",id:\"PET_SKIN_BLAZE_FROZEN\"}}",
+  "damage": 3,
+  "lore": [
+    "§8Consumed on use",
+    "",
+    "§7§7Pet skins change the look and",
+    "§7particle trail of your pet but",
+    "§7only one skin can be active at a",
+    "§7time!",
+    "",
+    "§7§7This skin can only be applied",
+    "§7to Blaze pets.",
+    "",
+    "§dThis skin is animated!",
+    "",
+    "§7§eRight click on your pet to",
+    "§eapply this skin!",
+    "",
+    "§d§lMYTHIC COSMETIC"
+  ],
+  "internalname": "PET_SKIN_BLAZE_FROZEN",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "2.1.0-REL",
+  "infoType": "WIKI_URL",
+  "info": [
+    "https://hypixel-skyblock.fandom.com/wiki/Fire_Sale"
+  ]
+}