1.16.5 compatibility - replaced org.bukkit dependencies with org.spig…

.gitignore

@@ -6,6 +6,9 @@
 # netbeans
 /nbproject
 
+# gradle
+/.gradle
+
 # we use maven!
 /build.xml
 

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'
 }

pom.xml

@@ -42,32 +42,32 @@
 			<snapshots>
 			</snapshots>
 			<id>bukkit-repo</id>
-			<url>http://hub.spigotmc.org/nexus/content/groups/public/</url>
+			<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
 		</repository>
 		<repository>
 			<releases>
 			</releases>
 			<snapshots>
 			</snapshots>
 			<id>dynmap-repo</id>
-			<url>http://repo.mikeprimm.com/</url>
+			<url>https://repo.mikeprimm.com/</url>
 		</repository>
 	</repositories>
 
   <dependencies>
   	<dependency>
-  		<groupId>org.bukkit</groupId>
-  		<artifactId>bukkit</artifactId>
-  		<version>1.15.1-R0.1-SNAPSHOT</version>
+  		<groupId>org.spigotmc</groupId>
+  		<artifactId>spigot-api</artifactId>
+  		<version>1.16.5-R0.1-SNAPSHOT</version>
   	</dependency>
   	<dependency>
   		<groupId>us.dynmap</groupId>
   		<artifactId>dynmap-api</artifactId>
-  		<version>3.0-SNAPSHOT</version>
+  		<version>3.2-SNAPSHOT</version>
   	</dependency>
   </dependencies>
   <properties>
   	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
-  <version>1.6-gabsoftware</version>
+  <version>1.8-beezlesoft</version>
 </project>

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[] = {

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,13 +104,15 @@ passive_mobs:
   panda: true
   parrot: true
   pig: true
+  piglin: true
   pufferfish: true
   rabbit: true
   salmon: true
   sheep: true
   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