Fix travis build

.travis.yml

@@ -1,6 +1,7 @@
 language: java
+dist: trusty
 jdk:
-  - oraclejdk7
+  - oraclejdk8
 cache:
   directories:
-  - $HOME/.m2
+  - $HOME/.m2

pom.xml

@@ -14,7 +14,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.1</version>
+                <version>3.8.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -69,8 +69,8 @@
             <url>http://nexus.hc.to/content/repositories/pub_releases</url>
         </repository>
         <repository>
-            <id>bstats-repo</id>
-            <url>http://repo.bstats.org/content/repositories/releases/</url>
+            <id>CodeMC</id>
+            <url>https://repo.codemc.org/repository/maven-public</url>
         </repository>
     </repositories>
 
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>1.12-R0.1-SNAPSHOT</version>
+            <version>1.15.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -90,7 +90,7 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>1.1</version>
+            <version>1.7</version>
         </dependency>
     </dependencies>
 </project>

src/main/java/me/shansen/EggCatcher/EggCatcher.java

@@ -25,7 +25,7 @@ import org.bukkit.entity.Egg;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.bstats.Metrics;
+import org.bstats.bukkit.Metrics;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -55,21 +55,12 @@ public class EggCatcher extends JavaPlugin {
             }
         }
 
-        Metrics metrics = new Metrics(this);
+        Metrics metrics = new Metrics(this, 894);
     }
 
     public void CheckConfigurationFile() {
         double configVersion = this.getConfig().getDouble("ConfigVersion", 0.0);
-        if (configVersion == 3.1) {
-            this.saveConfig();
-        }
-        else if (configVersion == 3.0) {
-            this.getConfig().set("CatchChance.Parrot", 100.0);
-            this.getConfig().set("VaultCost.Parrot", 0.0);
-            this.getConfig().set("ItemCost.Amount.Parrot", 0.0);
-            this.getConfig().set("HealthPercentage.Parrot", 100.0);
-
-            this.getConfig().set("ConfigVersion", 3.1);
+        if (configVersion == 5.0) {
             this.saveConfig();
         } else {
             this.saveResource("config.yml", true);

src/main/java/me/shansen/EggCatcher/EggType.java

@@ -18,66 +18,79 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package me.shansen.EggCatcher;
 
+import org.bukkit.Material;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 
 public enum EggType {
-    EVOKER(EntityType.EVOKER, 34, "Evoker"),
-    VEX(EntityType.VEX, 35, "Vex"),
-    VINDICATOR(EntityType.VINDICATOR, 36, "Vindicator"),
-    PIG_ZOMBIE(EntityType.PIG_ZOMBIE, 57, "PigZombie"),
-    MAGMA_CUBE(EntityType.MAGMA_CUBE, 62, "MagmaCube"),
-    CAVE_SPIDER(EntityType.CAVE_SPIDER, 59, "CaveSpider"),
-    MUSHROOM_COW(EntityType.MUSHROOM_COW, 96, "MushroomCow"),
-    CREEPER(EntityType.CREEPER, 50, "Creeper"),
-    WITHER_SKELETON(EntityType.WITHER_SKELETON, 5, "WitherSkeleton"),
-    STRAY(EntityType.STRAY, 6, "Stray"),
-    SKELETON(EntityType.SKELETON, 51, "Skeleton"),
-    SPIDER(EntityType.SPIDER, 52, "Spider"),
-    HUSK(EntityType.HUSK, 23, "Husk"),
-    ZOMBIE_VILLAGER(EntityType.ZOMBIE_VILLAGER, 27, "ZombieVillager"),
-    ZOMBIE(EntityType.ZOMBIE, 54, "Zombie"),
-    SLIME(EntityType.SLIME, 55, "Slime"),
-    GHAST(EntityType.GHAST, 56, "Ghast"),
-    ENDERMAN(EntityType.ENDERMAN, 58, "Enderman"),
-    SILVERFISH(EntityType.SILVERFISH, 60, "Silverfish"),
-    BLAZE(EntityType.BLAZE, 61, "Blaze"),
-    PIG(EntityType.PIG, 90, "Pig"),
-    SHEEP(EntityType.SHEEP, 91, "Sheep"),
-    COW(EntityType.COW, 92, "Cow"),
-    CHICKEN(EntityType.CHICKEN, 93, "Chicken"),
-    SQUID(EntityType.SQUID, 94, "Squid"),
-    WOLF(EntityType.WOLF, 95, "Wolf"),
-    VILLAGER(EntityType.VILLAGER, 120, "Villager"),
-    OCELOT(EntityType.OCELOT, 98, "Ocelot"),
-    BAT(EntityType.BAT, 65, "Bat"),
-    WITCH(EntityType.WITCH, 66, "Witch"),
-    ZOMBIE_HORSE(EntityType.ZOMBIE_HORSE, 29, "ZombieHorse"),
-    SKELETON_HORSE(EntityType.SKELETON_HORSE, 28, "SkeletonHorse"),
-    LLAMA(EntityType.LLAMA, 103, "Llama"),
-    DONKEY(EntityType.DONKEY, 31, "Donkey"),
-    MULE(EntityType.MULE, 32, "Mule"),
-    HORSE(EntityType.HORSE, 100, "Horse"),
-    ENDERMITE(EntityType.ENDERMITE, 67, "Endermite"),
-    ELDER_GUARDIAN(EntityType.ELDER_GUARDIAN, 4, "ElderGuardian"),
-    GUARDIAN(EntityType.GUARDIAN, 68, "Guardian"),
-    RABBIT(EntityType.RABBIT, 101, "Rabbit"),
-    POLAR_BEAR(EntityType.POLAR_BEAR, 102, "PolarBear"),
-    SHULKER(EntityType.SHULKER, 69, "Shulker"),
-    PARROT(EntityType.PARROT, 105, "Parrot");
+    DROWNED(EntityType.DROWNED, "Drowned", Material.DROWNED_SPAWN_EGG),
+    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),
+    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),
+    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),
+    SKELETON(EntityType.SKELETON, "Skeleton", Material.SKELETON_SPAWN_EGG),
+    SPIDER(EntityType.SPIDER, "Spider", Material.SPIDER_SPAWN_EGG),
+    HUSK(EntityType.HUSK, "Husk", Material.HUSK_SPAWN_EGG),
+    ZOMBIE_VILLAGER(EntityType.ZOMBIE_VILLAGER, "ZombieVillager", Material.ZOMBIE_VILLAGER_SPAWN_EGG),
+    ZOMBIE(EntityType.ZOMBIE, "Zombie", Material.ZOMBIE_SPAWN_EGG),
+    SLIME(EntityType.SLIME, "Slime", Material.SLIME_SPAWN_EGG),
+    GHAST(EntityType.GHAST, "Ghast", Material.GHAST_SPAWN_EGG),
+    ENDERMAN(EntityType.ENDERMAN, "Enderman", Material.ENDERMAN_SPAWN_EGG),
+    SILVERFISH(EntityType.SILVERFISH, "Silverfish", Material.SILVERFISH_SPAWN_EGG),
+    BLAZE(EntityType.BLAZE, "Blaze", Material.BLAZE_SPAWN_EGG),
+    PIG(EntityType.PIG, "Pig", Material.PIG_SPAWN_EGG),
+    SHEEP(EntityType.SHEEP, "Sheep", Material.SHEEP_SPAWN_EGG),
+    COW(EntityType.COW, "Cow", Material.COW_SPAWN_EGG),
+    CHICKEN(EntityType.CHICKEN, "Chicken", Material.CHICKEN_SPAWN_EGG),
+    SQUID(EntityType.SQUID, "Squid", Material.SQUID_SPAWN_EGG),
+    WOLF(EntityType.WOLF, "Wolf", Material.WOLF_SPAWN_EGG),
+    VILLAGER(EntityType.VILLAGER, "Villager", Material.VILLAGER_SPAWN_EGG),
+    OCELOT(EntityType.OCELOT, "Ocelot", Material.OCELOT_SPAWN_EGG),
+    BAT(EntityType.BAT, "Bat", Material.BAT_SPAWN_EGG),
+    WITCH(EntityType.WITCH, "Witch", Material.WITCH_SPAWN_EGG),
+    ZOMBIE_HORSE(EntityType.ZOMBIE_HORSE, "ZombieHorse", Material.ZOMBIE_HORSE_SPAWN_EGG),
+    SKELETON_HORSE(EntityType.SKELETON_HORSE, "SkeletonHorse", Material.SKELETON_HORSE_SPAWN_EGG),
+    TRADER_LLAMA(EntityType.TRADER_LLAMA, "TraderLlama", Material.TRADER_LLAMA_SPAWN_EGG),
+    LLAMA(EntityType.LLAMA, "Llama", Material.LLAMA_SPAWN_EGG),
+    DONKEY(EntityType.DONKEY, "Donkey", Material.DONKEY_SPAWN_EGG),
+    MULE(EntityType.MULE, "Mule", Material.MULE_SPAWN_EGG),
+    HORSE(EntityType.HORSE, "Horse", Material.HORSE_SPAWN_EGG),
+    ENDERMITE(EntityType.ENDERMITE, "Endermite", Material.ENDERMITE_SPAWN_EGG),
+    ELDER_GUARDIAN(EntityType.ELDER_GUARDIAN, "ElderGuardian", Material.ELDER_GUARDIAN_SPAWN_EGG),
+    GUARDIAN(EntityType.GUARDIAN, "Guardian", Material.GUARDIAN_SPAWN_EGG),
+    RABBIT(EntityType.RABBIT, "Rabbit", Material.RABBIT_SPAWN_EGG),
+    POLAR_BEAR(EntityType.POLAR_BEAR, "PolarBear", Material.POLAR_BEAR_SPAWN_EGG),
+    SHULKER(EntityType.SHULKER, "Shulker", Material.SHULKER_SPAWN_EGG),
+    PARROT(EntityType.PARROT, "Parrot", Material.PARROT_SPAWN_EGG),
+    BEE(EntityType.BEE, "Bee", Material.BEE_SPAWN_EGG),
+    CAT(EntityType.CAT, "Cat", Material.CAT_SPAWN_EGG),
+    COD(EntityType.COD, "Cod", Material.COD_SPAWN_EGG),
+    DOLPHIN(EntityType.DOLPHIN, "Dolphin", Material.DOLPHIN_SPAWN_EGG),
+    FOX(EntityType.FOX, "Fox", Material.FOX_SPAWN_EGG),
+    PANDA(EntityType.PANDA, "Panda", Material.PANDA_SPAWN_EGG),
+    PHANTOM(EntityType.PHANTOM, "Phantom", Material.PHANTOM_SPAWN_EGG),
+    PILLAGER(EntityType.PILLAGER, "Pillager", Material.PILLAGER_SPAWN_EGG),
+    PUFFERFISH(EntityType.PUFFERFISH, "Pufferfish", Material.PUFFERFISH_SPAWN_EGG),
+    RAVAGER(EntityType.RAVAGER, "Ravager", Material.RAVAGER_SPAWN_EGG),
+    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),
+    WANDERING_TRADER(EntityType.WANDERING_TRADER, "WanderingTrader", Material.WANDERING_TRADER_SPAWN_EGG);
 
     private final EntityType entityType;
