Merge pull request #15 from KovuTheHusky/1.11-entity-ids

Update for new mobs and entity classes in 1.11

Author: mikeprimm

pom.xml

@@ -42,7 +42,7 @@
 			<snapshots>
 			</snapshots>
 			<id>bukkit-repo</id>
-			<url>http://repo.bukkit.org/content/repositories/releases/</url>
+			<url>http://hub.spigotmc.org/nexus/content/groups/public/</url>
 		</repository>
 		<repository>
 			<releases>
@@ -58,7 +58,7 @@
   	<dependency>
   		<groupId>org.bukkit</groupId>
   		<artifactId>bukkit</artifactId>
-  		<version>1.7.10-R0.1-SNAPSHOT</version>
+  		<version>1.11-R0.1-SNAPSHOT</version>
   	</dependency>
   	<dependency>
   		<groupId>us.dynmap</groupId>

src/main/java/org/dynmap/mobs/DynmapMobsPlugin.java

@@ -162,46 +162,63 @@ public void init() {
             new MobMapping("goat", "org.bukkit.entity.Animals", "Goat", "net.minecraft.server.MoCEntityGoat"),
             new MobMapping("snake", "org.bukkit.entity.Animals", "Snake", "net.minecraft.server.MoCEntitySnake"),
             new MobMapping("ostrich", "org.bukkit.entity.Animals", "Ostrich", "net.minecraft.server.MoCEntityOstrich"),
-            // Standard
-            new MobMapping("bat", "org.bukkit.entity.Bat", "Bat"),
-            new MobMapping("witch", "org.bukkit.entity.Witch", "Witch"),
-            new MobMapping("wither", "org.bukkit.entity.Wither", "Wither"),
+            // Standard hostile
+            new MobMapping("elderguardian", "org.bukkit.entity.ElderGuardian", "Elder Guardian"),
+            new MobMapping("witherskeleton", "org.bukkit.entity.WitherSkeleton", "Wither Skeleton"),
+            new MobMapping("stray", "org.bukkit.entity.Stray", "Stray"),
+            new MobMapping("husk", "org.bukkit.entity.Husk", "Husk"),
+            new MobMapping("zombievillager", "org.bukkit.entity.ZombieVillager", "Zombie Villager"),
+            new MobMapping("evoker", "org.bukkit.entity.Evoker", "Evoker"),
+            new MobMapping("vex", "org.bukkit.entity.Vex", "Vex"),
+            new MobMapping("vindicator", "org.bukkit.entity.Vindicator", "Vindicator"),
+            new MobMapping("creeper", "org.bukkit.entity.Creeper", "Creeper"),
+            new MobMapping("skeleton", "org.bukkit.entity.Skeleton", "Skeleton"),
+            new MobMapping("giant", "org.bukkit.entity.Giant", "Giant"),
+            new MobMapping("ghast", "org.bukkit.entity.Ghast", "Ghast"),
+            new MobMapping("zombiepigman", "org.bukkit.entity.PigZombie", "Zombie Pigman"),
+            new MobMapping("zombie", "org.bukkit.entity.Zombie", "Zombie"), /* Must be last zombie type */
+            new MobMapping("enderman", "org.bukkit.entity.Enderman", "Enderman"),
+            new MobMapping("cavespider", "org.bukkit.entity.CaveSpider", "Cave Spider"),
+            new MobMapping("spider", "org.bukkit.entity.Spider", "Spider"), /* Must be last spider type */
+            new MobMapping("spiderjockey", "org.bukkit.entity.Spider", "Spider Jockey"), /* Must be just after spider */
+            new MobMapping("silverfish", "org.bukkit.entity.Silverfish", "Silverfish"),
             new MobMapping("blaze", "org.bukkit.entity.Blaze", "Blaze"),
+            new MobMapping("magmacube", "org.bukkit.entity.MagmaCube", "Magma Cube"),
+            new MobMapping("slime", "org.bukkit.entity.Slime", "Slime"), /* Must be last slime type */
             new MobMapping("enderdragon", "org.bukkit.entity.EnderDragon", "Ender Dragon"),
-            new MobMapping("ghast", "org.bukkit.entity.EnderDragon", "Ghast"),
-            new MobMapping("mooshroom", "org.bukkit.entity.MushroomCow", "Mooshroom"),
+            new MobMapping("wither", "org.bukkit.entity.Wither", "Wither"),
+            new MobMapping("witch", "org.bukkit.entity.Witch", "Witch"),
+            new MobMapping("endermite", "org.bukkit.entity.Endermite", "Endermite"),
+            new MobMapping("guardian", "org.bukkit.entity.Guardian", "Guardian"),
+            new MobMapping("shulker", "org.bukkit.entity.Shulker", "Shulker"),
+            // Standard passive
+            new MobMapping("skeletonhorse", "org.bukkit.entity.SkeletonHorse", "Skeleton Horse"),
+            new MobMapping("zombiehorse", "org.bukkit.entity.ZombieHorse", "Zombie Horse"),
+            new MobMapping("donkey", "org.bukkit.entity.Donkey", "Donkey"),
+            new MobMapping("mule", "org.bukkit.entity.Mule", "Mule"),
+            new MobMapping("bat", "org.bukkit.entity.Bat", "Bat"),
+            new MobMapping("pig", "org.bukkit.entity.Pig", "Pig"),
+            new MobMapping("sheep", "org.bukkit.entity.Sheep", "Sheep"),
             new MobMapping("cow", "org.bukkit.entity.Cow", "Cow"),
-            new MobMapping("silverfish", "org.bukkit.entity.Silverfish", "Silverfish"),
-            new MobMapping("magmacube", "org.bukkit.entity.MagmaCube", "Magma Cube"),
-            new MobMapping("slime", "org.bukkit.entity.Slime", "Slime"),
-            new MobMapping("snowgolem", "org.bukkit.entity.Snowman", "Snow Golem"),
-            new MobMapping("cavespider", "org.bukkit.entity.CaveSpider", "Cave Spider"),
-            new MobMapping("spider", "org.bukkit.entity.Spider", "Spider"),
-            new MobMapping("spiderjockey", "org.bukkit.entity.Spider", "Spider Jockey"), /* Must be just after "spider" */
+            new MobMapping("chicken", "org.bukkit.entity.Chicken", "Chicken"),
+            new MobMapping("chickenjockey", "org.bukkit.entity.Chicken", "Chicken Jockey"), /* Must be just after chicken */
+            new MobMapping("squid", "org.bukkit.entity.Squid", "Squid"),
             new MobMapping("wolf", "org.bukkit.entity.Wolf", "Wolf"),
             new MobMapping("tamedwolf", "org.bukkit.entity.Wolf", "Wolf"), /* Must be just after wolf */
+            new MobMapping("mooshroom", "org.bukkit.entity.MushroomCow", "Mooshroom"),
+            new MobMapping("snowgolem", "org.bukkit.entity.Snowman", "Snow Golem"),
             new MobMapping("ocelot", "org.bukkit.entity.Ocelot", "Ocelot"),
             new MobMapping("cat", "org.bukkit.entity.Ocelot", "Cat"), /* Must be just after ocelot */
-            new MobMapping("zombiepigman", "org.bukkit.entity.PigZombie", "Zombie Pigman"),
-            new MobMapping("creeper", "org.bukkit.entity.Creeper", "Creeper"),
-            new MobMapping("skeleton", "org.bukkit.entity.Skeleton", "Skeleton"),
-            new MobMapping("witherskeleton", "org.bukkit.entity.Skeleton", "Wither Skeleton"), /* Must be just after "skeleton" */
-            new MobMapping("enderman", "org.bukkit.entity.Enderman", "Enderman"),
-            new MobMapping("zombie", "org.bukkit.entity.Zombie", "Zombie"),
-            new MobMapping("zombievilager", "org.bukkit.entity.Zombie", "Zombie Villager"), /* Must be just after "zomnie" */
-            new MobMapping("giant", "org.bukkit.entity.Giant", "Giant"),
-            new MobMapping("chicken", "org.bukkit.entity.Chicken", "Chicken"),
-            new MobMapping("pig", "org.bukkit.entity.Pig", "Pig"),
-            new MobMapping("sheep", "org.bukkit.entity.Sheep", "Sheep"),
-            new MobMapping("squid", "org.bukkit.entity.Squid", "Squid"),
-            new MobMapping("villager", "org.bukkit.entity.Villager", "Villager"),
             new MobMapping("golem", "org.bukkit.entity.IronGolem", "Iron Golem"),
             new MobMapping("vanillahorse", "org.bukkit.entity.Horse", "Horse"),
             new MobMapping("rabbit", "org.bukkit.entity.Rabbit", "Rabbit"),
-            new MobMapping("endermite", "org.bukkit.entity.Endermite", "Endermite"),
-            new MobMapping("guardian", "org.bukkit.entity.Guardian", "Guardian")
+            new MobMapping("vanillapolarbear", "org.bukkit.entity.PolarBear", "Polar Bear"),
+            new MobMapping("llama", "org.bukkit.entity.Llama", "Llama"),
+            new MobMapping("villager", "org.bukkit.entity.Villager", "Villager")
     };
     private MobMapping configvehicles[] = {
+            // Command Minecart
+            new MobMapping("command-minecart", "org.bukkit.entity.minecart.CommandMinecart", "Command Minecart"),
             // Explosive Minecart
             new MobMapping("explosive-minecart", "org.bukkit.entity.minecart.ExplosiveMinecart", "Explosive Minecart"),
             // Hopper Minecart
@@ -319,6 +336,11 @@ else if(gethandle != null) {
                         i = findNext(i, "spiderjockey");    /* Make jockey */
                     }
                 }
