From 5530b6f86f403620120defd0f5bd93574fb77d8a Mon Sep 17 00:00:00 2001
From: BONNe <bonne@bonne.id.lv>
Date: Thu, 8 Jun 2023 15:22:39 +0300
Subject: [PATCH] Add Minecraft 1.20 compatibility. Drop 1.18 compatibility.

---
 pom.xml                                       | 24 +++++++------------
 .../entity/BentoBoxEnderDragonRoot.java       |  3 +--
 .../dragonfights/entity/CustomEntityAPI.java  |  3 +--
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index 84077de..e3a9675 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,13 +20,13 @@
 		<java.version>17</java.version>
 		<powermock.version>1.7.4</powermock.version>
 		<!-- More visible way how to change dependency versions -->
-		<spigot.version>1.19.4-R0.1-SNAPSHOT</spigot.version>
-		<bentobox.version>1.20.0</bentobox.version>
+		<spigot.version>1.20-R0.1-SNAPSHOT</spigot.version>
+		<bentobox.version>1.23.0</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.6.0</build.version>
+		<build.version>1.7.0</build.version>
 		<build.number>-LOCAL</build.number>
 	</properties>
 
@@ -170,37 +170,31 @@
 		<dependency>
 			<groupId>io.github.iltotore</groupId>
 			<artifactId>customentity</artifactId>
-			<version>1.5.0</version>
+			<version>1.6.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>lv.id.bonne</groupId>
-			<artifactId>dragonfights-v1_18_r1</artifactId>
-			<version>1.5.0</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>lv.id.bonne</groupId>
-			<artifactId>dragonfights-v1_18_r2</artifactId>
+			<artifactId>dragonfights-v1_19_r1</artifactId>
 			<version>1.5.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>lv.id.bonne</groupId>
-			<artifactId>dragonfights-v1_19_r1</artifactId>
+			<artifactId>dragonfights-v1_19_r2</artifactId>
 			<version>1.5.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>lv.id.bonne</groupId>
-			<artifactId>dragonfights-v1_19_r2</artifactId>
+			<artifactId>dragonfights-v1_19_r3</artifactId>
 			<version>1.5.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>lv.id.bonne</groupId>
-			<artifactId>dragonfights-v1_19_r3</artifactId>
-			<version>1.5.0</version>
+			<artifactId>dragonfights-v1_20_r1</artifactId>
+			<version>1.6.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
index 45d4c60..84ff600 100644
--- a/src/main/java/lv/id/bonne/dragonfights/entity/BentoBoxEnderDragonRoot.java
+++ b/src/main/java/lv/id/bonne/dragonfights/entity/BentoBoxEnderDragonRoot.java
@@ -89,11 +89,10 @@ public Collection<BiomeSpawn> getSpawns(ServerVersion version)
 	 * Populate entities based on server version.
 	 */
 	{
-		this.setVersion(ServerVersion.v1_18_1, lv.id.bonne.dragonfights.v1_18_R1.entity.BentoBoxEnderDragonType::new);
-		this.setVersion(ServerVersion.v1_18_2, lv.id.bonne.dragonfights.v1_18_R2.entity.BentoBoxEnderDragonType::new);
 		this.setVersion(ServerVersion.v1_19_1, lv.id.bonne.dragonfights.v1_19_R1.entity.BentoBoxEnderDragonType::new);
 		this.setVersion(ServerVersion.v1_19_2, lv.id.bonne.dragonfights.v1_19_R2.entity.BentoBoxEnderDragonType::new);
 		this.setVersion(ServerVersion.v1_19_3, lv.id.bonne.dragonfights.v1_19_R3.entity.BentoBoxEnderDragonType::new);
+		this.setVersion(ServerVersion.v1_20, lv.id.bonne.dragonfights.v1_20_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
index fd597ba..607c5c1 100644
--- a/src/main/java/lv/id/bonne/dragonfights/entity/CustomEntityAPI.java
+++ b/src/main/java/lv/id/bonne/dragonfights/entity/CustomEntityAPI.java
@@ -53,10 +53,9 @@ public static NMSHandler getAPI()
 	 */
 	static
 	{
-		versions.put(ServerVersion.v1_18_1, lv.id.bonne.dragonfights.v1_18_R1.NMSHandler::new);
-		versions.put(ServerVersion.v1_18_2, lv.id.bonne.dragonfights.v1_18_R2.NMSHandler::new);
 		versions.put(ServerVersion.v1_19_1, lv.id.bonne.dragonfights.v1_19_R1.NMSHandler::new);
 		versions.put(ServerVersion.v1_19_2, lv.id.bonne.dragonfights.v1_19_R2.NMSHandler::new);
 		versions.put(ServerVersion.v1_19_3, lv.id.bonne.dragonfights.v1_19_R3.NMSHandler::new);
+		versions.put(ServerVersion.v1_20, lv.id.bonne.dragonfights.v1_20_R1.NMSHandler::new);
 	}
 }
\ No newline at end of file