Improve world guesser

TechnicJelle · Feb 17, 2024 · 1f511d6 · 1f511d6
1 parent 2d2040f
commit 1f511d6
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/...n/java/com/technicjelle/bluemapofflineplayermarkers/core/fileloader/FileMarkerLoader.java b/...n/java/com/technicjelle/bluemapofflineplayermarkers/core/fileloader/FileMarkerLoader.java
@@ -49,7 +49,7 @@ public static void loadOfflineMarkers() {
 
 	private static void loadOfflineMarker(Path playerDataFile, BlueMapAPI api) {
 		final String fileName = playerDataFile.getFileName().toString();
-		Singletons.getLogger().fine("Loading playerdata file: " + fileName);
+		Singletons.getLogger().info("Loading playerdata file: " + fileName);
 
 		final String uuidString = fileName.replace(".dat", "");
 		final UUID playerUUID;

diff --git a/src/main/java/com/technicjelle/bluemapofflineplayermarkers/impl/paper/PaperServer.java b/src/main/java/com/technicjelle/bluemapofflineplayermarkers/impl/paper/PaperServer.java
@@ -2,7 +2,6 @@
 
 import com.destroystokyo.paper.profile.PlayerProfile;
 import com.technicjelle.bluemapofflineplayermarkers.common.Server;
-import com.technicjelle.bluemapofflineplayermarkers.core.Singletons;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
@@ -72,16 +71,33 @@ public String getPlayerName(UUID playerUUID) {
 	public Optional<UUID> guessWorldUUID(Object object) {
 		if (object instanceof String) {
 			String dimensionString = (String) object;
-			@Nullable World world = server.getWorld(dimensionString);
-			if (world == null) return Optional.empty();
-			return Optional.of(world.getUID());
+
+			//Try to get world by name
+			{
+				@Nullable World world = server.getWorld(dimensionString);
+				if (world != null) {
+					return Optional.of(world.getUID());
+				}
+			}
+
+			//Try to get world by dimension
+			for (World world : server.getWorlds()) {
+				switch (world.getEnvironment()) {
+					case NORMAL:
+						if (dimensionString.contains("overworld")) return Optional.of(world.getUID());
+					case NETHER:
+						if (dimensionString.contains("the_nether")) return Optional.of(world.getUID());
+					case THE_END:
+						if (dimensionString.contains("the_end")) return Optional.of(world.getUID());
+				}
+			}
 		}
 
 		if (object instanceof Integer) {
 			int dimensionInt = (Integer) object;
 			for (World world : server.getWorlds()) {
 				@SuppressWarnings("deprecation") int worldID = world.getEnvironment().getId();
-				if (worldID == dimensionInt) return Optional.ofNullable(world.getUID());
+				if (worldID == dimensionInt) return Optional.of(world.getUID());
 			}
 		}
 

diff --git a/src/main/java/com/technicjelle/bluemapofflineplayermarkers/impl/paper/PlayerBukkitData.java b/src/main/java/com/technicjelle/bluemapofflineplayermarkers/impl/paper/PlayerBukkitData.java
@@ -32,6 +32,6 @@ public Vector3d getPosition() {
 
 	@Override
 	public Optional<UUID> getWorldUUID() {
-		return Optional.ofNullable(player.getWorld().getUID());
+		return Optional.of(player.getWorld().getUID());
 	}
 }
diff --git a/src/test/java/mockery/MockMarkerHandler.java b/src/test/java/mockery/MockMarkerHandler.java
@@ -21,7 +21,7 @@ public void add(Player player, BlueMapAPI __) {
 		if (worldUUID.isEmpty())
 			Singletons.getLogger().warning("World UUID: null");
 		else
-			Singletons.getLogger().finer("World UUID: " + worldUUID);
+			Singletons.getLogger().finer("World UUID: " + worldUUID.get());
 	}
 
 	@Override