From dae5e9e377887c5f3d8a61514d5d975a14e5f765 Mon Sep 17 00:00:00 2001 From: minisatoshi <19712510+minisat0shi@users.noreply.github.com> Date: Tue, 10 Dec 2024 19:24:51 -0500 Subject: [PATCH 1/5] Skipping javadoc creation --- build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.gradle b/build.gradle index 4678fdf..cdb2ec1 100644 --- a/build.gradle +++ b/build.gradle @@ -66,4 +66,8 @@ publishing { artifactId = "decentholograms" } } +} + +tasks.withType(Javadoc) { + enabled = false } \ No newline at end of file From c9136e2937630d184f07c12483ef5ff186350e69 Mon Sep 17 00:00:00 2001 From: minisatoshi <19712510+minisat0shi@users.noreply.github.com> Date: Tue, 10 Dec 2024 19:25:32 -0500 Subject: [PATCH 2/5] Updating dependencies latest stats & nbt-api (snapshot for 1.21.4) --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index cdb2ec1..e9b141a 100644 --- a/build.gradle +++ b/build.gradle @@ -21,9 +21,9 @@ dependencies { compileOnly "me.clip:placeholderapi:2.11.6" compileOnly "com.arcaniax:HeadDatabase-API:1.3.2" - implementation "org.bstats:bstats-bukkit:3.0.2" - implementation "de.tr7zw:item-nbt-api:2.14.0" - implementation "com.github.cryptomorin:XSeries:10.0.0" + implementation "org.bstats:bstats-bukkit:3.1.0" + implementation "de.tr7zw:item-nbt-api:2.14.1-SNAPSHOT" + implementation "com.github.cryptomorin:XSeries:12.0.0" compileOnly "org.projectlombok:lombok:1.18.34" annotationProcessor "org.projectlombok:lombok:1.18.34" From 82b529bee71b599801a682956cbe7ccc11b4d897 Mon Sep 17 00:00:00 2001 From: minisatoshi <19712510+minisat0shi@users.noreply.github.com> Date: Tue, 10 Dec 2024 19:26:39 -0500 Subject: [PATCH 3/5] Adding 1.21.4 version --- .../eu/decentsoftware/holograms/api/utils/reflect/Version.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/eu/decentsoftware/holograms/api/utils/reflect/Version.java b/src/main/java/eu/decentsoftware/holograms/api/utils/reflect/Version.java index 6e80bcf..5f48307 100644 --- a/src/main/java/eu/decentsoftware/holograms/api/utils/reflect/Version.java +++ b/src/main/java/eu/decentsoftware/holograms/api/utils/reflect/Version.java @@ -37,6 +37,7 @@ public enum Version { v1_20_R4(20, "1.20.5", "1.20.6"), v1_21_R1(21, "1.21", "1.21.1"), v1_21_R2(21, "1.21.2", "1.21.3"), + v1_21_R3(21, "1.21.4"), ; /* From 7e9a076f4dd21a8a073e3f077c3b5de76c52a09f Mon Sep 17 00:00:00 2001 From: minisatoshi <19712510+minisat0shi@users.noreply.github.com> Date: Tue, 10 Dec 2024 19:28:21 -0500 Subject: [PATCH 4/5] XEntityType fix --- .../holograms/api/utils/entity/DecentEntityType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/eu/decentsoftware/holograms/api/utils/entity/DecentEntityType.java b/src/main/java/eu/decentsoftware/holograms/api/utils/entity/DecentEntityType.java index 859f1cd..824ab36 100644 --- a/src/main/java/eu/decentsoftware/holograms/api/utils/entity/DecentEntityType.java +++ b/src/main/java/eu/decentsoftware/holograms/api/utils/entity/DecentEntityType.java @@ -85,7 +85,7 @@ public static EntityType parseEntityType(String string) { } XEntityType entityType = ENTITY_TYPE_ALIASES.get(Common.removeSpacingChars(string).toLowerCase()); if (entityType == null) { - entityType = XEntityType.of(string); + entityType = XEntityType.of(string).orElse(null); } if (entityType != null && isAllowed(entityType)) { return entityType.get(); From 6e15efd2b5c15dd86803114790cba3b4fed804c3 Mon Sep 17 00:00:00 2001 From: minisatoshi <19712510+minisat0shi@users.noreply.github.com> Date: Tue, 10 Dec 2024 19:30:26 -0500 Subject: [PATCH 5/5] Update NMS_1_17.java --- .../holograms/api/nms/versions/NMS_1_17.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/decentsoftware/holograms/api/nms/versions/NMS_1_17.java b/src/main/java/eu/decentsoftware/holograms/api/nms/versions/NMS_1_17.java index 3514dc3..3a1c15b 100644 --- a/src/main/java/eu/decentsoftware/holograms/api/nms/versions/NMS_1_17.java +++ b/src/main/java/eu/decentsoftware/holograms/api/nms/versions/NMS_1_17.java @@ -181,7 +181,12 @@ public class NMS_1_17 extends NMS { } // DATA WATCHER OBJECT if (Version.afterOrEqual(18)) { - if (Version.afterOrEqual(Version.v1_21_R2)) { + if (Version.afterOrEqual(Version.v1_21_R3)) { + DWO_ENTITY_DATA = new ReflectField<>(ENTITY_CLASS, "am").getValue(null); + DWO_CUSTOM_NAME = new ReflectField<>(ENTITY_CLASS, "aO").getValue(null); + DWO_CUSTOM_NAME_VISIBLE = new ReflectField<>(ENTITY_CLASS, "aP").getValue(null); + DWO_ARMOR_STAND_DATA = new ReflectField<>(ENTITY_ARMOR_STAND_CLASS, "bI").getValue(null); + } else if (Version.afterOrEqual(Version.v1_21_R2)) { DWO_ENTITY_DATA = new ReflectField<>(ENTITY_CLASS, "am").getValue(null); DWO_CUSTOM_NAME = new ReflectField<>(ENTITY_CLASS, "aO").getValue(null); DWO_CUSTOM_NAME_VISIBLE = new ReflectField<>(ENTITY_CLASS, "aP").getValue(null);