Merge pull request #5 from BONNePlayground/develop

Upgrade to Minecraft 1.18 and Java 17
BONNePlayground · Dec 6, 2021 · 504f264 · 504f264
2 parents f1a463d + 4796622
commit 504f264
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -17,16 +17,16 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>16</java.version>
+		<java.version>17</java.version>
 		<powermock.version>1.7.4</powermock.version>
 		<!-- More visible way how to change dependency versions -->
-		<spigot.version>1.17.1-R0.1-SNAPSHOT</spigot.version>
+		<spigot.version>1.18-R0.1-SNAPSHOT</spigot.version>
 		<bentobox.version>1.17.3</bentobox.version>
 		<level.version>2.5.0</level.version>
 		<!-- Revision variable removes warning about dynamic version -->
 		<revision>${build.version}-SNAPSHOT</revision>
 		<!-- This allows to change between versions and snapshots. -->
-		<build.version>1.3.0</build.version>
+		<build.version>1.4.0</build.version>
 		<build.number>-LOCAL</build.number>
 	</properties>
 
@@ -172,13 +172,13 @@
 		<dependency>
 			<groupId>io.github.iltotore</groupId>
 			<artifactId>customentity</artifactId>
-			<version>1.2.0</version>
+			<version>1.3.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>lv.id.bonne</groupId>
-			<artifactId>dragonfights-v1_17_r1</artifactId>
-			<version>1.2.0</version>
+			<artifactId>dragonfights-v1_18_r1</artifactId>
+			<version>1.3.0</version>
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>

diff --git a/src/main/java/lv/id/bonne/dragonfights/entity/BentoBoxEnderDragonRoot.java b/src/main/java/lv/id/bonne/dragonfights/entity/BentoBoxEnderDragonRoot.java
@@ -89,7 +89,7 @@ public Collection<BiomeSpawn> getSpawns(ServerVersion version)
 	 * Populate entities based on server version.
 	 */
 	{
-		this.setVersion(ServerVersion.v1_17, lv.id.bonne.dragonfights.v1_17_R1.entity.BentoBoxEnderDragonType::new);
+		this.setVersion(ServerVersion.v1_18, lv.id.bonne.dragonfights.v1_18_R1.entity.BentoBoxEnderDragonType::new);
 	}
 }
 
diff --git a/src/main/java/lv/id/bonne/dragonfights/entity/CustomEntityAPI.java b/src/main/java/lv/id/bonne/dragonfights/entity/CustomEntityAPI.java
@@ -53,6 +53,6 @@ public static NMSHandler getAPI()
 	 */
 	static
 	{
-		versions.put(ServerVersion.v1_17, lv.id.bonne.dragonfights.v1_17_R1.NMSHandler::new);
+		versions.put(ServerVersion.v1_18, lv.id.bonne.dragonfights.v1_18_R1.NMSHandler::new);
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,6 +53,6 @@ public static NMSHandler getAPI() @@
     	 */
     	static
     	{
-    		versions.put(ServerVersion.v1_17, lv.id.bonne.dragonfights.v1_17_R1.NMSHandler::new);
+    		versions.put(ServerVersion.v1_18, lv.id.bonne.dragonfights.v1_18_R1.NMSHandler::new);
     	}
     }