Merge pull request #168 from JustinDevB/master

1.21 Support
Jumper251 · Jun 19, 2024 · c0572fd · c0572fd
2 parents d0ddeda + c328a5c
commit c0572fd
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.jumper251</groupId>
     <artifactId>AdvancedReplay</artifactId>
-    <version>1.8.5</version>
+    <version>1.8.6</version>
 
     <repositories>
         <!-- This adds the Spigot Maven repository to the build -->
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.20.2-R0.1-SNAPSHOT</version>
+            <version>1.21-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <!--1.12.2 for legacy method -->
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>com.comphenix.protocol</groupId>
             <artifactId>ProtocolLib</artifactId>
-            <version>5.1.0</version>
+            <version>5.3.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/src/main/java/me/jumper251/replay/filesystem/ItemConfig.java b/src/main/java/me/jumper251/replay/filesystem/ItemConfig.java
@@ -84,7 +84,7 @@ public static ItemConfigType getByIdAndName(Material material, String name) {
 		for (ItemConfigType type : items.keySet()) {
 			ItemConfigOption option = items.get(type);
 
-			if (option.getMaterial() == Material.WOOD_DOOR && (VersionUtil.isCompatible(VersionEnum.V1_13) || VersionUtil.isCompatible(VersionEnum.V1_14) || VersionUtil.isCompatible(VersionEnum.V1_15) || VersionUtil.isCompatible(VersionEnum.V1_16) || VersionUtil.isCompatible(VersionEnum.V1_17) || VersionUtil.isCompatible(VersionEnum.V1_18) || VersionUtil.isCompatible(VersionEnum.V1_19) || VersionUtil.isCompatible(VersionEnum.V1_20))) {
+			if (option.getMaterial() == Material.WOOD_DOOR && (VersionUtil.isCompatible(VersionEnum.V1_13) || VersionUtil.isCompatible(VersionEnum.V1_14) || VersionUtil.isCompatible(VersionEnum.V1_15) || VersionUtil.isCompatible(VersionEnum.V1_16) || VersionUtil.isCompatible(VersionEnum.V1_17) || VersionUtil.isCompatible(VersionEnum.V1_18) || VersionUtil.isCompatible(VersionEnum.V1_19) || VersionUtil.isCompatible(VersionEnum.V1_20) || VersionUtil.isCompatible(VersionEnum.V1_21))) {
 				if (material.name().equals(MaterialBridge.WOOD_DOOR.getMaterialName()) && option.getName().equals(name)) return type;
 			}
 

diff --git a/src/main/java/me/jumper251/replay/replaysystem/replaying/ReplayingUtils.java b/src/main/java/me/jumper251/replay/replaysystem/replaying/ReplayingUtils.java
@@ -524,13 +524,13 @@ public void run() {
 				if (id == 11) id = 10;
 
 				if (ConfigManager.REAL_CHANGES) {
-					if (VersionUtil.isCompatible(VersionEnum.V1_13) || VersionUtil.isCompatible(VersionEnum.V1_14) || VersionUtil.isCompatible(VersionEnum.V1_15) || VersionUtil.isCompatible(VersionEnum.V1_16) || VersionUtil.isCompatible(VersionEnum.V1_17) || VersionUtil.isCompatible(VersionEnum.V1_18) || VersionUtil.isCompatible(VersionEnum.V1_19) || VersionUtil.isCompatible(VersionEnum.V1_20)) {
+					if (VersionUtil.isCompatible(VersionEnum.V1_13) || VersionUtil.isCompatible(VersionEnum.V1_14) || VersionUtil.isCompatible(VersionEnum.V1_15) || VersionUtil.isCompatible(VersionEnum.V1_16) || VersionUtil.isCompatible(VersionEnum.V1_17) || VersionUtil.isCompatible(VersionEnum.V1_18) || VersionUtil.isCompatible(VersionEnum.V1_19) || VersionUtil.isCompatible(VersionEnum.V1_20) || VersionUtil.isCompatible(VersionEnum.V1_21)) {
 						loc.getBlock().setType(getBlockMaterial(blockChange.getAfter()), true);
 					} else {
 						loc.getBlock().setTypeIdAndData(id, (byte) subId, true);
 					}
 				} else {
-					if (VersionUtil.isCompatible(VersionEnum.V1_13) || VersionUtil.isCompatible(VersionEnum.V1_14) || VersionUtil.isCompatible(VersionEnum.V1_15) || VersionUtil.isCompatible(VersionEnum.V1_16) || VersionUtil.isCompatible(VersionEnum.V1_17) || VersionUtil.isCompatible(VersionEnum.V1_18) || VersionUtil.isCompatible(VersionEnum.V1_19) || VersionUtil.isCompatible(VersionEnum.V1_20)) {
+					if (VersionUtil.isCompatible(VersionEnum.V1_13) || VersionUtil.isCompatible(VersionEnum.V1_14) || VersionUtil.isCompatible(VersionEnum.V1_15) || VersionUtil.isCompatible(VersionEnum.V1_16) || VersionUtil.isCompatible(VersionEnum.V1_17) || VersionUtil.isCompatible(VersionEnum.V1_18) || VersionUtil.isCompatible(VersionEnum.V1_19) || VersionUtil.isCompatible(VersionEnum.V1_20) || VersionUtil.isCompatible(VersionEnum.V1_21)) {
 						replayer.getWatchingPlayer().sendBlockChange(loc, getBlockMaterial(blockChange.getAfter()), (byte) subId);
 					} else {
 						replayer.getWatchingPlayer().sendBlockChange(loc, id, (byte) subId);

diff --git a/src/main/java/me/jumper251/replay/replaysystem/utils/entities/EntityMappings.java b/src/main/java/me/jumper251/replay/replaysystem/utils/entities/EntityMappings.java
@@ -107,6 +107,9 @@ private void createMappings() {
 		entityLookup.put("ALLAY", 114);
 		entityLookup.put("CAMEL", 115);
 		entityLookup.put("SNIFFER", 116);
+		entityLookup.put("ARMADILLO", 117);
+		entityLookup.put("BREEZE", 118);
+		entityLookup.put("BOGGED", 119);
 	}
 
 	public static EntityMappings getInstance() {

diff --git a/src/main/java/me/jumper251/replay/utils/MaterialBridge.java b/src/main/java/me/jumper251/replay/utils/MaterialBridge.java
@@ -30,7 +30,7 @@ public String getMaterialName() {
 
 	@SuppressWarnings("deprecation")
 	public static Material fromID(int id) {
-		if (VersionUtil.isCompatible(VersionEnum.V1_13) || VersionUtil.isCompatible(VersionEnum.V1_14) || VersionUtil.isCompatible(VersionEnum.V1_15) || VersionUtil.isCompatible(VersionEnum.V1_16) || VersionUtil.isCompatible(VersionEnum.V1_17) || VersionUtil.isCompatible(VersionEnum.V1_18) || VersionUtil.isCompatible(VersionEnum.V1_19) || VersionUtil.isCompatible(VersionEnum.V1_20)) {
+		if (VersionUtil.isCompatible(VersionEnum.V1_13) || VersionUtil.isCompatible(VersionEnum.V1_14) || VersionUtil.isCompatible(VersionEnum.V1_15) || VersionUtil.isCompatible(VersionEnum.V1_16) || VersionUtil.isCompatible(VersionEnum.V1_17) || VersionUtil.isCompatible(VersionEnum.V1_18) || VersionUtil.isCompatible(VersionEnum.V1_19) || VersionUtil.isCompatible(VersionEnum.V1_20) || VersionUtil.isCompatible(VersionEnum.V1_21)) {
 			for (Material mat : Material.values()) {
 				if (mat.getId() == id) return mat;
 			}

diff --git a/src/main/java/me/jumper251/replay/utils/VersionUtil.java b/src/main/java/me/jumper251/replay/utils/VersionUtil.java
@@ -67,7 +67,10 @@ public enum VersionEnum {
 		V1_17(10),
 		V1_18(11),
 		V1_19(12),
-		V1_20(13);
+		V1_20(13),
+		CRAFTBUK(14),
+		V1_21(15);
+
 
 		private int order;