diff --git a/pom.xml b/pom.xml
index 1a8f1a3..f277758 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
bukkit-repo
- http://repo.bukkit.org/content/repositories/releases/
+ http://hub.spigotmc.org/nexus/content/groups/public/
@@ -58,7 +58,7 @@
org.bukkit
bukkit
- 1.7.10-R0.1-SNAPSHOT
+ 1.11-R0.1-SNAPSHOT
us.dynmap
diff --git a/src/main/java/org/dynmap/mobs/DynmapMobsPlugin.java b/src/main/java/org/dynmap/mobs/DynmapMobsPlugin.java
index 370d61b..2081a4c 100644
--- a/src/main/java/org/dynmap/mobs/DynmapMobsPlugin.java
+++ b/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) {
diff --git a/src/main/resources/8x8/chickenjockey.png b/src/main/resources/8x8/chickenjockey.png
new file mode 100644
index 0000000..4c3f5bf
Binary files /dev/null and b/src/main/resources/8x8/chickenjockey.png differ
diff --git a/src/main/resources/8x8/command-minecart.png b/src/main/resources/8x8/command-minecart.png
new file mode 100644
index 0000000..f2f9787
Binary files /dev/null and b/src/main/resources/8x8/command-minecart.png differ
diff --git a/src/main/resources/8x8/donkey.png b/src/main/resources/8x8/donkey.png
new file mode 100644
index 0000000..6b6909b
Binary files /dev/null and b/src/main/resources/8x8/donkey.png differ
diff --git a/src/main/resources/8x8/elderguardian.png b/src/main/resources/8x8/elderguardian.png
new file mode 100644
index 0000000..b745f1e
Binary files /dev/null and b/src/main/resources/8x8/elderguardian.png differ
diff --git a/src/main/resources/8x8/evoker.png b/src/main/resources/8x8/evoker.png
new file mode 100644
index 0000000..f4730ed
Binary files /dev/null and b/src/main/resources/8x8/evoker.png differ
diff --git a/src/main/resources/8x8/explosive-minecart.png b/src/main/resources/8x8/explosive-minecart.png
index c2bf4b8..25fe228 100644
Binary files a/src/main/resources/8x8/explosive-minecart.png and b/src/main/resources/8x8/explosive-minecart.png differ
diff --git a/src/main/resources/8x8/hopper-minecart.png b/src/main/resources/8x8/hopper-minecart.png
index c2bf4b8..6ff44df 100644
Binary files a/src/main/resources/8x8/hopper-minecart.png and b/src/main/resources/8x8/hopper-minecart.png differ
diff --git a/src/main/resources/8x8/husk.png b/src/main/resources/8x8/husk.png
new file mode 100644
index 0000000..fb34b95
Binary files /dev/null and b/src/main/resources/8x8/husk.png differ
diff --git a/src/main/resources/8x8/llama.png b/src/main/resources/8x8/llama.png
new file mode 100644
index 0000000..341bdc9
Binary files /dev/null and b/src/main/resources/8x8/llama.png differ
diff --git a/src/main/resources/8x8/minecart.png b/src/main/resources/8x8/minecart.png
index c2bf4b8..324ceaf 100644
Binary files a/src/main/resources/8x8/minecart.png and b/src/main/resources/8x8/minecart.png differ
diff --git a/src/main/resources/8x8/mule.png b/src/main/resources/8x8/mule.png
new file mode 100644
index 0000000..f1442ca
Binary files /dev/null and b/src/main/resources/8x8/mule.png differ
diff --git a/src/main/resources/8x8/powered-minecart.png b/src/main/resources/8x8/powered-minecart.png
index c2bf4b8..a54b72c 100644
Binary files a/src/main/resources/8x8/powered-minecart.png and b/src/main/resources/8x8/powered-minecart.png differ
diff --git a/src/main/resources/8x8/shulker.png b/src/main/resources/8x8/shulker.png
new file mode 100644
index 0000000..ce73757
Binary files /dev/null and b/src/main/resources/8x8/shulker.png differ
diff --git a/src/main/resources/8x8/skeletonhorse.png b/src/main/resources/8x8/skeletonhorse.png
new file mode 100644
index 0000000..04a84b2
Binary files /dev/null and b/src/main/resources/8x8/skeletonhorse.png differ
diff --git a/src/main/resources/8x8/spawner-minecart.png b/src/main/resources/8x8/spawner-minecart.png
index c2bf4b8..88da74c 100644
Binary files a/src/main/resources/8x8/spawner-minecart.png and b/src/main/resources/8x8/spawner-minecart.png differ
diff --git a/src/main/resources/8x8/storage-minecart.png b/src/main/resources/8x8/storage-minecart.png
index c2bf4b8..f3c35f6 100644
Binary files a/src/main/resources/8x8/storage-minecart.png and b/src/main/resources/8x8/storage-minecart.png differ
diff --git a/src/main/resources/8x8/stray.png b/src/main/resources/8x8/stray.png
new file mode 100644
index 0000000..5f57679
Binary files /dev/null and b/src/main/resources/8x8/stray.png differ
diff --git a/src/main/resources/8x8/vanillahorse.png b/src/main/resources/8x8/vanillahorse.png
index bdce222..98f3a62 100644
Binary files a/src/main/resources/8x8/vanillahorse.png and b/src/main/resources/8x8/vanillahorse.png differ
diff --git a/src/main/resources/8x8/vanillapolarbear.png b/src/main/resources/8x8/vanillapolarbear.png
new file mode 100644
index 0000000..d3dd42a
Binary files /dev/null and b/src/main/resources/8x8/vanillapolarbear.png differ
diff --git a/src/main/resources/8x8/vex.png b/src/main/resources/8x8/vex.png
new file mode 100644
index 0000000..4352087
Binary files /dev/null and b/src/main/resources/8x8/vex.png differ
diff --git a/src/main/resources/8x8/vindicator.png b/src/main/resources/8x8/vindicator.png
new file mode 100644
index 0000000..c279c58
Binary files /dev/null and b/src/main/resources/8x8/vindicator.png differ
diff --git a/src/main/resources/8x8/zombiehorse.png b/src/main/resources/8x8/zombiehorse.png
new file mode 100644
index 0000000..d548dcf
Binary files /dev/null and b/src/main/resources/8x8/zombiehorse.png differ
diff --git a/src/main/resources/chickenjockey.png b/src/main/resources/chickenjockey.png
new file mode 100644
index 0000000..b88fc6b
Binary files /dev/null and b/src/main/resources/chickenjockey.png differ
diff --git a/src/main/resources/command-minecart.png b/src/main/resources/command-minecart.png
new file mode 100644
index 0000000..59b10f4
Binary files /dev/null and b/src/main/resources/command-minecart.png differ
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 0718928..fb5e57f 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -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
diff --git a/src/main/resources/donkey.png b/src/main/resources/donkey.png
new file mode 100644
index 0000000..aed814d
Binary files /dev/null and b/src/main/resources/donkey.png differ
diff --git a/src/main/resources/elderguardian.png b/src/main/resources/elderguardian.png
new file mode 100644
index 0000000..e5ca4ae
Binary files /dev/null and b/src/main/resources/elderguardian.png differ
diff --git a/src/main/resources/evoker.png b/src/main/resources/evoker.png
new file mode 100644
index 0000000..7660469
Binary files /dev/null and b/src/main/resources/evoker.png differ
diff --git a/src/main/resources/explosive-minecart.png b/src/main/resources/explosive-minecart.png
index 8f0bba4..97b5140 100644
Binary files a/src/main/resources/explosive-minecart.png and b/src/main/resources/explosive-minecart.png differ
diff --git a/src/main/resources/hopper-minecart.png b/src/main/resources/hopper-minecart.png
index 8f0bba4..f111829 100644
Binary files a/src/main/resources/hopper-minecart.png and b/src/main/resources/hopper-minecart.png differ
diff --git a/src/main/resources/husk.png b/src/main/resources/husk.png
new file mode 100644
index 0000000..91912c7
Binary files /dev/null and b/src/main/resources/husk.png differ
diff --git a/src/main/resources/llama.png b/src/main/resources/llama.png
new file mode 100644
index 0000000..9d2e727
Binary files /dev/null and b/src/main/resources/llama.png differ
diff --git a/src/main/resources/mule.png b/src/main/resources/mule.png
new file mode 100644
index 0000000..6c8fa66
Binary files /dev/null and b/src/main/resources/mule.png differ
diff --git a/src/main/resources/powered-minecart.png b/src/main/resources/powered-minecart.png
index 8f0bba4..614957b 100644
Binary files a/src/main/resources/powered-minecart.png and b/src/main/resources/powered-minecart.png differ
diff --git a/src/main/resources/shulker.png b/src/main/resources/shulker.png
new file mode 100644
index 0000000..b96df2b
Binary files /dev/null and b/src/main/resources/shulker.png differ
diff --git a/src/main/resources/skeletonhorse.png b/src/main/resources/skeletonhorse.png
new file mode 100644
index 0000000..94b6c2c
Binary files /dev/null and b/src/main/resources/skeletonhorse.png differ
diff --git a/src/main/resources/spawner-minecart.png b/src/main/resources/spawner-minecart.png
index 8f0bba4..297bd2f 100644
Binary files a/src/main/resources/spawner-minecart.png and b/src/main/resources/spawner-minecart.png differ
diff --git a/src/main/resources/storage-minecart.png b/src/main/resources/storage-minecart.png
index 8f0bba4..f3d9482 100644
Binary files a/src/main/resources/storage-minecart.png and b/src/main/resources/storage-minecart.png differ
diff --git a/src/main/resources/stray.png b/src/main/resources/stray.png
new file mode 100644
index 0000000..9feee87
Binary files /dev/null and b/src/main/resources/stray.png differ
diff --git a/src/main/resources/vanillahorse.png b/src/main/resources/vanillahorse.png
index 679f61f..9da09a1 100644
Binary files a/src/main/resources/vanillahorse.png and b/src/main/resources/vanillahorse.png differ
diff --git a/src/main/resources/vanillapolarbear.png b/src/main/resources/vanillapolarbear.png
new file mode 100644
index 0000000..2422343
Binary files /dev/null and b/src/main/resources/vanillapolarbear.png differ
diff --git a/src/main/resources/vex.png b/src/main/resources/vex.png
new file mode 100644
index 0000000..effe66d
Binary files /dev/null and b/src/main/resources/vex.png differ
diff --git a/src/main/resources/vindicator.png b/src/main/resources/vindicator.png
new file mode 100644
index 0000000..e176c6e
Binary files /dev/null and b/src/main/resources/vindicator.png differ
diff --git a/src/main/resources/zombiehorse.png b/src/main/resources/zombiehorse.png
new file mode 100644
index 0000000..d078e63
Binary files /dev/null and b/src/main/resources/zombiehorse.png differ