Merge pull request #25 from BONNePlayground/develop

Add Minecraft 1.20.2 compatibility.
BONNePlayground · Oct 11, 2023 · a19646e · a19646e
2 parents 6bb4c7a + 5e3db74
commit a19646e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git 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.20-R0.1-SNAPSHOT</spigot.version>
+		<spigot.version>1.20.2-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.7.0</build.version>
+		<build.version>1.8.0</build.version>
 		<build.number>-LOCAL</build.number>
 	</properties>
 
@@ -170,7 +170,7 @@
 		<dependency>
 			<groupId>io.github.iltotore</groupId>
 			<artifactId>customentity</artifactId>
-			<version>1.6.0</version>
+			<version>1.7.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -197,6 +197,12 @@
 			<version>1.6.0</version>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>lv.id.bonne</groupId>
+			<artifactId>dragonfights-v1_20_r2</artifactId>
+			<version>1.7.0</version>
+			<scope>compile</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/src/main/java/lv/id/bonne/dragonfights/DragonFightsPladdon.java b/src/main/java/lv/id/bonne/dragonfights/DragonFightsPladdon.java
@@ -17,8 +17,8 @@
 /**
  * @author bonne
  */
-@Plugin(name="DragonFights", version="1.6.0")
-@ApiVersion(ApiVersion.Target.v1_18)
+@Plugin(name="DragonFights", version="1.7.0")
+@ApiVersion(ApiVersion.Target.v1_19)
 public class DragonFightsPladdon extends Pladdon
 {
     @Override

diff --git a/src/main/java/lv/id/bonne/dragonfights/entity/BentoBoxEnderDragonRoot.java b/src/main/java/lv/id/bonne/dragonfights/entity/BentoBoxEnderDragonRoot.java
@@ -93,6 +93,7 @@ public Collection<BiomeSpawn> getSpawns(ServerVersion version)
 		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);
+		this.setVersion(ServerVersion.v1_20_2, lv.id.bonne.dragonfights.v1_20_R2.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
@@ -57,5 +57,6 @@ public static NMSHandler getAPI()
 		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);
+		versions.put(ServerVersion.v1_20_2, lv.id.bonne.dragonfights.v1_20_R2.NMSHandler::new);
 	}
 }