From 5726c09913298548dc260068ed37ea12b768c92d Mon Sep 17 00:00:00 2001 From: colaman90 Date: Sun, 8 Sep 2024 10:10:25 +0200 Subject: [PATCH] Update to 1.20.6 Added Armadillo and changed default Config to Blockminers Config for future Changes. --- pom.xml | 4 +- .../minecraftheads/EggCatcher/EggCatcher.java | 8 +- .../minecraftheads/EggCatcher/EggType.java | 5 +- src/main/resources/config.yml | 635 +++++++++--------- src/main/resources/plugin.yml | 6 +- 5 files changed, 334 insertions(+), 324 deletions(-) diff --git a/pom.xml b/pom.xml index 1262332..8199cb5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.minecraftheads EggCatcher - 1.6 + 1.7 jar EggCatcher @@ -65,7 +65,7 @@ org.spigotmc spigot-api - 1.20.1-R0.1-SNAPSHOT + 1.20.6-R0.1-SNAPSHOT provided diff --git a/src/main/java/com/minecraftheads/EggCatcher/EggCatcher.java b/src/main/java/com/minecraftheads/EggCatcher/EggCatcher.java index 87f741b..df340e4 100644 --- a/src/main/java/com/minecraftheads/EggCatcher/EggCatcher.java +++ b/src/main/java/com/minecraftheads/EggCatcher/EggCatcher.java @@ -43,12 +43,12 @@ public void onEnable() { public void CheckConfigurationFile() { double configVersion = this.getConfig().getDouble("ConfigVersion", 0.0D); - if (configVersion < 6.0D) { + if (configVersion < 6.2D) { this.MigrateConfigFile(); this.saveConfig(); this.reloadConfig(); } else { - if (configVersion == 6.0D) { + if (configVersion == 6.3D) { this.saveConfig(); } else { this.saveResource("config.yml", true); @@ -61,7 +61,7 @@ public void CheckConfigurationFile() { public boolean MigrateConfigFile() { String[] keysWithBoolValue = new String[]{"UsePermissions", "UseCatchChance", "LooseEggOnFail", "UseVaultCost", "UseItemCost", "UseHealthPercentage", "ExplosionEffect", "SmokeEffect", "NonPlayerCatching", "PreventCatchingBabyAnimals", "PreventCatchingTamedAnimals", "PreventCatchingShearedSheeps", "SpawnChickenOnSuccess", "SpawnChickenOnFail", "DeleteVillagerInventoryOnCatch", "LogEggCaptures", "setPersistence"}; String[] keysWithStringValue = new String[]{"VaultTargetBankAccount"}; - String[] entitiesInConfig = new String[]{"Axolotl", "Bat", "Bee", "Blaze", "Cat", "CaveSpider", "Chicken", "Cod", "Cow", "Creeper", "Dolphin", "Donkey", "Drowned", "ElderGuardian", "Enderman", "Endermite", "Evoker", "Fox", "Ghast", "GlowSquid", "Goat", "Guardian", "Hoglin", "Horse", "Husk", "Llama", "MagmaCube", "Mule", "MushroomCow", "Ocelot", "Panda", "Parrot", "Phantom", "Pig", "Piglin", "PiglinBrute", "PigZombie", "Pillager", "PolarBear", "Pufferfish", "Rabbit", "Ravager", "Salmon", "Sheep", "Shulker", "Silverfish", "Skeleton", "SkeletonHorse", "Slime", "Spider", "Squid", "Stray", "Strider", "TraderLlama", "TropicalFish", "Turtle", "Vex", "Villager", "Vindicator", "WanderingTrader", "Witch", "WitherSkeleton", "Wolf", "Zoglin", "Zombie", "ZombieHorse", "ZombieVillager", "ZombifiedPiglin"}; + String[] entitiesInConfig = new String[]{"Axolotl", "Bat", "Bee", "Blaze", "Cat", "Camel", "CaveSpider", "Chicken", "Cod", "Cow", "Creeper", "Dolphin", "Donkey", "Drowned", "ElderGuardian", "Enderman", "Endermite", "Evoker", "Fox", "Ghast", "GlowSquid", "Goat", "Guardian", "Hoglin", "Horse", "Husk", "Llama", "MagmaCube", "Mule", "MushroomCow", "Ocelot", "Panda", "Parrot", "Phantom", "Pig", "Piglin", "PiglinBrute", "PigZombie", "Pillager", "PolarBear", "Pufferfish", "Rabbit", "Ravager", "Salmon", "Sheep", "Shulker", "Silverfish", "Skeleton", "SkeletonHorse", "Slime", "Sniffer", "Spider", "Squid", "Stray", "Strider", "TraderLlama", "TropicalFish", "Turtle", "Vex", "Villager", "Vindicator", "WanderingTrader", "Witch", "WitherSkeleton", "Wolf", "Zoglin", "Zombie", "ZombieHorse", "ZombieVillager", "ZombifiedPiglin"}; FileConfiguration config = this.getConfig(); HashMap entityList = new HashMap(); String[] var6 = keysWithBoolValue; @@ -99,7 +99,7 @@ public boolean MigrateConfigFile() { } config.set("Entity", entityList); - config.set("ConfigVersion", 6.0D); + config.set("ConfigVersion", 6.3D); config.set("VaultCost", (Object)null); config.set("HealthPercentage", (Object)null); config.set("CatchChance", (Object)null); diff --git a/src/main/java/com/minecraftheads/EggCatcher/EggType.java b/src/main/java/com/minecraftheads/EggCatcher/EggType.java index 2c3a13b..a300757 100644 --- a/src/main/java/com/minecraftheads/EggCatcher/EggType.java +++ b/src/main/java/com/minecraftheads/EggCatcher/EggType.java @@ -12,7 +12,7 @@ public enum EggType { 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), + MOOSHROOM(EntityType.MOOSHROOM, "Mooshroom", Material.MOOSHROOM_SPAWN_EGG), CREEPER(EntityType.CREEPER, "Creeper", Material.CREEPER_SPAWN_EGG), WITHER_SKELETON(EntityType.WITHER_SKELETON, "WitherSkeleton", Material.WITHER_SKELETON_SPAWN_EGG), STRAY(EntityType.STRAY, "Stray", Material.STRAY_SPAWN_EGG), @@ -78,7 +78,8 @@ public enum EggType { TADPOLE(EntityType.TADPOLE, "Tadpole", Material.TADPOLE_SPAWN_EGG), WARDEN(EntityType.WARDEN, "Warden", Material.WARDEN_SPAWN_EGG), CAMEL(EntityType.CAMEL, "Camel", Material.CAMEL_SPAWN_EGG), - SNIFFER(EntityType.SNIFFER, "Sniffer", Material.SNIFFER_SPAWN_EGG); + SNIFFER(EntityType.SNIFFER, "Sniffer", Material.SNIFFER_SPAWN_EGG), + ARMADILLO(EntityType.ARMADILLO, "Armadillo", Material.ARMADILLO_SPAWN_EGG); private final EntityType entityType; private final String friendlyName; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 6b1d531..c395203 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,548 +1,555 @@ -ConfigVersion: 6.3 -DeleteVillagerInventoryOnCatch: true -NonPlayerCatching: true +UsePermissions: false +UseCatchChance: true +LooseEggOnFail: true +UseVaultCost: true +UseItemCost: true +UseHealthPercentage: false +ExplosionEffect: false +SmokeEffect: true +NonPlayerCatching: false PreventCatchingBabyAnimals: true -PreventCatchingShearedSheeps: true PreventCatchingTamedAnimals: true -SmokeEffect: true +PreventCatchingShearedSheeps: false +SpawnChickenOnSuccess: false SpawnChickenOnFail: true -SpawnChickenOnSuccess: true -UseCatchChance: true -UseHealthPercentage: true -UseItemCost: true -UsePermissions: true -UseVaultCost: true -ExplosionEffect: true +VaultTargetBankAccount: '' +DeleteVillagerInventoryOnCatch: false LogEggCaptures: true -LooseEggOnFail: true +Messages: + PermissionFail: §6[§4Info§6] §aDu bist nicht berechtigt diesen Mob zu fangen! + VaultFail: §6[§4Info§6] §aEs kostet %s Coins um diesen Mob zu fangen! + VaultSuccess: §6[§4Info§6] §a%s Coins bezahlt. + ItemCostFail: §6[§4Info§6] §aDu brauchst %s Smaragde um diesen Mob zu fangen! + ItemCostSuccess: §6[§4Info§6] §a%s Smaragd(e) bezahlt. + CatchChanceFail: §6[§4Info§6] §aDu kannst diesen Mob nicht fangen! + CatchChanceSuccess: §6[§4Info§6] §aDu hast den Mob eingefangen! + HealthPercentageFail: §6[§4Info§6] §aDer Mob hat nur noch %s Prozent Lebensenergie + und kann nicht gefangen werden! +ConfigVersion: 6.4 setPersistence: true -VaultTargetBankAccount: '' Entity: - Allay: - CatchChance: 100.0 - HealthPercentage: 100.0 + Armadillo: ItemCost: - Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Axolotl: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 - Bat: - CatchChance: 100.0 - HealthPercentage: 100.0 + Donkey: ItemCost: - Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Bee: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 - Blaze: + Sniffer: + ItemCost: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 Camel: - CatchChance: 100.0 - HealthPercentage: 100.0 ItemCost: - Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Cat: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 - CaveSpider: - CatchChance: 100.0 - HealthPercentage: 100.0 + Dolphin: ItemCost: - Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Chicken: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 - Cod: - CatchChance: 100.0 - HealthPercentage: 100.0 + Vex: ItemCost: Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Cow: - CatchChance: 100.0 + ItemName: emerald + CatchChance: 0.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 - Creeper: - CatchChance: 100.0 - HealthPercentage: 100.0 + Strider: ItemCost: - Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Dolphin: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 - Donkey: - CatchChance: 100.0 - HealthPercentage: 100.0 + Horse: ItemCost: - Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Drowned: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 - ElderGuardian: - CatchChance: 100.0 - HealthPercentage: 100.0 + Pufferfish: ItemCost: - Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Enderman: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 - Endermite: - CatchChance: 100.0 - HealthPercentage: 100.0 + Phantom: ItemCost: Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Evoker: - CatchChance: 100.0 + ItemName: emerald + CatchChance: 0.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 - Fox: - CatchChance: 100.0 - HealthPercentage: 100.0 + Piglin: ItemCost: Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Frog: - CatchChance: 100.0 + ItemName: emerald + CatchChance: 0.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 - Ghast: + Villager: + ItemCost: + Amount: 5.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 + VaultCost: 100.0 + Guardian: ItemCost: Amount: 0.0 - ItemName: gold_nugget + ItemName: emerald + CatchChance: 0.0 + HealthPercentage: 100.0 VaultCost: 0.0 - GlowSquid: + WanderingTrader: + ItemCost: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 Goat: - CatchChance: 100.0 - HealthPercentage: 100.0 ItemCost: - Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Guardian: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 - Hoglin: - CatchChance: 100.0 - HealthPercentage: 100.0 + Pillager: ItemCost: Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Horse: - CatchChance: 100.0 + ItemName: emerald + CatchChance: 0.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 - Husk: - CatchChance: 100.0 - HealthPercentage: 100.0 + GlowSquid: ItemCost: - Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Llama: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 - MagmaCube: - CatchChance: 100.0 - HealthPercentage: 100.0 + Turtle: ItemCost: - Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Mule: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 MushroomCow: - CatchChance: 100.0 - HealthPercentage: 100.0 ItemCost: - Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Ocelot: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 - Panda: + Salmon: + ItemCost: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 + VaultCost: 0.0 + Zombie: ItemCost: Amount: 0.0 - ItemName: gold_nugget + ItemName: emerald + CatchChance: 0.0 + HealthPercentage: 100.0 VaultCost: 0.0 Parrot: - CatchChance: 100.0 - HealthPercentage: 100.0 ItemCost: - Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Phantom: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 + VaultCost: 0.0 + ElderGuardian: ItemCost: Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Pig: - CatchChance: 100.0 + ItemName: emerald + CatchChance: 0.0 HealthPercentage: 100.0 + VaultCost: 0.0 + PiglinBrute: ItemCost: Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - PigZombie: - CatchChance: 100.0 + ItemName: emerald + CatchChance: 0.0 HealthPercentage: 100.0 + VaultCost: 0.0 + Evoker: ItemCost: Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Piglin: - CatchChance: 100.0 + ItemName: emerald + CatchChance: 0.0 HealthPercentage: 100.0 + VaultCost: 0.0 + Ravager: ItemCost: Amount: 0.0 - ItemName: gold_nugget + ItemName: emerald + CatchChance: 0.0 + HealthPercentage: 100.0 VaultCost: 0.0 - PiglinBrute: + Fox: + ItemCost: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 - Pillager: + Panda: + ItemCost: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 + VaultCost: 0.0 + WitherSkeleton: ItemCost: Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - PolarBear: - CatchChance: 100.0 + ItemName: emerald + CatchChance: 0.0 HealthPercentage: 100.0 + VaultCost: 0.0 + ZombieHorse: ItemCost: Amount: 0.0 - ItemName: gold_nugget + ItemName: emerald + CatchChance: 0.0 + HealthPercentage: 100.0 VaultCost: 0.0 - Pufferfish: + Ocelot: + ItemCost: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 + VaultCost: 0.0 + Drowned: ItemCost: Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Rabbit: - CatchChance: 100.0 + ItemName: emerald + CatchChance: 0.0 HealthPercentage: 100.0 + VaultCost: 0.0 + Enderman: ItemCost: Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Ravager: - CatchChance: 100.0 + ItemName: emerald + CatchChance: 0.0 HealthPercentage: 100.0 + VaultCost: 0.0 + CaveSpider: ItemCost: Amount: 0.0 - ItemName: gold_nugget + ItemName: emerald + CatchChance: 0.0 + HealthPercentage: 100.0 VaultCost: 0.0 - Salmon: + Cat: + ItemCost: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 + VaultCost: 0.0 + ZombifiedPiglin: ItemCost: Amount: 0.0 - ItemName: gold_nugget + ItemName: emerald + CatchChance: 100.0 + HealthPercentage: 0.0 VaultCost: 0.0 - Sheep: + Axolotl: + ItemCost: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 + VaultCost: 0.0 + Chicken: ItemCost: Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Shulker: - CatchChance: 100.0 + ItemName: emerald + CatchChance: 0.0 HealthPercentage: 100.0 + VaultCost: 0.0 + ZombieVillager: ItemCost: Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Silverfish: - CatchChance: 100.0 + ItemName: emerald + CatchChance: 0.0 HealthPercentage: 100.0 + VaultCost: 0.0 + Endermite: ItemCost: Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Skeleton: - CatchChance: 100.0 + ItemName: emerald + CatchChance: 0.0 HealthPercentage: 100.0 + VaultCost: 0.0 + Stray: ItemCost: Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - SkeletonHorse: - CatchChance: 100.0 + ItemName: emerald + CatchChance: 0.0 HealthPercentage: 100.0 + VaultCost: 0.0 + Vindicator: ItemCost: Amount: 0.0 - ItemName: gold_nugget + ItemName: emerald + CatchChance: 0.0 + HealthPercentage: 100.0 VaultCost: 0.0 - Sniffer: + TraderLlama: + ItemCost: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 + VaultCost: 0.0 + Creeper: ItemCost: Amount: 0.0 - ItemName: gold_nugget + ItemName: emerald + CatchChance: 0.0 + HealthPercentage: 100.0 VaultCost: 0.0 - Slime: + Rabbit: + ItemCost: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 + VaultCost: 0.0 + Silverfish: ItemCost: Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Spider: - CatchChance: 100.0 + ItemName: emerald + CatchChance: 0.0 HealthPercentage: 100.0 + VaultCost: 0.0 + Shulker: ItemCost: Amount: 0.0 - ItemName: gold_nugget + ItemName: emerald + CatchChance: 0.0 + HealthPercentage: 100.0 VaultCost: 0.0 Squid: + ItemCost: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 - Stray: + TropicalFish: + ItemCost: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 + VaultCost: 0.0 + Hoglin: ItemCost: Amount: 0.0 - ItemName: gold_nugget + ItemName: emerald + CatchChance: 0.0 + HealthPercentage: 100.0 VaultCost: 0.0 - Strider: + Cod: + ItemCost: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 + VaultCost: 0.0 + Skeleton: ItemCost: Amount: 0.0 - ItemName: gold_nugget + ItemName: emerald + CatchChance: 0.0 + HealthPercentage: 100.0 VaultCost: 0.0 - Tadpole: + Wolf: + ItemCost: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 + VaultCost: 0.0 + MagmaCube: ItemCost: Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - TraderLlama: - CatchChance: 100.0 + ItemName: emerald + CatchChance: 0.0 HealthPercentage: 100.0 + VaultCost: 0.0 + Witch: ItemCost: Amount: 0.0 - ItemName: gold_nugget + ItemName: emerald + CatchChance: 0.0 + HealthPercentage: 100.0 VaultCost: 0.0 - TropicalFish: + SkeletonHorse: + ItemCost: + Amount: 20.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 + VaultCost: 1000.0 + PolarBear: ItemCost: - Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Turtle: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 - Vex: + Bee: + ItemCost: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 - Villager: + Mule: + ItemCost: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 + VaultCost: 0.0 + Husk: ItemCost: Amount: 0.0 - ItemName: gold_nugget + ItemName: emerald + CatchChance: 0.0 + HealthPercentage: 100.0 VaultCost: 0.0 - Vindicator: + Cow: + ItemCost: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 + VaultCost: 0.0 + Slime: ItemCost: Amount: 0.0 - ItemName: gold_nugget + ItemName: emerald + CatchChance: 0.0 + HealthPercentage: 100.0 VaultCost: 0.0 - WanderingTrader: + Pig: + ItemCost: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 - Warden: + Bat: + ItemCost: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 - Witch: + Llama: + ItemCost: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 - WitherSkeleton: - CatchChance: 100.0 + Blaze: + ItemCost: + Amount: 1.0 + ItemName: emerald + CatchChance: 0.0 HealthPercentage: 100.0 + VaultCost: 0.0 + PigZombie: ItemCost: Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Wolf: - CatchChance: 100.0 + ItemName: emerald + CatchChance: 0.0 HealthPercentage: 100.0 + VaultCost: 0.0 + Ghast: ItemCost: Amount: 0.0 - ItemName: gold_nugget - VaultCost: 0.0 - Zoglin: - CatchChance: 100.0 + ItemName: emerald + CatchChance: 0.0 HealthPercentage: 100.0 + VaultCost: 0.0 + Spider: ItemCost: Amount: 0.0 - ItemName: gold_nugget + ItemName: emerald + CatchChance: 0.0 + HealthPercentage: 100.0 VaultCost: 0.0 - Zombie: + Sheep: + ItemCost: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 + VaultCost: 0.0 + Zoglin: ItemCost: Amount: 0.0 - ItemName: gold_nugget + ItemName: emerald + CatchChance: 0.0 + HealthPercentage: 100.0 VaultCost: 0.0 - ZombieHorse: + Allay: + ItemCost: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 - ZombieVillager: + Frog: + ItemCost: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 - ItemCost: - Amount: 0.0 - ItemName: gold_nugget VaultCost: 0.0 - ZombifiedPiglin: + Tadpole: + ItemCost: + Amount: 1.0 + ItemName: emerald CatchChance: 100.0 HealthPercentage: 100.0 + VaultCost: 0.0 + Warden: ItemCost: Amount: 0.0 - ItemName: gold_nugget + ItemName: emerald + CatchChance: 0.0 + HealthPercentage: 100.0 VaultCost: 0.0 -Messages: - CatchChanceFail: You failed to catch this mob! - CatchChanceSuccess: '' - HealthPercentageFail: The mob has more than %s percent health left and cannot be - caught! - ItemCostFail: It costs %s gold nugget(s) to catch this mob! - ItemCostSuccess: You paid %s gold nugget(s) for catching this mob! - PermissionFail: You do not have permission to catch this mob! - VaultFail: It costs %s dollars to catch this mob! - VaultSuccess: You paid %s dollars for catching this mob! diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 0462a20..c2725ae 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: EggCatcher -version: 6.3 +version: 6.4 description: This plugin allows you to catch mobs in eggs. author: MinecraftHeads api-version: 1.20 @@ -13,6 +13,8 @@ permissions: description: Gives access to catch all types of mobs. default: op children: + eggcatcher.catch.allay: true + eggcatcher.catch.armadillo: true eggcatcher.catch.axolotl: true eggcatcher.catch.bat: true eggcatcher.catch.bee: true @@ -42,7 +44,7 @@ permissions: eggcatcher.catch.llama: true eggcatcher.catch.magmacube: true eggcatcher.catch.mule: true - eggcatcher.catch.mushroomcow: true + eggcatcher.catch.mooshroom: true eggcatcher.catch.ocelot: true eggcatcher.catch.panda: true eggcatcher.catch.parrot: true