+                else if(mobs[i].mobid.equals("chicken")) {    /* Check for jockey */
+                    if(le.getPassenger() != null) { /* Has passenger? */
+                        i = findNext(i, "chickenjockey");    /* Make jockey */
+                    }
+                }
                 else if(mobs[i].mobid.equals("wolf")) { /* Check for tamed wolf */
                     Wolf wolf = (Wolf)le;
                     if(wolf.isTamed()) {
@@ -339,18 +361,6 @@ else if(mobs[i].mobid.equals("ocelot")) { /* Check for tamed ocelot */
                         }
                     }
                 }
-                else if(mobs[i].mobid.equals("zombie")) {
-                    Zombie zom = (Zombie)le;
-                    if(zom.isVillager()) {
-                        i = findNext(i, "zombievilager");   /* Make in to zombie villager */
-                    }
-                }
-                else if(mobs[i].mobid.equals("skeleton")) {
-                    Skeleton sk = (Skeleton)le;
-                    if(sk.getSkeletonType() == SkeletonType.WITHER) {
-                        i = findNext(i, "witherskeleton");    /* Make in to wither skeleton */
-                    }
-                }
                 else if(mobs[i].mobid.equals("villager")) {
                     Villager v = (Villager)le;
                     Profession p = v.getProfession();
@@ -368,31 +378,16 @@ else if(mobs[i].mobid.equals("villager")) {
                             case LIBRARIAN:
                                 label = "Librarian";
                                 break;
+                            case NITWIT:
+                                label = "Nitwit";
+                                break;
                             case PRIEST:
                                 label = "Priest";
                                 break;
                         }
                     }
                 }                
