From 7aaa36c096a4420cc97b72f8853da493ad2ceb4e Mon Sep 17 00:00:00 2001 From: colaman90 Date: Tue, 2 Feb 2021 23:01:30 +0100 Subject: [PATCH] Update to 1.16 --- META-INF/MANIFEST.MF | 2 ++ pom.xml | 8 +++---- .../me/shansen/EggCatcher/EggCatcher.java | 2 +- .../java/me/shansen/EggCatcher/EggType.java | 7 +++++- src/main/resources/config.yml | 22 ++++++++++++++++++- src/main/resources/plugin.yml | 11 +++++++--- 6 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 META-INF/MANIFEST.MF diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF new file mode 100644 index 0000000..59499bc --- /dev/null +++ b/META-INF/MANIFEST.MF @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + diff --git a/pom.xml b/pom.xml index 50cf701..7e3f7d0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ me.shansen EggCatcher - 1.0-SNAPSHOT + 1.1-BLOCKMINERS_RULES jar EggCatcher @@ -76,9 +76,9 @@ - org.bukkit - bukkit - 1.15.2-R0.1-SNAPSHOT + org.spigotmc + spigot-api + 1.16.5-R0.1-SNAPSHOT provided diff --git a/src/main/java/me/shansen/EggCatcher/EggCatcher.java b/src/main/java/me/shansen/EggCatcher/EggCatcher.java index 9cdfefb..b84d250 100644 --- a/src/main/java/me/shansen/EggCatcher/EggCatcher.java +++ b/src/main/java/me/shansen/EggCatcher/EggCatcher.java @@ -60,7 +60,7 @@ public class EggCatcher extends JavaPlugin { public void CheckConfigurationFile() { double configVersion = this.getConfig().getDouble("ConfigVersion", 0.0); - if (configVersion == 5.0) { + if (configVersion == 5.1) { this.saveConfig(); } else { this.saveResource("config.yml", true); diff --git a/src/main/java/me/shansen/EggCatcher/EggType.java b/src/main/java/me/shansen/EggCatcher/EggType.java index 05cb309..c352b8e 100644 --- a/src/main/java/me/shansen/EggCatcher/EggType.java +++ b/src/main/java/me/shansen/EggCatcher/EggType.java @@ -27,7 +27,7 @@ public enum EggType { EVOKER(EntityType.EVOKER,"Evoker", Material.EVOKER_SPAWN_EGG), VEX(EntityType.VEX, "Vex", Material.VEX_SPAWN_EGG), VINDICATOR(EntityType.VINDICATOR, "Vindicator", Material.VINDICATOR_SPAWN_EGG), - PIG_ZOMBIE(EntityType.PIG_ZOMBIE, "PigZombie", Material.ZOMBIE_PIGMAN_SPAWN_EGG), + PIG_ZOMBIE(EntityType.ZOMBIFIED_PIGLIN, "PigZombie", Material.ZOMBIFIED_PIGLIN_SPAWN_EGG), MAGMA_CUBE(EntityType.MAGMA_CUBE, "MagmaCube", Material.MAGMA_CUBE_SPAWN_EGG), CAVE_SPIDER(EntityType.CAVE_SPIDER, "CaveSpider", Material.CAVE_SPIDER_SPAWN_EGG), MUSHROOM_COW(EntityType.MUSHROOM_COW, "MushroomCow", Material.MOOSHROOM_SPAWN_EGG), @@ -81,6 +81,11 @@ public enum EggType { SALMON(EntityType.SALMON, "Salmon", Material.SALMON_SPAWN_EGG), TROPICAL_FISH(EntityType.TROPICAL_FISH, "TropicalFish", Material.TROPICAL_FISH_SPAWN_EGG), TURTLE(EntityType.TURTLE, "Turtle", Material.TURTLE_SPAWN_EGG), + HOGLIN(EntityType.HOGLIN, "Hoglin", Material.HOGLIN_SPAWN_EGG), + PIGLIN(EntityType.PIGLIN, "Piglin", Material.PIGLIN_SPAWN_EGG), + PIGLIN_BRUTE(EntityType.PIGLIN_BRUTE, "PiglinBrute", Material.PIGLIN_BRUTE_SPAWN_EGG), + STRIDER(EntityType.STRIDER, "Strider", Material.STRIDER_SPAWN_EGG), + ZOGLIN(EntityType.ZOGLIN, "Zoglin", Material.ZOGLIN_SPAWN_EGG), WANDERING_TRADER(EntityType.WANDERING_TRADER, "WanderingTrader", Material.WANDERING_TRADER_SPAWN_EGG); private final EntityType entityType; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index fc402cb..9ef7a49 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -35,6 +35,7 @@ CatchChance: Fox: 100.0 Ghast: 100.0 Guardian: 100.0 + Hoglin: 100.0 Horse: 100.0 Husk: 100.0 Llama: 100.0 @@ -46,6 +47,8 @@ CatchChance: Parrot: 100.0 Phantom: 100.0 Pig: 100.0 + Piglin: 100.0 + PiglinBrute: 100.0 PigZombie: 100.0 Pillager: 100.0 PolarBear: 100.0 @@ -59,6 +62,7 @@ CatchChance: Skeleton: 100.0 SkeletonHorse: 100.0 Slime: 100.0 + Strider: 100.0 Spider: 100.0 Squid: 100.0 Stray: 100.0 @@ -72,6 +76,7 @@ CatchChance: Witch: 100.0 WitherSkeleton: 100.0 Wolf: 100.0 + Zoglin: 100.0 Zombie: 100.0 ZombieHorse: 100.0 ZombieVillager: 100.0 @@ -95,6 +100,7 @@ VaultCost: Fox: 0.0 Ghast: 0.0 Guardian: 0.0 + Hoglin: 0.0 Horse: 0.0 Husk: 0.0 Llama: 0.0 @@ -106,6 +112,8 @@ VaultCost: Parrot: 0.0 Phantom: 0.0 Pig: 0.0 + Piglin: 0.0 + PiglinBrute: 0.0 PigZombie: 0.0 Pillager: 0.0 PolarBear: 0.0 @@ -122,6 +130,7 @@ VaultCost: Spider: 0.0 Squid: 0.0 Stray: 0.0 + Strider: 0.0 TraderLlama: 0.0 TropicalFish: 0.0 Turtle: 0.0 @@ -132,6 +141,7 @@ VaultCost: Witch: 0.0 WitherSkeleton: 0.0 Wolf: 0.0 + Zoglin: 0.0 Zombie: 0.0 ZombieHorse: 0.0 ZombieVillager: 0.0 @@ -158,6 +168,7 @@ ItemCost: Fox: 0.0 Ghast: 0.0 Guardian: 0.0 + Hoglin: 0.0 Horse: 0.0 Husk: 0.0 Llama: 0.0 @@ -169,6 +180,8 @@ ItemCost: Parrot: 0.0 Phantom: 0.0 Pig: 0.0 + Piglin: 0.0 + PiglinBrute: 0.0 PigZombie: 0.0 Pillager: 0.0 PolarBear: 0.0 @@ -185,6 +198,7 @@ ItemCost: Spider: 0.0 Squid: 0.0 Stray: 0.0 + Strider: 0.0 TraderLlama: 0.0 TropicalFish: 0.0 Turtle: 0.0 @@ -195,6 +209,7 @@ ItemCost: Witch: 0.0 WitherSkeleton: 0.0 Wolf: 0.0 + Zoglin: 0.0 Zombie: 0.0 ZombieHorse: 0.0 ZombieVillager: 0.0 @@ -218,6 +233,7 @@ HealthPercentage: Fox: 100.0 Ghast: 100.0 Guardian: 100.0 + Hoglin: 100.0 Horse: 100.0 Husk: 100.0 Llama: 100.0 @@ -229,6 +245,8 @@ HealthPercentage: Parrot: 100.0 Phantom: 100.0 Pig: 100.0 + Piglin: 100.0 + PiglinBrute: 100.0 PigZombie: 100.0 Pillager: 100.0 PolarBear: 100.0 @@ -245,6 +263,7 @@ HealthPercentage: Spider: 100.0 Squid: 100.0 Stray: 100.0 + Strider: 100.0 TraderLlama: 100.0 TropicalFish: 100.0 Turtle: 100.0 @@ -255,6 +274,7 @@ HealthPercentage: Witch: 100.0 WitherSkeleton: 100.0 Wolf: 100.0 + Zoglin: 100.0 Zombie: 100.0 ZombieHorse: 100.0 ZombieVillager: 100.0 @@ -267,4 +287,4 @@ Messages: CatchChanceFail: "You failed to catch this mob!" CatchChanceSuccess: "" HealthPercentageFail: "The mob has more than %s percent health left and cannot be caught!" -ConfigVersion: 5.0 +ConfigVersion: 5.1 diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 75218e5..8f47c8f 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,8 +1,8 @@ name: EggCatcher -version: 5.0 +version: 5.1 description: This plugin allows you to catch mobs in eggs. -author: shansen -api-version: 1.15 +author: Blockminers +api-version: 1.16 main: me.shansen.EggCatcher.EggCatcher @@ -30,6 +30,7 @@ permissions: eggcatcher.catch.fox: true eggcatcher.catch.ghast: true eggcatcher.catch.guardian: true + eggcatcher.catch.hoglin: true eggcatcher.catch.horse: true eggcatcher.catch.husk: true eggcatcher.catch.llama: true @@ -41,6 +42,8 @@ permissions: eggcatcher.catch.parrot: true eggcatcher.catch.phantom: true eggcatcher.catch.pig: true + eggcatcher.catch.piglin: true + eggcatcher.catch.piglinbrute: true eggcatcher.catch.pigzombie: true eggcatcher.catch.pillager: true eggcatcher.catch.polarbear: true @@ -57,6 +60,7 @@ permissions: eggcatcher.catch.spider: true eggcatcher.catch.squid: true eggcatcher.catch.stray: true + eggcatcher.catch.strider: true eggcatcher.catch.traderllama: true eggcatcher.catch.tropicalfish: true eggcatcher.catch.turtle: true @@ -67,6 +71,7 @@ permissions: eggcatcher.catch.witch: true eggcatcher.catch.witherskeleton: true eggcatcher.catch.wolf: true + eggcatcher.catch.zoglin: true eggcatcher.catch.zombie: true eggcatcher.catch.zombiehorse: true eggcatcher.catch.zombievillager: true