diff --git a/.gitignore b/.gitignore index 408c231..a9c6bd2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,9 @@ # netbeans /nbproject +# gradle +/.gradle + # we use maven! /build.xml diff --git a/build.gradle b/build.gradle index 442f5f5..bb482c4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'java' -apply plugin: 'maven' +apply plugin: 'maven-publish' group = 'dynmap-mobs' -version = '1.6-gabsoftware' +version = '1.8-beezlesoft' -description = "Unofficial build with 1.15.1 support" +description = "Unofficial build with 1.16.5 support" -sourceCompatibility = 1.6 -targetCompatibility = 1.6 +sourceCompatibility = 1.8 +targetCompatibility = 1.8 tasks.withType(JavaCompile) { options.encoding = 'UTF-8' } @@ -16,11 +16,11 @@ tasks.withType(JavaCompile) { repositories { - maven { url "http://hub.spigotmc.org/nexus/content/groups/public/" } - maven { url "http://repo.mikeprimm.com/" } + maven { url "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" } + maven { url "https://repo.mikeprimm.com/" } maven { url "https://repo.maven.apache.org/maven2" } } dependencies { - compile group: 'org.bukkit', name: 'bukkit', version:'1.15.1-R0.1-SNAPSHOT' - compile group: 'us.dynmap', name: 'dynmap-api', version:'3.0-SNAPSHOT' + compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT' + compileOnly 'us.dynmap:dynmap-api:3.2-SNAPSHOT' } diff --git a/pom.xml b/pom.xml index 89aad48..74239fb 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ bukkit-repo - http://hub.spigotmc.org/nexus/content/groups/public/ + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ @@ -50,24 +50,24 @@ dynmap-repo - http://repo.mikeprimm.com/ + https://repo.mikeprimm.com/ - org.bukkit - bukkit - 1.15.1-R0.1-SNAPSHOT + org.spigotmc + spigot-api + 1.16.5-R0.1-SNAPSHOT us.dynmap dynmap-api - 3.0-SNAPSHOT + 3.2-SNAPSHOT UTF-8 - 1.6-gabsoftware + 1.8-beezlesoft \ No newline at end of file diff --git a/src/main/java/org/dynmap/mobs/DynmapMobsPlugin.java b/src/main/java/org/dynmap/mobs/DynmapMobsPlugin.java index dd42e53..0febfb9 100644 --- a/src/main/java/org/dynmap/mobs/DynmapMobsPlugin.java +++ b/src/main/java/org/dynmap/mobs/DynmapMobsPlugin.java @@ -173,7 +173,7 @@ public void init() { new MobMapping("ghast", "org.bukkit.entity.Ghast", "Ghast"), new MobMapping("drowned", "org.bukkit.entity.Drowned", "Drowned"), new MobMapping("phantom", "org.bukkit.entity.Phantom", "Phantom"), - new MobMapping("zombiepigman", "org.bukkit.entity.PigZombie", "Zombie Pigman"), + new MobMapping("zombiepigman", "org.bukkit.entity.PigZombie", "Zombified Piglin"), 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"), @@ -191,7 +191,9 @@ public void init() { new MobMapping("shulker", "org.bukkit.entity.Shulker", "Shulker"), new MobMapping("ravager", "org.bukkit.entity.Ravager", "Ravager"), new MobMapping("illusioner", "org.bukkit.entity.Illusioner", "Illusioner"), - new MobMapping("pillager", "org.bukkit.entity.Pillager", "Pillager") + new MobMapping("pillager", "org.bukkit.entity.Pillager", "Pillager"), + new MobMapping("piglinbrute", "org.bukkit.entity.PiglinBruge", "Piglin Brute"), + new MobMapping("zoglin", "org.bukkit.entity.Zoglin", "Zoglin") }; private MobMapping config_passive_mobs[] = { @@ -230,7 +232,11 @@ public void init() { new MobMapping("parrot", "org.bukkit.entity.Parrot", "Parrot"), new MobMapping("panda", "org.bukkit.entity.Panda", "Panda"), new MobMapping("vanillafox", "org.bukkit.entity.Fox", "Fox" ), - new MobMapping("bee", "org.bukkit.entity.Bee", "Bee" ) + new MobMapping("bee", "org.bukkit.entity.Bee", "Bee" ), + new MobMapping("hoglin", "org.bukkit.entity.Hoglin", "Hoglin"), + new MobMapping("piglin", "org.bukkit.entity.Piglin", "Piglin"), + new MobMapping("strider", "org.bukkit.entity.Strider", "Strider") + }; private MobMapping config_vehicles[] = { diff --git a/src/main/resources/8x8/hoglin.png b/src/main/resources/8x8/hoglin.png new file mode 100644 index 0000000..708718e Binary files /dev/null and b/src/main/resources/8x8/hoglin.png differ diff --git a/src/main/resources/8x8/piglin.png b/src/main/resources/8x8/piglin.png new file mode 100644 index 0000000..fa8e0e3 Binary files /dev/null and b/src/main/resources/8x8/piglin.png differ diff --git a/src/main/resources/8x8/piglinbrute.png b/src/main/resources/8x8/piglinbrute.png new file mode 100644 index 0000000..bef2614 Binary files /dev/null and b/src/main/resources/8x8/piglinbrute.png differ diff --git a/src/main/resources/8x8/strider.png b/src/main/resources/8x8/strider.png new file mode 100644 index 0000000..12f7a07 Binary files /dev/null and b/src/main/resources/8x8/strider.png differ diff --git a/src/main/resources/8x8/zoglin.png b/src/main/resources/8x8/zoglin.png new file mode 100644 index 0000000..5bb5cc5 Binary files /dev/null and b/src/main/resources/8x8/zoglin.png differ diff --git a/src/main/resources/8x8/zombiepigman.png b/src/main/resources/8x8/zombiepigman.png index 79c9532..8072850 100644 Binary files a/src/main/resources/8x8/zombiepigman.png and b/src/main/resources/8x8/zombiepigman.png differ diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index ed0c237..304b848 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -67,6 +67,7 @@ hostile_mobs: illusioner: true magmacube: true phantom: true + piglinbrute: true pillager: true ravager: true shulker: true @@ -81,12 +82,14 @@ hostile_mobs: witch: true wither: true witherskeleton: true + zoglin: true zombie: true zombiepigman: true zombievillager: true passive_mobs: bat: true + bee: true cat: true chicken: true chickenjockey: true @@ -101,6 +104,7 @@ passive_mobs: panda: true parrot: true pig: true + piglin: true pufferfish: true rabbit: true salmon: true @@ -108,6 +112,7 @@ passive_mobs: skeletonhorse: true snowgolem: true squid: true + strider: true tamedwolf: true traderllama: true tropicalfish: true @@ -120,7 +125,6 @@ passive_mobs: wandering_trader: true wolf: true zombiehorse: true - bee: true vehicles: # Specific minecart types diff --git a/src/main/resources/hoglin.png b/src/main/resources/hoglin.png new file mode 100644 index 0000000..8daf7ff Binary files /dev/null and b/src/main/resources/hoglin.png differ diff --git a/src/main/resources/piglin.png b/src/main/resources/piglin.png new file mode 100644 index 0000000..e64b982 Binary files /dev/null and b/src/main/resources/piglin.png differ diff --git a/src/main/resources/piglinbrute.png b/src/main/resources/piglinbrute.png new file mode 100644 index 0000000..2d81b27 Binary files /dev/null and b/src/main/resources/piglinbrute.png differ diff --git a/src/main/resources/strider.png b/src/main/resources/strider.png new file mode 100644 index 0000000..0c960f2 Binary files /dev/null and b/src/main/resources/strider.png differ diff --git a/src/main/resources/zoglin.png b/src/main/resources/zoglin.png new file mode 100644 index 0000000..8e80ee4 Binary files /dev/null and b/src/main/resources/zoglin.png differ diff --git a/src/main/resources/zombiepigman.png b/src/main/resources/zombiepigman.png index e55f6e8..cf3345a 100644 Binary files a/src/main/resources/zombiepigman.png and b/src/main/resources/zombiepigman.png differ