Merge pull request #262 from TomEngMaster/master

pets fix

3 files changed, 17 insertions, 15 deletions

diff --git a/items/PIGMAN;3.json b/items/PIGMAN;3.json
index 10b6f70b..83912369 100644
--- a/items/PIGMAN;3.json
+++ b/items/PIGMAN;3.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§f§f§7[Lvl {LVL}] §5Pigman",
-  "nbttag": "{overrideMeta:1b,HideFlags:254,SkullOwner:{Id:\"fd837a44-d59d-3c1b-a4ac-6da86b08deb2\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNjNkOWNiNjUxM2YyMDcyZTVkNGU0MjZkNzBhNTU1N2JjMzk4NTU0Yzg4MGQ0ZTdiN2VjOGVmNDk0NWViMDJmMiJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Combat Pet\",1:\"\",2:\"§7Strength: §a{STRENGTH}\",3:\"§7Defense: §a{DEFENSE}\",4:\"\",5:\"§6PVP King\",6:\"§7§7Increases PVP damage by\",7:\"§7§a{0}%\",8:\"\",9:\"§6Pork Master\",10:\"§7§7Buffs the Pigman sword by\",11:\"§7§a{1} §c❁ Damage §7and §a{2}\",12:\"§a§c❁ Strength\",13:\"\",14:\"§7§eRight-click to add this pet to\",15:\"§eyour pet menu!\",16:\"\",17:\"§5§lEPIC\"],Name:\"§f§f§7[Lvl {LVL}] §5Pigman\"},ExtraAttributes:{petInfo:\"{\\\"type\\\":\\\"PIGMAN\\\",\\\"active\\\":false,\\\"exp\\\":1875919.3602048666,\\\"tier\\\":\\\"LEGENDARY\\\",\\\"hideInfo\\\":false}\",originTag:\"UNKNOWN\",id:\"PIGMAN;3\",uuid:\"d6b307d3-a30e-4abf-91d8-e8eaa0f033e0\",timestamp:\"07/04/20 02:00\"},AttributeModifiers:[]}",
+  "nbttag": "{overrideMeta:1b,HideFlags:254,SkullOwner:{Id:\"fd837a44-d59d-3c1b-a4ac-6da86b08deb2\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNjNkOWNiNjUxM2YyMDcyZTVkNGU0MjZkNzBhNTU1N2JjMzk4NTU0Yzg4MGQ0ZTdiN2VjOGVmNDk0NWViMDJmMiJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Combat Pet\",1:\"\",2:\"§7Strength: §a{STRENGTH}\",3:\"§7Defense: §a{DEFENSE}\",4:\"\",5:\"§6Bacon Farmer\",6:\"§7Pig minions work §a{0}%\",7:\"§7faster while on your island\",8:\"\",9:\"§6Pork Master\",10:\"§7§7Buffs the Pigman sword by\",11:\"§7§a{1} §c❁ Damage §7and §a{2}\",12:\"§a§c❁ Strength\",13:\"\",14:\"§7§eRight-click to add this pet to\",15:\"§eyour pet menu!\",16:\"\",17:\"§5§lEPIC\"],Name:\"§f§f§7[Lvl {LVL}] §5Pigman\"},ExtraAttributes:{petInfo:\"{\\\"type\\\":\\\"PIGMAN\\\",\\\"active\\\":false,\\\"exp\\\":1875919.3602048666,\\\"tier\\\":\\\"LEGENDARY\\\",\\\"hideInfo\\\":false}\",originTag:\"UNKNOWN\",id:\"PIGMAN;3\",uuid:\"d6b307d3-a30e-4abf-91d8-e8eaa0f033e0\",timestamp:\"07/04/20 02:00\"},AttributeModifiers:[]}",
   "damage": 3,
   "lore": [
     "§8Combat Pet",
@@ -9,9 +9,9 @@
     "§7Strength: §a{STRENGTH}",
     "§7Defense: §a{DEFENSE}",
     "",
-    "§6PVP King",
-    "§7§7Increases PVP damage by",
-    "§7§a{0}%",
+    "§6Bacon Farmer",
+    "§7Pig minions work §a{0}%",
+    "§7faster while on your island",
     "",
     "§6Pork Master",
     "§7§7Buffs the Pigman sword by",
@@ -25,7 +25,7 @@
   ],
   "internalname": "PIGMAN;3",
   "clickcommand": "viewrecipe",
