Skip to content

Commit 1db7fe3

Browse files
Biomes are keyed not enums
1 parent 3cac78e commit 1db7fe3

File tree

7 files changed

+13
-8
lines changed

7 files changed

+13
-8
lines changed

src/main/java/me/eccentric_nz/TARDIS/advanced/TARDISConsoleCloseListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ public void onInventoryClose(InventoryCloseEvent event) {
186186
plugin.getMessenger().send(p, TardisModule.TARDIS, "TRAVEL_NO_PERM_BIOME");
187187
continue;
188188
}
189-
if (current.location().getBlock().getBiome().toString().equals(first)) {
189+
if (current.location().getBlock().getBiome().getKey().value().toUpperCase(Locale.ROOT).equals(first)) {
190190
continue;
191191
}
192192
Biome biome;

src/main/java/me/eccentric_nz/TARDIS/commands/handles/TARDISHandlesScanCommand.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import java.util.ArrayList;
3939
import java.util.HashMap;
4040
import java.util.List;
41+
import java.util.Locale;
4142

4243
/**
4344
* @author eccentric_nz
@@ -171,7 +172,7 @@ boolean sayScan() {
171172
BukkitScheduler bsched = plugin.getServer().getScheduler();
172173
bsched.scheduleSyncDelayedTask(plugin, () -> plugin.getMessenger().handlesSend(player, "SCAN_DIRECTION", tardisDirection.toString()), 20L);
173174
// get biome
174-
String biome = scan_loc.getBlock().getBiome().toString();
175+
String biome = scan_loc.getBlock().getBiome().getKey().value().toUpperCase(Locale.ROOT);
175176
bsched.scheduleSyncDelayedTask(plugin, () -> plugin.getMessenger().handlesSend(player, "BIOME_TYPE", biome), 40L);
176177
bsched.scheduleSyncDelayedTask(plugin, () -> plugin.getMessenger().handlesSend(player, "SCAN_TIME", daynight + " / " + time), 60L);
177178
// get weather

src/main/java/me/eccentric_nz/TARDIS/control/TARDISScanner.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import java.util.ArrayList;
4545
import java.util.HashMap;
4646
import java.util.List;
47+
import java.util.Locale;
4748

4849
/**
4950
* The Scanner consists of a collection of thousands of instruments designed to
@@ -216,7 +217,7 @@ public TARDISScannerData getScannerData(Player player, int id, BukkitScheduler b
216217
plugin.getMessenger().send(player, TardisModule.TARDIS, "SONIC_COORDS", scan_loc.getBlockX() + ":" + scan_loc.getBlockY() + ":" + scan_loc.getBlockZ());
217218
bsched.scheduleSyncDelayedTask(plugin, () -> plugin.getMessenger().send(player, TardisModule.TARDIS, "SCAN_DIRECTION", tardisDirection.toString()), 20L);
218219
// get biome
219-
String biome = scan_loc.getBlock().getBiome().toString();
220+
String biome = scan_loc.getBlock().getBiome().getKey().value().toUpperCase(Locale.ROOT);
220221
data.setScannedBiome(biome);
221222
bsched.scheduleSyncDelayedTask(plugin, () -> plugin.getMessenger().send(player, TardisModule.TARDIS, "BIOME_TYPE", biome), 40L);
222223
bsched.scheduleSyncDelayedTask(plugin, () -> plugin.getMessenger().send(player, TardisModule.TARDIS, "SCAN_TIME", dayNight + " / " + time), 60L);

src/main/java/me/eccentric_nz/TARDIS/handles/TARDISHandlesProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ void processCommand(int pos) {
396396
plugin.getMessenger().handlesSend(player, "TRAVEL_NO_PERM_BIOME");
397397
continue;
398398
}
399-
if (current.location().getBlock().getBiome().toString().equals(first)) {
399+
if (current.location().getBlock().getBiome().getKey().value().toUpperCase(Locale.ROOT).equals(first)) {
400400
continue;
401401
}
402402
Biome biome;

src/main/java/me/eccentric_nz/TARDIS/placeholders/TARDISPlaceholderExpansion.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.bukkit.OfflinePlayer;
2525

2626
import java.util.HashMap;
27+
import java.util.Locale;
2728

2829
public class TARDISPlaceholderExpansion extends PlaceholderExpansion {
2930

@@ -258,7 +259,7 @@ public String onRequest(OfflinePlayer player, String identifier) {
258259
rsc = new ResultSetCurrentFromId(plugin, rsti.getTardisId());
259260
if (rsc.resultSet()) {
260261
// get from current location
261-
result = rsc.getCurrent().location().getBlock().getBiome().toString();
262+
result = rsc.getCurrent().location().getBlock().getBiome().getKey().value().toUpperCase(Locale.ROOT);
262263
} else {
263264
result = "";
264265
}

src/main/java/me/eccentric_nz/TARDIS/sonic/actions/TARDISSonicScanner.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import java.util.ArrayList;
3535
import java.util.HashMap;
3636
import java.util.List;
37+
import java.util.Locale;
3738

3839
public class TARDISSonicScanner {
3940

@@ -122,7 +123,7 @@ public static void scan(TARDIS plugin, Location scan_loc, Player player) {
122123
plugin.getMessenger().send(player, TardisModule.TARDIS, "SONIC_COORDS", scan_loc.getBlockX() + ":" + scan_loc.getBlockY() + ":" + scan_loc.getBlockZ());
123124
}, 20L);
124125
// get biome
125-
String biome = scan_loc.getBlock().getBiome().toString();
126+
String biome = scan_loc.getBlock().getBiome().getKey().value().toUpperCase(Locale.ROOT);
126127
bsched.scheduleSyncDelayedTask(plugin, () -> plugin.getMessenger().send(player, TardisModule.TARDIS, "BIOME_TYPE", biome), 40L);
127128
bsched.scheduleSyncDelayedTask(plugin, () -> plugin.getMessenger().send(player, TardisModule.TARDIS, "SCAN_TIME", daynight + " / " + time), 60L);
128129
// get weather

src/main/java/me/eccentric_nz/TARDIS/utility/TARDISUtils.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838

3939
import java.util.HashMap;
4040
import java.util.List;
41+
import java.util.Locale;
4142

4243
/**
4344
* Various utility methods.
@@ -245,7 +246,7 @@ public String actionBarFormat(Player player) {
245246
TARDISDisplayType displayType = plugin.getTrackerKeeper().getDisplay().get(player.getUniqueId());
246247
return switch (displayType) {
247248
case BIOME -> displayType.getFormat()
248-
.replace("%BIOME%", player.getLocation().getBlock().getBiome().toString());
249+
.replace("%BIOME%", player.getLocation().getBlock().getBiome().getKey().value().toUpperCase(Locale.ROOT));
249250
case COORDS -> displayType.getFormat()
250251
.replace("%X%", String.format("%,d", player.getLocation().getBlockX()))
251252
.replace("%Y%", String.format("%,d", player.getLocation().getBlockY()))
@@ -269,7 +270,7 @@ public String actionBarFormat(Player player) {
269270
.replace("%FACING_XZ%", getFacingXZ(player))
270271
.replace("%YAW%", String.format("%.1f", player.getLocation().getYaw()))
271272
.replace("%PITCH%", String.format("%.1f", player.getLocation().getPitch()))
272-
.replace("%BIOME%", player.getLocation().getBlock().getBiome().toString())
273+
.replace("%BIOME%", player.getLocation().getBlock().getBiome().getKey().value().toUpperCase(Locale.ROOT))
273274
.replace("%TARGET_BLOCK%", player.getTargetBlock(null, 5).getType().toString());
274275
};
275276
}

0 commit comments

Comments
 (0)