-                else if(mobs[i].mobid.equals("vanillahorse")) {    /* Check for rider */
-                    Horse h = (Horse)le;
-                    Variant hv = h.getVariant();
-                    switch(hv) {
-                        case DONKEY:
-                            label = "Donkey";
-                            break;
-                        case MULE:
-                            label = "Mule";
-                            break;
-                        case UNDEAD_HORSE:
-                            label = "Undead Horse";
-                            break;
-                        case SKELETON_HORSE:
-                            label = "Skeleton Horse";
-                            break;
-                        default:
-                            break;
-                    }
+                else if(mobs[i].mobid.equals("vanillahorse") || mobs[i].mobid.equals("donkey") || mobs[i].mobid.equals("mule") || mobs[i].mobid.equals("zombiehorse") || mobs[i].mobid.equals("skeletonhorse")) {    /* Check for rider */
                     if(le.getPassenger() != null) { /* Has passenger? */
                         Entity e = le.getPassenger();
                         if (e instanceof Player) {

src/main/resources/8x8/chickenjockey.png

@@ -17,79 +17,57 @@ update:
   vehicles-per-tick: 20
 
 mobs:
-  # Include creepers
+  elderguardian: true
+  witherskeleton: true
+  stray: true
+  husk: true
+  zombievillager: true
+  evoker: true
+  vex: true
+  vindicator: true
   creeper: true
-  # Include skeletons
   skeleton: true
-  # Include zombies
-  zombie: true
-  # Include blazes
-  blaze: true
-  # Include ghasts
+  giant: true
   ghast: true
-  # Include silverfish
-  silverfish: true
-  # Include slimes
-  slime: true
-  # Include spiders
-  spider: true
-  # Include wolves
-  wolf: true
-  # Include zombie-pigmen
   zombiepigman: true
-  # Include Enderdragon
-  enderdragon: true
-  # Include snow golems
-  snowgolem: true
-  # Include cave spider
+  zombie: true
+  enderman: true
   cavespider: true
-  # Include spider jockey
+  spider: true
   spiderjockey: true
-  # Include enderman
-  enderman: true
-  # Include cows
-  cow: false
-  # Include pigs
-  pig: false
-  # Include chickens
-  chicken: false
-  # Include squids
-  squid: false
-  # Include sheep
-  sheep: false
-  # Include villagers
-  villager: false
-  # Include mooshroom
-  mooshroom: false
-  # Include tamed wolves
-  tamedwolf: true  
-  # Include ocelots
-  ocelot: true
-  # Include tamed cats
-  cat: true
-  # Include Iron golems
-  golem: false
-  # Include witches
-  witch: false
-  # Include wither skeletons
-  witherskeleton: true
-  # Include wither
+  silverfish: true
+  blaze: true
+  magmacube: true
+  slime: true
+  enderdragon: true
   wither: true
-  # Include zombie villager
-  zombievillager: true
-  # Include bats
-  bat: false
-  # Include horses (vanilla MC)
-  vanillahorse: false
-  # Include rabbits
-  rabbit: false
-  # Include endermites
+  witch: true
   endermite: true
-  # Include magma cube
-  magmacube: true
-  # Include guardian
   guardian: true
-  # Mo'Creatures Mobs
+  shulker: true
+  skeletonhorse: true
+  zombiehorse: true
+  donkey: true
+  mule: true
+  bat: true
+  pig: true
+  sheep: true
+  cow: true
+  chicken: true
+  chickenjockey: true
+  squid: true
+  wolf: true
+  tamedwolf: true
+  mooshroom: true
+  snowgolem: true
+  ocelot: true
+  cat: true
+  golem: true
+  vanillahorse: true
+  rabbit: true
+  vanillapolarbear: true
+  llama: true
+  villager: true
   horse: false
   fireogre: false
   caveogre: false
@@ -125,6 +103,7 @@ mobs:
 
 vehicles:
   # Specific minecart types
+  command-minecart: false
   explosive-minecart: false
   hopper-minecart: false
   powered-minecart: false