-  "modver": "REL-1.0.0",
+  "modver": "1.2-REL",
   "recipe": {
     "A1": "ENCHANTED_GRILLED_PORK:1",
     "A2": "ENCHANTED_GRILLED_PORK:1",
diff --git a/items/PIGMAN;4.json b/items/PIGMAN;4.json
index f90b146b..f0279af1 100644
--- a/items/PIGMAN;4.json
+++ b/items/PIGMAN;4.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§f§f§7[Lvl {LVL}] §6Pigman",
-  "nbttag": "{overrideMeta:1b,HideFlags:254,SkullOwner:{Id:\"fd837a44-d59d-3c1b-a4ac-6da86b08deb2\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNjNkOWNiNjUxM2YyMDcyZTVkNGU0MjZkNzBhNTU1N2JjMzk4NTU0Yzg4MGQ0ZTdiN2VjOGVmNDk0NWViMDJmMiJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Combat Pet\",1:\"\",2:\"§7Strength: §a{STRENGTH}\",3:\"§7Defense: §a{DEFENSE}\",4:\"\",5:\"§6PVP King\",6:\"§7§7Increases PVP damage by\",7:\"§7§a{0}%\",8:\"\",9:\"§6Pork Master\",10:\"§7§7Buffs the Pigman sword by\",11:\"§7§a{1} §c❁ Damage §7and §a{2}\",12:\"§a§c❁ Strength\",13:\"\",14:\"§6Giant Slayer\",15:\"§7§7Deal §a{3}% §7extra damage to\",16:\"§7monsters level 100 and up\",17:\"\",18:\"§7§eRight-click to add this pet to\",19:\"§eyour pet menu!\",20:\"\",21:\"§6§lLEGENDARY\"],Name:\"§f§f§7[Lvl {LVL}] §6Pigman\"},ExtraAttributes:{petInfo:\"{\\\"type\\\":\\\"PIGMAN\\\",\\\"active\\\":false,\\\"exp\\\":1875919.3602048666,\\\"tier\\\":\\\"LEGENDARY\\\",\\\"hideInfo\\\":false}\",originTag:\"UNKNOWN\",id:\"PIGMAN;4\",uuid:\"d6b307d3-a30e-4abf-91d8-e8eaa0f033e0\",timestamp:\"07/04/20 02:00\"},AttributeModifiers:[]}",
+  "nbttag": "{overrideMeta:1b,HideFlags:254,SkullOwner:{Id:\"fd837a44-d59d-3c1b-a4ac-6da86b08deb2\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNjNkOWNiNjUxM2YyMDcyZTVkNGU0MjZkNzBhNTU1N2JjMzk4NTU0Yzg4MGQ0ZTdiN2VjOGVmNDk0NWViMDJmMiJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Combat Pet\",1:\"\",2:\"§7Strength: §a{STRENGTH}\",3:\"§7Defense: §a{DEFENSE}\",4:\"\",5:\"§6Bacon farmer\",6:\"§7Pig minions work §a{0}% \",7:\"§7faster while on your island\",8:\"\",9:\"§6Pork Master\",10:\"§7§7Buffs the Pigman sword by\",11:\"§7§a{1} §c❁ Damage §7and §a{2}\",12:\"§a§c❁ Strength\",13:\"\",14:\"§6Giant Slayer\",15:\"§7§7Deal §a{3}% §7extra damage to\",16:\"§7monsters level 100 and up\",17:\"\",18:\"§7§eRight-click to add this pet to\",19:\"§eyour pet menu!\",20:\"\",21:\"§6§lLEGENDARY\"],Name:\"§f§f§7[Lvl {LVL}] §6Pigman\"},ExtraAttributes:{petInfo:\"{\\\"type\\\":\\\"PIGMAN\\\",\\\"active\\\":false,\\\"exp\\\":1875919.3602048666,\\\"tier\\\":\\\"LEGENDARY\\\",\\\"hideInfo\\\":false}\",originTag:\"UNKNOWN\",id:\"PIGMAN;4\",uuid:\"d6b307d3-a30e-4abf-91d8-e8eaa0f033e0\",timestamp:\"07/04/20 02:00\"},AttributeModifiers:[]}",
   "damage": 3,
   "lore": [
     "§8Combat Pet",
@@ -9,9 +9,9 @@
     "§7Strength: §a{STRENGTH}",
     "§7Defense: §a{DEFENSE}",
     "",
-    "§6PVP King",
-    "§7§7Increases PVP damage by",
-    "§7§a{0}%",
+    "§6Bacon farmer",
+    "§7Pig minions work §a{0}% ",
+    "§7faster while on your island",
     "",
     "§6Pork Master",
     "§7§7Buffs the Pigman sword by",
@@ -29,7 +29,7 @@
   ],
   "internalname": "PIGMAN;4",
   "clickcommand": "viewrecipe",
-  "modver": "REL-1.0.0",
+  "modver": "1.2-REL",
   "recipe": {
     "A1": "ENCHANTED_GRILLED_PORK:1",
     "A2": "ENCHANTED_GRILLED_PORK:1",
diff --git a/items/WITHER_SKELETON;4.json b/items/WITHER_SKELETON;4.json
index d2ae6ff5..bbd056a5 100644
--- a/items/WITHER_SKELETON;4.json
+++ b/items/WITHER_SKELETON;4.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§f§f§7[Lvl {LVL}] §6Wither Skeleton",
-  "nbttag": "{overrideMeta:1b,HideFlags:254,SkullOwner:{Id:\"d928ce5e-e75e-3cdc-aaf1-0c93d49b5c31\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjVlYzk2NDY0NWE4ZWZhYzc2YmUyZjE2MGQ3Yzk5NTYzNjJmMzJiNjUxNzM5MGM1OWMzMDg1MDM0ZjA1MGNmZiJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Mining Pet\",1:\"\",2:\"§7Crit Damage: §a{CRIT_DAMAGE}\",3:\"§7Defense: §a{DEFENSE}\",4:\"§7Strength: §a{STRENGTH}\",5:\"§7Intelligence: §a{INTELLIGENCE}\",6:\"§7Crit Chance: §a{CRIT_CHANCE}\",7:\"\",8:\"§6Stronger Bones\",9:\"§7§7Take §a{0}% §7less damage from\",10:\"§7skeletons\",11:\"\",12:\"§6Wither Blood\",13:\"§7§7Deal §a{1}% §7more damage to\",14:\"§7wither mobs\",15:\"\",16:\"§6Coal Crazy\",17:\"§7§7Increases the chance to get\",18:\"§7double coal drops by §a{2}%\",19:\"\",20:\"§7§eRight-click to add this pet to\",21:\"§eyour pet menu!\",22:\"\",23:\"§6§lLEGENDARY\"],Name:\"§f§f§7[Lvl {LVL}] §6Wither Skeleton\"},ExtraAttributes:{petInfo:\"{\\\"type\\\":\\\"WITHER_SKELETON\\\",\\\"active\\\":false,\\\"exp\\\":69375.77400000505,\\\"tier\\\":\\\"LEGENDARY\\\",\\\"hideInfo\\\":false}\",originTag:\"UNKNOWN\",id:\"WITHER_SKELETON;4\",uuid:\"f7428128-8dca-460a-bc32-9e4d471cc380\",timestamp:\"4/6/20 12:23 PM\"},AttributeModifiers:[]}",
+  "nbttag": "{overrideMeta:1b,HideFlags:254,SkullOwner:{Id:\"d928ce5e-e75e-3cdc-aaf1-0c93d49b5c31\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjVlYzk2NDY0NWE4ZWZhYzc2YmUyZjE2MGQ3Yzk5NTYzNjJmMzJiNjUxNzM5MGM1OWMzMDg1MDM0ZjA1MGNmZiJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Mining Pet\",1:\"\",2:\"§7Crit Damage: §a{CRIT_DAMAGE}\",3:\"§7Defense: §a{DEFENSE}\",4:\"§7Strength: §a{STRENGTH}\",5:\"§7Intelligence: §a{INTELLIGENCE}\",6:\"§7Crit Chance: §a{CRIT_CHANCE}\",7:\"\",8:\"§6Stronger Bones\",9:\"§7§7Take §a{0}% §7less damage from\",10:\"§7skeletons\",11:\"\",12:\"§6Wither Blood\",13:\"§7§7Deal §a{1}% §7more damage to\",14:\"§7wither mobs\",15:\"\",16:\"§6Death\u0027s touch\",17:\"§7Upon hitting an enemy inflict \",18:\"§7the wither effect for §a{2}%\",19:\"§7damage over 3 seconds\",20:\"§8Does not stack\",21:\"\",22:\"§7§eRight-click to add this pet to\",23:\"§eyour pet menu!\",24:\"\",25:\"§6§lLEGENDARY\"],Name:\"§f§f§7[Lvl {LVL}] §6Wither Skeleton\"},ExtraAttributes:{petInfo:\"{\\\"type\\\":\\\"WITHER_SKELETON\\\",\\\"active\\\":false,\\\"exp\\\":69375.77400000505,\\\"tier\\\":\\\"LEGENDARY\\\",\\\"hideInfo\\\":false}\",originTag:\"UNKNOWN\",id:\"WITHER_SKELETON;4\",uuid:\"f7428128-8dca-460a-bc32-9e4d471cc380\",timestamp:\"4/6/20 12:23 PM\"},AttributeModifiers:[]}",
   "damage": 3,
   "lore": [
     "§8Mining Pet",
@@ -20,9 +20,11 @@
     "§7§7Deal §a{1}% §7more damage to",
     "§7wither mobs",
     "",
-    "§6Coal Crazy",
-    "§7§7Increases the chance to get",
-    "§7double coal drops by §a{2}%",
+    "§6Death\u0027s touch",
+    "§7Upon hitting an enemy inflict ",
+    "§7the wither effect for §a{2}%",
+    "§7damage over 3 seconds",
+    "§8Does not stack",
     "",
     "§7§eRight-click to add this pet to",
     "§eyour pet menu!",
@@ -31,7 +33,7 @@
   ],
   "internalname": "WITHER_SKELETON;4",
   "clickcommand": "viewrecipe",
-  "modver": "REL-1.0.0",
+  "modver": "1.2-REL",
   "recipe": {
     "A1": "ENCHANTED_COAL_BLOCK:1",
     "A2": "ENCHANTED_COAL_BLOCK:1",