Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating to 1.21.4 #266

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Updating to 1.21.4 #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dae5e9e
Skipping javadoc creation
minisat0shi Dec 11, 2024
c9136e2
Updating dependencies
minisat0shi Dec 11, 2024
82b529b
Adding 1.21.4 version
minisat0shi Dec 11, 2024
7e9a076
XEntityType fix
minisat0shi Dec 11, 2024
6e15efd
Update NMS_1_17.java
minisat0shi Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -66,4 +66,8 @@ publishing {
artifactId = "decentholograms"
}
}
}

tasks.withType(Javadoc) {
enabled = false
}
7 changes: 6 additions & 1 deletion src/main/java/eu/decentsoftware/holograms/api/nms/versions/NMS_1_17.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/eu/decentsoftware/holograms/api/utils/entity/DecentEntityType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
1 change: 1 addition & 0 deletions src/main/java/eu/decentsoftware/holograms/api/utils/reflect/Version.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
;

/*
Expand Down