Skip to content

Commit b671cdb

Browse files
eccentricdevotioneccentricdevotion
authored
Keyed world identifiers (#1135)
* Start #1082 * More #1082 * Update deprecated code * Update GitHub Action Versions * Bump xyz.jpenilla:squaremap-api from 1.3.12 to 1.3.13 * Bump com.github.retrooper:packetevents-api from 2.12.0 to 2.12.1 * Bump com.palmergames.bukkit.towny:towny from 0.102.0.13 to 0.102.0.14 * Bump org.jsoup:jsoup from 1.22.1 to 1.22.2 * Fix wrong material name in trades.yml * Update TimeLordTraderSpawner.java * Even more #1082 * Start database update for keyed world names * Implement #1082 Travelling Time Lord trader * Fix keyed worlds database updater * Update to 'namespace:dimension' keys for worlds in database * Actually execute the db updates * Add missing keyed update fields * Backup database before attempting keyed world name conversions * Update some `APIStatus.@Obsolete` methods to current API * More `APIStatus.@Obselete` changes * Use world keys * More use world keys * The last of the `ApiStatus.@Obsolete` changes? * Oops, fix compile errors * Organise imports * More world key updates + remove getting world name aliases, as just too complicated * Fix dimension and plugin directory paths * Change world names to keys in all config files * Ossified are only spawned from death in the eye of harmony * Fix empty child * Tidy * Use lowercase planet key * Use correct path to world files when exterminating TARDIS in own world * Hopefully the last of the world keys * A few more `ApiStatus.@Obsolete` updates
1 parent f9c570c commit b671cdb

795 files changed

Lines changed: 3724 additions & 2782 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/gradle.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
branches: [ "master" ]
1010

1111
env:
12-
VERSION: '7.0.0'
12+
VERSION: '7.0.1'
1313
RELEASE_TAG: '26.1'
1414
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
1515

@@ -99,7 +99,7 @@ jobs:
9999
echo "today=$(date +'%d %B %Y %H:%M')" >> $GITHUB_OUTPUT
100100
101101
- name: Send Discord notification
102-
uses: stegzilla/discord-notify@v4
102+
uses: stegzilla/discord-notify@v5
103103
with:
104104
webhook_url: ${{ secrets.DISCORD_WEBHOOK_URL }}
105105
title: TARDIS Plugin Update

‎build.gradle.kts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ plugins {
1212

1313
group = "me.eccentric_nz"
1414
val buildNumber = "-b${System.getenv("BUILD_NUMBER") ?: (System.getenv("SHORT_SHA") ?: ".local")}"
15-
version = "7.0.0${buildNumber}"
15+
version = "7.0.1${buildNumber}"
1616

1717
repositories {
1818
mavenCentral()
@@ -99,7 +99,7 @@ dependencies {
9999
compileOnly("net.citizensnpcs:citizensapi:2.0.42-SNAPSHOT") {
100100
isTransitive = false
101101
}
102-
compileOnly("com.palmergames.bukkit.towny:towny:0.102.0.13") {
102+
compileOnly("com.palmergames.bukkit.towny:towny:0.102.0.14") {
103103
isTransitive = false
104104
}
105105
compileOnly("org.mvplugins.multiverse.core:multiverse-core:5.6.1") {
@@ -118,7 +118,7 @@ dependencies {
118118
compileOnly("com.griefcraft:lwc:2.4.2") {
119119
isTransitive = false
120120
}
121-
compileOnly("com.github.retrooper:packetevents-api:2.12.0") {
121+
compileOnly("com.github.retrooper:packetevents-api:2.12.1") {
122122
isTransitive = false
123123
}
124124
compileOnly("me.libraryaddict.disguises:libsdisguises:11.0.16") {
@@ -142,13 +142,13 @@ dependencies {
142142
compileOnly(files("libs/dynmap-api-3.8.jar"))
143143
compileOnly(files("libs/DynmapCoreAPI-3.8.jar"))
144144
compileOnly("de.bluecolored:bluemap-api:2.7.8")
145-
compileOnly("xyz.jpenilla:squaremap-api:1.3.12") {
145+
compileOnly("xyz.jpenilla:squaremap-api:1.3.13") {
146146
isTransitive = false
147147
}
148148
compileOnly(files("libs/VaultAPI.jar"))
149149
compileOnly("org.geysermc.floodgate:api:2.2.5-SNAPSHOT")
150150
compileOnly("org.geysermc.geyser:api:2.9.5-SNAPSHOT")
151-
compileOnly("org.jsoup:jsoup:1.22.1") {
151+
compileOnly("org.jsoup:jsoup:1.22.2") {
152152
isTransitive = false
153153
}
154154
compileOnly("org.popcraft:chunky-common:1.4.58")

‎src/main/java/me/eccentric_nz/TARDIS/ARS/ARSInventory.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,19 @@ private ItemStack[] getItemStack(Player player) {
6666
// direction pad up
6767
ItemStack pad_up = ItemStack.of(GUIArs.BUTTON_UP.material(), 1);
6868
ItemMeta up = pad_up.getItemMeta();
69-
up.displayName(Component.text(plugin.getLanguage().getString("BUTTON_UP", "Up")));
69+
up.customName(Component.text(plugin.getLanguage().getString("BUTTON_UP", "Up")));
7070
pad_up.setItemMeta(up);
7171
is[GUIArs.BUTTON_UP.slot()] = pad_up;
7272
// room relocator
7373
ItemStack relocator = ItemStack.of(GUIArs.BUTTON_RELOCATE.material(), 1);
7474
ItemMeta rim = relocator.getItemMeta();
75-
rim.displayName(Component.text("Room Relocator"));
75+
rim.customName(Component.text("Room Relocator"));
7676
relocator.setItemMeta(rim);
7777
is[GUIArs.BUTTON_RELOCATE.slot()] = relocator;
7878
// black wool
7979
ItemStack black = ItemStack.of(GUIArs.BUTTON_MAP_ON.material(), 1);
8080
ItemMeta wool = black.getItemMeta();
81-
wool.displayName(Component.text(plugin.getLanguage().getString("BUTTON_MAP_NO", "Load the map!")));
81+
wool.customName(Component.text(plugin.getLanguage().getString("BUTTON_MAP_NO", "Load the map!")));
8282
black.setItemMeta(wool);
8383
for (int j = 0; j < 37; j += 9) {
8484
for (int k = 0; k < 5; k++) {
@@ -89,73 +89,73 @@ private ItemStack[] getItemStack(Player player) {
8989
// direction pad left
9090
ItemStack pad_left = ItemStack.of(GUIArs.BUTTON_LEFT.material(), 1);
9191
ItemMeta left = pad_left.getItemMeta();
92-
left.displayName(Component.text(plugin.getLanguage().getString("BUTTON_LEFT", "Left")));
92+
left.customName(Component.text(plugin.getLanguage().getString("BUTTON_LEFT", "Left")));
9393
pad_left.setItemMeta(left);
9494
is[GUIArs.BUTTON_LEFT.slot()] = pad_left;
9595
// load map
9696
ItemStack map = ItemStack.of(GUIArs.BUTTON_MAP.material(), 1);
9797
ItemMeta load = map.getItemMeta();
98-
load.displayName(Component.text(plugin.getLanguage().getString("BUTTON_MAP", "Load map")));
98+
load.customName(Component.text(plugin.getLanguage().getString("BUTTON_MAP", "Load map")));
9999
map.setItemMeta(load);
100100
is[GUIArs.BUTTON_MAP.slot()] = map;
101101
// direction pad right
102102
ItemStack pad_right = ItemStack.of(GUIArs.BUTTON_RIGHT.material(), 1);
103103
ItemMeta right = pad_right.getItemMeta();
104-
right.displayName(Component.text(plugin.getLanguage().getString("BUTTON_RIGHT", "Right")));
104+
right.customName(Component.text(plugin.getLanguage().getString("BUTTON_RIGHT", "Right")));
105105
pad_right.setItemMeta(right);
106106
is[GUIArs.BUTTON_RIGHT.slot()] = pad_right;
107107
// set
108108
ItemStack s = ItemStack.of(GUIArs.BUTTON_RECON.material(), 1);
109109
ItemMeta sim = s.getItemMeta();
110-
sim.displayName(Component.text(plugin.getLanguage().getString("BUTTON_RECON", "Reconfigure!")));
110+
sim.customName(Component.text(plugin.getLanguage().getString("BUTTON_RECON", "Reconfigure!")));
111111
s.setItemMeta(sim);
112112
is[GUIArs.BUTTON_RECON.slot()] = s;
113113
// direction pad down
114114
ItemStack pad_down = ItemStack.of(GUIArs.BUTTON_DOWN.material(), 1);
115115
ItemMeta down = pad_down.getItemMeta();
116-
down.displayName(Component.text(plugin.getLanguage().getString("BUTTON_DOWN", "Down")));
116+
down.customName(Component.text(plugin.getLanguage().getString("BUTTON_DOWN", "Down")));
117117
pad_down.setItemMeta(down);
118118
is[GUIArs.BUTTON_DOWN.slot()] = pad_down;
119119
// level bottom
120120
ItemStack level_bot = ItemStack.of(GUIArs.BUTTON_LEVEL_B.material(), 1);
121121
ItemMeta bot = level_bot.getItemMeta();
122-
bot.displayName(Component.text(plugin.getLanguage().getString("BUTTON_LEVEL_B", "Bottom level")));
122+
bot.customName(Component.text(plugin.getLanguage().getString("BUTTON_LEVEL_B", "Bottom level")));
123123
level_bot.setItemMeta(bot);
124124
is[GUIArs.BUTTON_LEVEL_B.slot()] = level_bot;
125125
// level selected
126126
ItemStack level_sel = ItemStack.of(GUIArs.BUTTON_LEVEL.material(), 1);
127127
ItemMeta main = level_sel.getItemMeta();
128-
main.displayName(Component.text(plugin.getLanguage().getString("BUTTON_LEVEL", "Main level")));
128+
main.customName(Component.text(plugin.getLanguage().getString("BUTTON_LEVEL", "Main level")));
129129
level_sel.setItemMeta(main);
130130
is[GUIArs.BUTTON_LEVEL.slot()] = level_sel;
131131
// level top
132132
ItemStack level_top = ItemStack.of(GUIArs.BUTTON_LEVEL_T.material(), 1);
133133
ItemMeta top = level_top.getItemMeta();
134-
top.displayName(Component.text(plugin.getLanguage().getString("BUTTON_LEVEL_T", "Top level")));
134+
top.customName(Component.text(plugin.getLanguage().getString("BUTTON_LEVEL_T", "Top level")));
135135
level_top.setItemMeta(top);
136136
is[GUIArs.BUTTON_LEVEL_T.slot()] = level_top;
137137
// reset
138138
ItemStack reset = ItemStack.of(GUIArs.BUTTON_RESET.material(), 1);
139139
ItemMeta cobble = reset.getItemMeta();
140-
cobble.displayName(Component.text(plugin.getLanguage().getString("BUTTON_RESET", "Reset selected")));
140+
cobble.customName(Component.text(plugin.getLanguage().getString("BUTTON_RESET", "Reset selected")));
141141
reset.setItemMeta(cobble);
142142
is[GUIArs.BUTTON_RESET.slot()] = reset;
143143
// scroll left
144144
ItemStack scroll_left = ItemStack.of(GUIArs.BUTTON_SCROLL_L.material(), 1);
145145
ItemMeta nim = scroll_left.getItemMeta();
146-
nim.displayName(Component.text(plugin.getLanguage().getString("BUTTON_SCROLL_L", "Scroll left")));
146+
nim.customName(Component.text(plugin.getLanguage().getString("BUTTON_SCROLL_L", "Scroll left")));
147147
scroll_left.setItemMeta(nim);
148148
is[GUIArs.BUTTON_SCROLL_L.slot()] = scroll_left;
149149
// scroll right
150150
ItemStack scroll_right = ItemStack.of(GUIArs.BUTTON_SCROLL_R.material(), 1);
151151
ItemMeta pim = scroll_right.getItemMeta();
152-
pim.displayName(Component.text(plugin.getLanguage().getString("BUTTON_SCROLL_R", "Scroll right")));
152+
pim.customName(Component.text(plugin.getLanguage().getString("BUTTON_SCROLL_R", "Scroll right")));
153153
scroll_right.setItemMeta(pim);
154154
is[GUIArs.BUTTON_SCROLL_R.slot()] = scroll_right;
155155
// jettison
156156
ItemStack jettison = ItemStack.of(GUIArs.BUTTON_JETT.material(), 1);
157157
ItemMeta tnt = jettison.getItemMeta();
158-
tnt.displayName(Component.text(plugin.getLanguage().getString("BUTTON_JETT", "Jettison")));
158+
tnt.customName(Component.text(plugin.getLanguage().getString("BUTTON_JETT", "Jettison")));
159159
jettison.setItemMeta(tnt);
160160
is[GUIArs.BUTTON_JETT.slot()] = jettison;
161161

@@ -164,7 +164,7 @@ private ItemStack[] getItemStack(Player player) {
164164
if (a.isInGUI() && i < 54) {
165165
ItemStack room = ItemStack.of(Material.getMaterial(a.getMaterial()), 1);
166166
ItemMeta im = room.getItemMeta();
167-
im.displayName(Component.text(a.getDescriptiveName()));
167+
im.customName(Component.text(a.getDescriptiveName()));
168168
List<Component> lore = new ArrayList<>();
169169
lore.add(Component.text("Cost: " + plugin.getRoomsConfig().getInt("rooms." + a + ".cost")));
170170
String roomName = TARDISARS.ARSFor(room.getType().toString()).getConfigPath();

‎src/main/java/me/eccentric_nz/TARDIS/ARS/ARSListener.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public void onARSTerminalClick(InventoryClickEvent event) {
122122
} else {
123123
ItemStack stone = ItemStack.of(Material.STONE, 1);
124124
ItemMeta s1 = stone.getItemMeta();
125-
s1.displayName(Component.text("Empty slot"));
125+
s1.customName(Component.text("Empty slot"));
126126
stone.setItemMeta(s1);
127127
setSlot(view, selected_slot.get(playerUUID), stone, playerUUID, true);
128128
setLore(view, slot, null);
@@ -172,7 +172,7 @@ public void onARSTerminalClick(InventoryClickEvent event) {
172172
// need to check for gravity wells, and jettison both layers...
173173
ItemStack tnt = ItemStack.of(Material.TNT, 1);
174174
ItemMeta j = tnt.getItemMeta();
175-
j.displayName(Component.text("Jettison"));
175+
j.customName(Component.text("Jettison"));
176176
tnt.setItemMeta(j);
177177
setSlot(view, selected_slot.get(playerUUID), tnt, playerUUID, true);
178178
setLore(view, slot, null);
@@ -196,7 +196,7 @@ public void onARSTerminalClick(InventoryClickEvent event) {
196196
setLore(view, slot, "Jettison existing room first!");
197197
} else {
198198
ItemStack ris = view.getItem(slot);
199-
String displayName = ComponentUtils.stripColour(ris.getItemMeta().displayName());
199+
String displayName = ComponentUtils.stripColour(ris.getItemMeta().customName());
200200
String room = TARDISARS.ARSFor(ris.getType().toString()).getConfigPath();
201201
if (!TARDISPermission.hasPermission(player, "tardis.room." + room.toLowerCase(Locale.ROOT))) {
202202
break;

‎src/main/java/me/eccentric_nz/TARDIS/ARS/ARSMapInventory.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,62 +57,62 @@ private ItemStack[] getItemStack() {
5757
// up
5858
ItemStack pad_up = ItemStack.of(GUIMap.BUTTON_UP.material(), 1);
5959
ItemMeta up = pad_up.getItemMeta();
60-
up.displayName(Component.text(plugin.getLanguage().getString("BUTTON_UP", "Up")));
60+
up.customName(Component.text(plugin.getLanguage().getString("BUTTON_UP", "Up")));
6161
pad_up.setItemMeta(up);
6262
// down
6363
ItemStack pad_down = ItemStack.of(GUIMap.BUTTON_DOWN.material(), 1);
6464
ItemMeta down = pad_down.getItemMeta();
65-
down.displayName(Component.text(plugin.getLanguage().getString("BUTTON_DOWN", "Down")));
65+
down.customName(Component.text(plugin.getLanguage().getString("BUTTON_DOWN", "Down")));
6666
pad_down.setItemMeta(down);
6767
// left
6868
ItemStack pad_left = ItemStack.of(GUIMap.BUTTON_LEFT.material(), 1);
6969
ItemMeta left = pad_left.getItemMeta();
70-
left.displayName(Component.text(plugin.getLanguage().getString("BUTTON_LEFT", "Left")));
70+
left.customName(Component.text(plugin.getLanguage().getString("BUTTON_LEFT", "Left")));
7171
pad_left.setItemMeta(left);
7272
// right
7373
ItemStack pad_right = ItemStack.of(GUIMap.BUTTON_RIGHT.material(), 1);
7474
ItemMeta right = pad_right.getItemMeta();
75-
right.displayName(Component.text(plugin.getLanguage().getString("BUTTON_RIGHT", "Right")));
75+
right.customName(Component.text(plugin.getLanguage().getString("BUTTON_RIGHT", "Right")));
7676
pad_right.setItemMeta(right);
7777
// level selected
7878
ItemStack level_sel = ItemStack.of(GUIMap.BUTTON_LEVEL.material(), 1);
7979
ItemMeta main = level_sel.getItemMeta();
80-
main.displayName(Component.text(plugin.getLanguage().getString("BUTTON_LEVEL", "Main level")));
80+
main.customName(Component.text(plugin.getLanguage().getString("BUTTON_LEVEL", "Main level")));
8181
level_sel.setItemMeta(main);
8282
// level top
8383
ItemStack level_top = ItemStack.of(GUIMap.BUTTON_LEVEL_T.material(), 1);
8484
ItemMeta top = level_top.getItemMeta();
85-
top.displayName(Component.text(plugin.getLanguage().getString("BUTTON_LEVEL_T", "Top level")));
85+
top.customName(Component.text(plugin.getLanguage().getString("BUTTON_LEVEL_T", "Top level")));
8686
level_top.setItemMeta(top);
8787
// level top
8888
ItemStack level_bot = ItemStack.of(GUIMap.BUTTON_LEVEL_B.material(), 1);
8989
ItemMeta bot = level_bot.getItemMeta();
90-
bot.displayName(Component.text(plugin.getLanguage().getString("BUTTON_LEVEL_B", "Bottom level")));
90+
bot.customName(Component.text(plugin.getLanguage().getString("BUTTON_LEVEL_B", "Bottom level")));
9191
level_bot.setItemMeta(bot);
9292
// stone
9393
ItemStack black = ItemStack.of(GUIMap.BUTTON_MAP_ON.material(), 1);
9494
ItemMeta wool = black.getItemMeta();
95-
wool.displayName(Component.text(plugin.getLanguage().getString("BUTTON_MAP", "Load map")));
95+
wool.customName(Component.text(plugin.getLanguage().getString("BUTTON_MAP", "Load map")));
9696
black.setItemMeta(wool);
9797
// load map
9898
ItemStack loa = ItemStack.of(GUIMap.BUTTON_MAP.material(), 1);
9999
ItemMeta der = loa.getItemMeta();
100-
der.displayName(Component.text(plugin.getLanguage().getString("BUTTON_MAP_NO", "Load the map!")));
100+
der.customName(Component.text(plugin.getLanguage().getString("BUTTON_MAP_NO", "Load the map!")));
101101
loa.setItemMeta(der);
102102
// close
103103
ItemStack close = ItemStack.of(GUIMap.BUTTON_CLOSE.material(), 1);
104104
ItemMeta gui = close.getItemMeta();
105-
gui.displayName(Component.text(plugin.getLanguage().getString("BUTTON_CLOSE", "Close")));
105+
gui.customName(Component.text(plugin.getLanguage().getString("BUTTON_CLOSE", "Close")));
106106
close.setItemMeta(gui);
107107
// transmat
108108
ItemStack tran = ItemStack.of(GUIMap.BUTTON_TRANSMAT.material(), 1);
109109
ItemMeta smat = tran.getItemMeta();
110-
smat.displayName(Component.text(plugin.getLanguage().getString("BUTTON_TRANSMAT", "Transmat")));
110+
smat.customName(Component.text(plugin.getLanguage().getString("BUTTON_TRANSMAT", "Transmat")));
111111
tran.setItemMeta(smat);
112112
// where am I?
113113
ItemStack where = ItemStack.of(GUIMap.BUTTON_WHERE.material(), 1);
114114
ItemMeta ami = where.getItemMeta();
115-
ami.displayName(Component.text(plugin.getLanguage().getString("BUTTON_WHERE", "Where am I?")));
115+
ami.customName(Component.text(plugin.getLanguage().getString("BUTTON_WHERE", "Where am I?")));
116116
where.setItemMeta(ami);
117117

118118
return new ItemStack[]{

‎src/main/java/me/eccentric_nz/TARDIS/ARS/ARSMapListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public void onARSMapClick(InventoryClickEvent event) {
129129
ItemStack is = view.getItem(slot);
130130
if (is != null) {
131131
ItemMeta im = is.getItemMeta();
132-
String dn = ComponentUtils.stripColour(im.displayName());
132+
String dn = ComponentUtils.stripColour(im.customName());
133133
if (!dn.equals("Empty slot")) {
134134
selectedLocation.put(playerUUID, is.getType().toString());
135135
// get selected slot

‎src/main/java/me/eccentric_nz/TARDIS/ARS/ARSMethods.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ private String[][] sliceGrid(String[][] layer, int x, int z) {
157157
void setSlot(InventoryView view, int slot, Material material, String room, UUID playerUUID, boolean showPerms) {
158158
ItemStack is = ItemStack.of(material, 1);
159159
ItemMeta im = is.getItemMeta();
160-
im.displayName(Component.text(room));
160+
im.customName(Component.text(room));
161161
if (!room.equals("Empty slot")) {
162162
ARS ars = TARDISARS.ARSFor(material.toString());
163163
String config_path = ars.getConfigPath();
@@ -287,7 +287,7 @@ public void switchLevel(InventoryView view, int slot, UUID playerUUID) {
287287
}
288288
ItemStack is = ItemStack.of(material, 1);
289289
ItemMeta im = is.getItemMeta();
290-
im.displayName(Component.text(levels[i - 27]));
290+
im.customName(Component.text(levels[i - 27]));
291291
is.setItemMeta(im);
292292
setSlot(view, i, is, playerUUID, false);
293293
}

0 commit comments

Comments
 (0)