1.20 Mob Support

.github/workflows/maven-publish.yml

@@ -0,0 +1,34 @@
+name: Maven CI/CD
+
+on:
+ push:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 14
+      uses: actions/setup-java@v1
+      with:
+        java-version: 14
+
+    - name: Build project with Maven
+      run: mvn -B package --file pom.xml
+  publish-job:
+    runs-on: ubuntu-latest
+    needs: [build]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 14
+      - run: mvn -B package --file pom.xml -DskipTests
+      - run: mkdir staging && cp target/*.jar staging
+      - uses: actions/upload-artifact@v1
+        with:
+          name: Package
+          path: staging

README

@@ -0,0 +1,5 @@
+Dynmap-mobs for 1.18+
+
+HOW TO COMPILE:
+use Maven to package with mvn package
+

pom.xml

@@ -28,8 +28,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.0.2</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 
@@ -42,32 +42,39 @@
 			<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.11-R0.1-SNAPSHOT</version>
+  		<groupId>org.spigotmc</groupId>
+  		<artifactId>spigot-api</artifactId>
+  		<version>1.20.1-R0.1-SNAPSHOT</version>
   	</dependency>
+<!-- bStats -->
+    <dependency>
+      <groupId>org.bstats</groupId>
+      <artifactId>bstats-bukkit</artifactId>
+      <version>3.0.2</version>
+      <scope>compile</scope>
+    </dependency>
   	<dependency>
   		<groupId>us.dynmap</groupId>
   		<artifactId>dynmap-api</artifactId>
-  		<version>2.2-SNAPSHOT</version>
+  		<version>3.6-SNAPSHOT</version>
   	</dependency>
   </dependencies>
   <properties>
   	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
-  <version>1.4</version>
-</project>
+  <version>1.8</version>
+</project>

src/main/assembly/package.xml

@@ -1,4 +1,5 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
   <id>bin</id>
   <includeBaseDirectory>false</includeBaseDirectory>
   <formats>

src/main/resources/config.yml

@@ -16,90 +16,124 @@ update:
   # Vehicle updates per tick (prevent lag spikes when large number of vehicles)
   vehicles-per-tick: 20
 
-mobs:
+mocreat_mobs:
+  bear: false
+  bigcat: false
+  bird: false
+  boar: false
+  bunny: false
+  caveogre: false
+  crocodile: false
+  deer: false
+  dolphin: false
+  duck: false
+  fireogre: false
+  fishy: false
+  flamewraith: false
+  fox: false
+  goat: false
+  hellrat: false
+  horse: false
+  jellyfish: false
+  kitty: false
+  mouse: false
+  ogre: false
+  ostrich: false
+  polarbear: false
+  rat: false
+  ray: false
+  scorpion: false
+  shark: false
+  snake: false
+  turtle: false
+  werewolf: false
+  wildwolf: false
+  wraith: false
+
+hostile_mobs:
+  blaze: true
+  cavespider: true
+  creeper: true
+  drowned: true
   elderguardian: true
-  witherskeleton: true
-  stray: true
-  husk: true
-  zombievillager: true
+  enderdragon: true
+  enderman: true
+  endermite: true
   evoker: true
-  vex: true
-  vindicator: true
-  creeper: true
-  skeleton: true
-  giant: true
   ghast: true
-  zombiepigman: true
-  zombie: true
-  enderman: true
-  cavespider: true
-  spider: true
-  spiderjockey: true
-  silverfish: true
-  blaze: true
+  giant: true
+  guardian: true
+  hoglin: true
+  husk: true
+  illusioner: true
   magmacube: true
+  phantom: true
+  piglin: true
+  pillager: true
+  ravager: true
+  shulker: true
+  silverfish: true
+  skeleton: true
   slime: true
-  enderdragon: true
-  wither: true
+  spider: true
+  spiderjockey: true
+  stray: true
+  vex: true
+  vindicator: true
+  warden: true
   witch: true
-  endermite: true
-  guardian: true
-  shulker: true
-  skeletonhorse: true
-  zombiehorse: true
+  wither: true
+  witherskeleton: true
+  zoglin: true
+  zombie: true
+  zombiepigman: true
+  zombievillager: true
+
+passive_mobs:
+  allay: true
+  bat: true
+  camel: true
+  cat: true
+  chicken: true
+  chickenjockey: true
+  cod: true
+  cow: true
   donkey: true
+  frog: true
+  golem: true
+  llama: true
+  mooshroom: true
   mule: true
-  bat: true
+  ocelot: true
+  panda: true
+  parrot: true
   pig: true
+  pufferfish: true
+  rabbit: true
+  salmon: true
   sheep: true
-  cow: true
-  chicken: true
-  chickenjockey: true
+  skeletonhorse: true
+  snowgolem: true
   squid: true
-  wolf: true
+  strider: true
+  sniffer: true
+  tadpole: true
   tamedwolf: true
-  mooshroom: true
-  snowgolem: true
-  ocelot: true
-  cat: true
-  golem: true
+  traderllama: true
+  tropicalfish: true
+  vanilladolphin: true
+  vanillafox: true
   vanillahorse: true
-  rabbit: true
   vanillapolarbear: true
-  llama: true
+  vanillaturtle: true
   villager: true
-  horse: false
-  fireogre: false
-  caveogre: false
-  ogre: false
-  boar: false
-  polarbear: false
-  bear: false
-  duck: false
-  bigcat: false
-  deer: false
-  wildwolf: false
-  flamewraith: false
-  wraith: false
-  bunny: false
-  bird: false
-  fox: false
-  werewolf: false
-  shark: false
-  dolphin: false
-  fishy: false
-  kitty: false
-  hellrat: false
-  rat: false
-  mouse: false
-  scorpion: false
-  turtle: false
-  crocodile: false
-  ray: false
-  jellyfish: false
-  goat: false
-  snake: false
-  ostrich: false
+  wandering_trader: true
+  wolf: true
+  zombiehorse: true
+  bee: true
+  glowsquid: true
+  vanillagoat: true
+  axolotl: true
 
 vehicles:
   # Specific minecart types
@@ -112,9 +146,40 @@ vehicles:
   minecart: false
   # Boats
   boat: false
+  chest-boat: false
 
-layer:
-  name: "Mobs"
+mocreatlayer:
+  name: "Mo'Creatures Mobs"
+  # Make mobs layer hidden by default
+  hidebydefault: false
+  # ordering priority in layer menu (low goes before high - default is 0)
+  layerprio: 10
+  # (optional) if true, use tiny marker icons (8x8) - default is 16x16
+  tinyicons: false
+  # (optional) if true, don't show labels on mob icons
+  nolabels: false
+  # (optional) set minimum zoom level when mob icons should be visible (0=default, any zoom)
+  minzoom: 0
+  # (optional) include coordinate in label for icon
+  inc-coord: false
+
+hostilelayer:
+  name: "Hostile Mobs"
+  # Make mobs layer hidden by default
+  hidebydefault: false
+  # ordering priority in layer menu (low goes before high - default is 0)
+  layerprio: 10
+  # (optional) if true, use tiny marker icons (8x8) - default is 16x16
+  tinyicons: false
+  # (optional) if true, don't show labels on mob icons
+  nolabels: false
+  # (optional) set minimum zoom level when mob icons should be visible (0=default, any zoom)
+  minzoom: 0
+  # (optional) include coordinate in label for icon
+  inc-coord: false
+
+passivelayer:
+  name: "Passive Mobs"
   # Make mobs layer hidden by default
   hidebydefault: false
   # ordering priority in layer menu (low goes before high - default is 0)
@@ -141,4 +206,4 @@ vehiclelayer:
   minzoom: 0
   # (optional) include coordinate in label for icon
   inc-coord: false
-
+

src/main/resources/plugin.yml

@@ -1,6 +1,7 @@
 name: dynmap-mobs
 main: org.dynmap.mobs.DynmapMobsPlugin
 version: "${project.version}"
+api-version: "1.18"
 author: mikeprimm
 depend: [ dynmap ]