Skip to content

Ensure name changers all support set/reset/delete if possible #8432

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

Merged
sovdeeth merged 2 commits into from
Mar 2, 2026
+14 −20
Merged

Ensure name changers all support set/reset/delete if possible #8432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2295a66
Ensure name changers all support set/reset/delete if possible
sovdeeth Feb 8, 2026
3a854a5
Merge branch 'dev/patch' into patch/unify-item-name-changers
sovdeeth Mar 2, 2026
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
16 changes: 5 additions & 11 deletions src/main/java/org/skriptlang/skript/bukkit/base/types/EntityClassInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,22 +174,16 @@ public String convert(Entity propertyHolder) {

@Override
public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
if (mode == ChangeMode.SET || mode == ChangeMode.RESET)
return CollectionUtils.array(String.class);
return null;
return switch (mode) {
case SET, RESET, DELETE -> new Class[] {String.class};
default -> null;
};
}

@Override
@SuppressWarnings("deprecation")
public void change(Entity entity, Object @Nullable [] delta, ChangeMode mode) {
assert mode == ChangeMode.SET || mode == ChangeMode.RESET;
String name;
if (mode == ChangeMode.RESET) {
name = null;
} else {
assert delta != null;
name = (String) delta[0];
}
String name = delta != null ? (String) delta[0] : null;
entity.setCustomName(name);
if (displayName || mode == ChangeMode.RESET)
entity.setCustomNameVisible(name != null);
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/org/skriptlang/skript/bukkit/base/types/ItemTypeClassInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,10 @@ public String convert(ItemType itemType) {

@Override
public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
if (mode == ChangeMode.SET || mode == ChangeMode.RESET)
return new Class[] {String.class};
return null;
return switch (mode) {
case SET, RESET, DELETE -> new Class[] {String.class};
default -> null;
};
}

@Override
Expand Down
11 changes: 5 additions & 6 deletions src/main/java/org/skriptlang/skript/bukkit/base/types/SlotClassInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,16 +161,15 @@ public String convert(Slot slot) {

@Override
public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
if (mode == ChangeMode.SET)
return new Class[] {String.class};
return null;
return switch (mode) {
case SET, RESET, DELETE -> new Class[] {String.class};
default -> null;
};
}

@Override
public void change(Slot named, Object @Nullable [] delta, ChangeMode mode) {
assert mode == ChangeMode.SET;
assert delta != null;
String name = (String) delta[0];
String name = delta != null ? (String) delta[0] : null;
ItemStack stack = named.getItem();
if (stack != null && !ItemUtils.isAir(stack.getType())) {
ItemMeta meta = stack.hasItemMeta() ? stack.getItemMeta() : Bukkit.getItemFactory().getItemMeta(stack.getType());
Expand Down