-    private final Integer creatureId;
     private final String friendlyName;
+    private final Material material;
 
-    EggType(EntityType entityType, Integer creatureId, String friendlyName) {
+    EggType(EntityType entityType, String friendlyName, Material material) {
         this.entityType = entityType;
-        this.creatureId = creatureId;
         this.friendlyName = friendlyName;
-    }
-
-    public short getCreatureId() {
-        return this.creatureId.shortValue();
+        this.material = material;
     }
 
     public EntityType getCreatureType() {
@@ -88,6 +101,10 @@ public enum EggType {
         return this.friendlyName;
     }
 
+    public Material getMaterial() {
+        return this.material;
+    }
+
     public static EggType getEggType(Entity entity) {
         for (EggType eggType : EggType.values()) {
             if (!eggType.getCreatureType().getEntityClass().isInstance(entity)) {

src/main/java/me/shansen/EggCatcher/listeners/EggCatcherEntityListener.java

@@ -23,8 +23,6 @@ import me.shansen.EggCatcher.EggCatcherLogger;
 import me.shansen.EggCatcher.EggType;
 import me.shansen.EggCatcher.events.EggCaptureEvent;
 
-import me.shansen.nbt.NbtReflection;
-
 import org.bukkit.Effect;
 import org.bukkit.Material;
 import org.bukkit.configuration.file.FileConfiguration;
@@ -227,11 +225,11 @@ public class EggCatcherEntityListener implements Listener {
             }
 
             if (this.useItemCost && !freeCatch) {
-                int itemId = config.getInt("ItemCost.ItemId", 266);
+                Material itemMaterial = Material.matchMaterial(config.getString("ItemCost.ItemId", "gold_nugget"));
                 int itemData = config.getInt("ItemCost.ItemData", 0);
                 int itemAmount = config.getInt("ItemCost.Amount." + eggType.getFriendlyName(), 0);
                 @SuppressWarnings("deprecation")
-				ItemStack itemStack = new ItemStack(itemId, itemAmount, (short) itemData);
+				ItemStack itemStack = new ItemStack(itemMaterial, itemAmount, (short) itemData);
                 if (player.getInventory().containsAtLeast(itemStack, itemStack.getAmount())) {
                     player.sendMessage(String.format(config.getString("Messages.ItemCostSuccess"),
                             String.valueOf(itemAmount)));
@@ -267,9 +265,7 @@ public class EggCatcherEntityListener implements Listener {
             entity.getWorld().playEffect(entity.getLocation(), Effect.SMOKE, 0);
         }
 
-        ItemStack eggStack = new ItemStack(Material.MONSTER_EGG, 1, eggType.getCreatureId());
-
-        eggStack = NbtReflection.setNewEntityTag(eggStack, entity.getType().getName());
+        ItemStack eggStack = new ItemStack(eggType.getMaterial(), 1);
 
         String customName = ((LivingEntity) entity).getCustomName();
 

src/main/resources/config.yml

@@ -17,16 +17,22 @@ DeleteVillagerInventoryOnCatch: false
 LogEggCaptures: false
 CatchChance:
   Bat: 100.0
+  Bee: 100.0
   Blaze: 100.0
+  Cat: 100.0
   CaveSpider: 100.0
   Chicken: 100.0
+  Cod: 100.0
   Cow: 100.0
   Creeper: 100.0
+  Dolphin: 100.0
   Donkey: 100.0
+  Drowned: 100.0
   ElderGuardian: 100.0
   Enderman: 100.0
   Endermite: 100.0
   Evoker: 100.0
+  Fox: 100.0
   Ghast: 100.0
   Guardian: 100.0
   Horse: 100.0
@@ -36,11 +42,17 @@ CatchChance:
   Mule: 100.0
   MushroomCow: 100.0
   Ocelot: 100.0
+  Panda: 100.0
   Parrot: 100.0
+  Phantom: 100.0
   Pig: 100.0
   PigZombie: 100.0
+  Pillager: 100.0
   PolarBear: 100.0
+  Pufferfish: 100.0
   Rabbit: 100.0
+  Ravager: 100.0
+  Salmon: 100.0
   Sheep: 100.0
   Shulker: 100.0
   Silverfish: 100.0
@@ -50,9 +62,13 @@ CatchChance:
   Spider: 100.0
   Squid: 100.0
   Stray: 100.0
+  TraderLlama: 100.0
+  TropicalFish: 100.0
+  Turtle: 100.0
   Vex: 100.0
   Villager: 100.0
   Vindicator: 100.0
+  WanderingTrader: 100.0
   Witch: 100.0
   WitherSkeleton: 100.0
   Wolf: 100.0
@@ -61,16 +77,22 @@ CatchChance:
   ZombieVillager: 100.0
 VaultCost:
   Bat: 0.0
+  Bee: 0.0
   Blaze: 0.0
+  Cat: 0.0
   CaveSpider: 0.0
   Chicken: 0.0
+  Cod: 0.0
   Cow: 0.0
   Creeper: 0.0
+  Dolphin: 0.0
   Donkey: 0.0
+  Drowned: 0.0
   ElderGuardian: 0.0
   Enderman: 0.0
   Endermite: 0.0
   Evoker: 0.0
+  Fox: 0.0
   Ghast: 0.0
   Guardian: 0.0
   Horse: 0.0
@@ -80,11 +102,17 @@ VaultCost:
   Mule: 0.0
   MushroomCow: 0.0
   Ocelot: 0.0
+  Panda: 0.0
   Parrot: 0.0
+  Phantom: 0.0
   Pig: 0.0
   PigZombie: 0.0
+  Pillager: 0.0
   PolarBear: 0.0
+  Pufferfish: 0.0
   Rabbit: 0.0
+  Ravager: 0.0
+  Salmon: 0.0
   Sheep: 0.0
   Shulker: 0.0
   Silverfish: 0.0
@@ -94,9 +122,13 @@ VaultCost:
   Spider: 0.0
   Squid: 0.0
   Stray: 0.0
+  TraderLlama: 0.0
+  TropicalFish: 0.0
+  Turtle: 0.0
   Vex: 0.0
   Villager: 0.0
   Vindicator: 0.0
+  WanderingTrader: 0.0
   Witch: 0.0
   WitherSkeleton: 0.0
   Wolf: 0.0
@@ -104,20 +136,26 @@ VaultCost:
   ZombieHorse: 0.0
   ZombieVillager: 0.0
 ItemCost:
-  ItemId: 371
+  ItemId: gold_nugget
   ItemData: 0
   Amount:
     Bat: 0.0
+    Bee: 0.0
     Blaze: 0.0
+    Cat: 0.0
     CaveSpider: 0.0
     Chicken: 0.0
+    Cod: 0.0
     Cow: 0.0
     Creeper: 0.0
+    Dolphin: 0.0
     Donkey: 0.0
+    Drowned: 0.0
     ElderGuardian: 0.0
     Enderman: 0.0
     Endermite: 0.0
     Evoker: 0.0
+    Fox: 0.0
     Ghast: 0.0
     Guardian: 0.0
     Horse: 0.0
@@ -127,11 +165,17 @@ ItemCost:
     Mule: 0.0
     MushroomCow: 0.0
     Ocelot: 0.0
+    Panda: 0.0
     Parrot: 0.0
+    Phantom: 0.0
     Pig: 0.0
     PigZombie: 0.0
+    Pillager: 0.0
     PolarBear: 0.0
+    Pufferfish: 0.0
     Rabbit: 0.0
+    Ravager: 0.0
+    Salmon: 0.0
     Sheep: 0.0
     Shulker: 0.0
     Silverfish: 0.0
@@ -141,9 +185,13 @@ ItemCost:
     Spider: 0.0
     Squid: 0.0
     Stray: 0.0
+    TraderLlama: 0.0
+    TropicalFish: 0.0
+    Turtle: 0.0
     Vex: 0.0
     Villager: 0.0
     Vindicator: 0.0
+    WanderingTrader: 0.0
     Witch: 0.0
     WitherSkeleton: 0.0
     Wolf: 0.0
@@ -152,16 +200,22 @@ ItemCost:
     ZombieVillager: 0.0
 HealthPercentage:
   Bat: 100.0
+  Bee: 100.0
   Blaze: 100.0
+  Cat: 100.0
   CaveSpider: 100.0
   Chicken: 100.0
+  Cod: 100.0
   Cow: 100.0
   Creeper: 100.0
+  Dolphin: 100.0
   Donkey: 100.0
+  Drowned: 100.0
   ElderGuardian: 100.0
   Enderman: 100.0
   Endermite: 100.0
   Evoker: 100.0
+  Fox: 100.0
   Ghast: 100.0
   Guardian: 100.0
   Horse: 100.0
@@ -171,11 +225,17 @@ HealthPercentage:
   Mule: 100.0
   MushroomCow: 100.0
   Ocelot: 100.0
+  Panda: 100.0
   Parrot: 100.0
+  Phantom: 100.0
   Pig: 100.0
   PigZombie: 100.0
+  Pillager: 100.0
   PolarBear: 100.0
+  Pufferfish: 100.0
   Rabbit: 100.0
+  Ravager: 100.0
+  Salmon: 100.0
   Sheep: 100.0
   Shulker: 100.0
   Silverfish: 100.0
@@ -185,9 +245,13 @@ HealthPercentage:
   Spider: 100.0
   Squid: 100.0
   Stray: 100.0
+  TraderLlama: 100.0
+  TropicalFish: 100.0
+  Turtle: 100.0
   Vex: 100.0
   Villager: 100.0
   Vindicator: 100.0
+  WanderingTrader: 100.0
   Witch: 100.0
   WitherSkeleton: 100.0
   Wolf: 100.0
@@ -203,4 +267,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: 3.1
+ConfigVersion: 5.0

src/main/resources/plugin.yml

@@ -1,7 +1,8 @@
 name: EggCatcher
-version: 3.1
+version: 5.0
 description: This plugin allows you to catch mobs in eggs.
 author: shansen
+api-version: 1.15
 
 main: me.shansen.EggCatcher.EggCatcher
 
@@ -11,16 +12,22 @@ permissions:
         default: op
         children:
             eggcatcher.catch.bat: true
+            eggcatcher.catch.bee: true
             eggcatcher.catch.blaze: true
+            eggcatcher.catch.cat: true
             eggcatcher.catch.cavespider: true
             eggcatcher.catch.chicken: true
+            eggcatcher.catch.cod: true
             eggcatcher.catch.cow: true
             eggcatcher.catch.creeper: true
+            eggcatcher.catch.dolphin: true
             eggcatcher.catch.donkey: true
+            eggcatcher.catch.drowned: true
             eggcatcher.catch.elderguardian: true
             eggcatcher.catch.enderman: true
             eggcatcher.catch.endermite: true
             eggcatcher.catch.evoker: true
+            eggcatcher.catch.fox: true
             eggcatcher.catch.ghast: true
             eggcatcher.catch.guardian: true
             eggcatcher.catch.horse: true
@@ -30,11 +37,17 @@ permissions:
             eggcatcher.catch.mule: true
             eggcatcher.catch.mushroomcow: true
             eggcatcher.catch.ocelot: true
+            eggcatcher.catch.panda: true
             eggcatcher.catch.parrot: true
+            eggcatcher.catch.phantom: true
             eggcatcher.catch.pig: true
             eggcatcher.catch.pigzombie: true
+            eggcatcher.catch.pillager: true
             eggcatcher.catch.polarbear: true
+            eggcatcher.catch.pufferfish: true
             eggcatcher.catch.rabbit: true
+            eggcatcher.catch.ravager: true
+            eggcatcher.catch.salmon: true
             eggcatcher.catch.sheep: true
             eggcatcher.catch.shulker: true
             eggcatcher.catch.silverfish: true
@@ -44,9 +57,13 @@ permissions:
             eggcatcher.catch.spider: true
             eggcatcher.catch.squid: true
             eggcatcher.catch.stray: true
+            eggcatcher.catch.traderllama: true
+            eggcatcher.catch.tropicalfish: true
+            eggcatcher.catch.turtle: true
             eggcatcher.catch.vex: true
             eggcatcher.catch.villager: true
             eggcatcher.catch.vindicator: true
+            eggcatcher.catch.wanderingtrader: true
             eggcatcher.catch.witch: true
             eggcatcher.catch.witherskeleton: true
             eggcatcher.catch.wolf: true