Added HiddenGameModes feature

Closes #14

Author: TechnicJelle

README.md

@@ -31,6 +31,7 @@ and ask your questions in [#3rd-party-support](https://discord.com/channels/6658
 [elsing](https://github.com/elsing), [LOOHP](https://github.com/LOOHP)
 and [Blue](https://github.com/TBlueF) for their contributions to the project!
 
-[pop4959](https://github.com/pop4959/BlueMap-Essentials) and [JotaFaD](https://github.com/JotaFaD/CivsExtras) for their
+[pop4959](https://github.com/pop4959/BlueMap-Essentials), [JotaFaD](https://github.com/JotaFaD/CivsExtras)
+and [YouHaveTrouble](https://github.com/YouHaveTrouble/ServerBasics/blob/a61de3f4964df8764ca15b3562a3c9227f0459ea/src/main/java/me/youhavetrouble/serverbasics/NMSHandler.java#L63) for their
 open-source plugins that gave me great examples to learn from.\
 And [TBlueF](https://github.com/TBlueF) of course for his amazing plugin and fast support with my silly questions!

src/main/java/com/technicjelle/bluemapofflineplayermarkers/Config.java

@@ -1,11 +1,14 @@
 package com.technicjelle.bluemapofflineplayermarkers;
 
+import org.bukkit.GameMode;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 
 import static com.technicjelle.bluemapofflineplayermarkers.Main.logger;
@@ -25,6 +28,7 @@ private FileConfiguration configFile() {
 	public boolean toggleable;
 	public boolean defaultHidden;
 	public long expireTimeInHours;
+	public List<GameMode> hiddenGameModes;
 
 	public Config(Main plugin) {
 		this.plugin = plugin;
@@ -48,5 +52,18 @@ public Config(Main plugin) {
 		toggleable = configFile().getBoolean("Toggleable");
 		defaultHidden = configFile().getBoolean("DefaultHidden");
 		expireTimeInHours = configFile().getLong("ExpireTimeInHours");
+		hiddenGameModes = parseGameModes(configFile().getStringList("HiddenGameModes"));
+	}
+
+	private List<GameMode> parseGameModes(List<String> hiddenGameModesStrings) {
+		ArrayList<GameMode> gameModes = new ArrayList<>();
+		for (String gm : hiddenGameModesStrings) {
+			try {
+				gameModes.add(GameMode.valueOf(gm.toUpperCase()));
+			} catch (IllegalArgumentException e) {
+				logger.warning("Invalid Game Mode: " + gm);
+			}
+		}
+		return gameModes;
 	}
 }

src/main/java/com/technicjelle/bluemapofflineplayermarkers/MarkerHandler.java

@@ -10,6 +10,7 @@
 import de.bluecolored.bluemap.api.markers.MarkerSet;
 import de.bluecolored.bluemap.api.markers.POIMarker;
 import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
@@ -36,16 +37,17 @@ public class MarkerHandler {
 	 * @param player The player to add the marker for.
 	 */
 	public static void add(Player player) {
-		add(player, player.getLocation());
+		add(player, player.getLocation(), player.getGameMode());
 	}
 
 	/**
 	 * Adds a player marker to the map.
 	 *
 	 * @param player   The player to add the marker for.
 	 * @param location The location to put the marker at.
+	 * @param gameMode The game mode of the player.
 	 */
-	public static void add(OfflinePlayer player, Location location) {
+	public static void add(OfflinePlayer player, Location location, GameMode gameMode) {
 		Optional<BlueMapAPI> optionalApi = BlueMapAPI.getInstance();
 		if (optionalApi.isEmpty()) {
 			logger.warning("Tried to add a marker, but BlueMap wasn't loaded!");
@@ -56,6 +58,9 @@ public static void add(OfflinePlayer player, Location location) {
 		//If this player's visibility is disabled on the map, don't add the marker.
 		if (!api.getWebApp().getPlayerVisibility(player.getUniqueId())) return;
 
+		//If this player's game mode is disabled on the map, don't add the marker.
+		if (config.hiddenGameModes.contains(gameMode)) return;
+
 		// Get BlueMapWorld for the location
 		BlueMapWorld blueMapWorld = api.getWorld(location.getWorld()).orElse(null);
 		if (blueMapWorld == null) return;
@@ -162,6 +167,7 @@ public static void loadOfflineMarkers() {
 			}
 
 			//Collect data
+			int gameModeInt = (int) nbtData.get("playerGameType").getValue();
 			long worldUUIDLeast = (long) nbtData.get("WorldUUIDLeast").getValue();
 			long worldUUIDMost = (long) nbtData.get("WorldUUIDMost").getValue();
 			@SuppressWarnings("unchecked") //Apparently this is just how it should be https://discord.com/channels/665868367416131594/771451216499965953/917450319259115550
@@ -174,8 +180,12 @@ public static void loadOfflineMarkers() {
 			if (w == null || position.size() != 3) continue;
 			Location loc = new Location(w, position.get(0), position.get(1), position.get(2));
 
+			//Convert to game mode
+			@SuppressWarnings("deprecation")
+			GameMode gameMode = GameMode.getByValue(gameModeInt);
+
 			//Add marker
-			add(op, loc);
+			add(op, loc, gameMode);
 		}
 	}
 }

src/main/resources/config.yml

@@ -9,3 +9,7 @@ DefaultHidden: false
 # If you want to show all players, set this to 0.
 # Feel free to use a calculator to convert days to hours: https://www.google.com/search?q=days+to+hours+calculator
 ExpireTimeInHours: 0
+
+# If you want to hide players in certain game modes, add them here.
+HiddenGameModes:
+  - spectator