Skip to content

Commit b2f524d

Browse files
committed
Sort out issues with item name and ditch Oraxen module
1 parent b456049 commit b2f524d

6 files changed

Lines changed: 12 additions & 276 deletions

File tree

addon/plan/src/main/java/com/ghostchu/quickshop/addon/plan/util/DataUtil.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,12 @@ public String getItemName(@NotNull final DataRecord dataRecord) {
4949
return "[Failed to deserialize]";
5050
}
5151
String name = CommonUtil.prettifyText(stack.getType().name());
52-
if(stack.getItemMeta() != null && stack.getItemMeta().hasDisplayName()) {
53-
name = stack.getItemMeta().getDisplayName();
52+
if(stack.getItemMeta() != null) {
53+
if (stack.getItemMeta().hasItemName()) {
54+
name = stack.getItemMeta().getItemName();
55+
} else if (stack.getItemMeta().hasDisplayName()) {
56+
name = stack.getItemMeta().getDisplayName();
57+
}
5458
}
5559
return HtmlEscapers.htmlEscaper().escape(name);
5660
}
@@ -59,8 +63,12 @@ public String getItemName(@NotNull final DataRecord dataRecord) {
5963
public String getItemName(@NotNull final ItemStack stack) {
6064

6165
String name = CommonUtil.prettifyText(stack.getType().name());
62-
if(stack.getItemMeta() != null && stack.getItemMeta().hasDisplayName()) {
63-
name = stack.getItemMeta().getDisplayName();
66+
if(stack.getItemMeta() != null) {
67+
if (stack.getItemMeta().hasItemName()) {
68+
name = stack.getItemMeta().getItemName();
69+
} else if (stack.getItemMeta().hasDisplayName()) {
70+
name = stack.getItemMeta().getDisplayName();
71+
}
6472
}
6573
return HtmlEscapers.htmlEscaper().escape(name);
6674
}

compatibility/oraxen/.gitignore

Lines changed: 0 additions & 113 deletions
This file was deleted.

compatibility/oraxen/pom.xml

Lines changed: 0 additions & 94 deletions
This file was deleted.

compatibility/oraxen/src/main/java/com/ghostchu/quickshop/compatibility/oraxen/Main.java

Lines changed: 0 additions & 55 deletions
This file was deleted.

compatibility/oraxen/src/main/resources/plugin.yml

Lines changed: 0 additions & 9 deletions
This file was deleted.

pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,6 @@
470470
<module>compatibility/voidchest</module>
471471
<module>compatibility/worldedit</module>
472472
<module>compatibility/worldguard</module>
473-
<module>compatibility/oraxen</module>
474473
</modules>
475474

476475
</project>

0 commit comments

Comments
 (0)