Renamed the teamviewer to teammarker

bukkit-common/src/main/java/net/badlion/bukkitapi/AbstractBukkitBadlionPlugin.java

@@ -3,7 +3,7 @@
 import net.badlion.bukkitapi.cosmetics.CosmeticManager;
 import net.badlion.bukkitapi.listener.PlayerListener;
 import net.badlion.bukkitapi.survival.AbstractBukkitSurvivalManager;
-import net.badlion.bukkitapi.teamviewer.TeamViewerManager;
+import net.badlion.bukkitapi.teammarker.TeamMarkerManager;
 import net.badlion.bukkitapi.timers.TimerApi;
 import net.badlion.bukkitapi.timers.TimerApiImpl;
 import net.badlion.bukkitapi.waypoints.WaypointManager;
@@ -28,7 +28,7 @@ public AbstractBukkitBadlionPlugin() {
 		this.badlionApi.setWaypointManager(this.waypointManager);
 		this.cosmeticManager = new CosmeticManager();
 		this.badlionApi.setCosmeticManager(this.cosmeticManager);
-		this.badlionApi.setTeamViewerManager(new TeamViewerManager(this));
+		this.badlionApi.setTeamMarkerManager(new TeamMarkerManager(this));
 	}
 
 	protected void setMessageSender(AbstractBukkitPluginMessageSender messageSender) {

bukkit-common/src/main/java/net/badlion/bukkitapi/teamviewer/TeamViewerManager.java → bukkit-common/src/main/java/net/badlion/bukkitapi/teammarker/TeamMarkerManager.java

@@ -1,24 +1,24 @@
-package net.badlion.bukkitapi.teamviewer;
+package net.badlion.bukkitapi.teammarker;
 
 import net.badlion.bukkitapi.AbstractBukkitBadlionPlugin;
 import net.badlion.modapicommon.AbstractBadlionApi;
 import net.badlion.modapicommon.mods.ModType;
-import net.badlion.modapicommon.utility.AbstractTeamViewerManager;
+import net.badlion.modapicommon.utility.AbstractTeamMarkerManager;
 import net.badlion.modapicommon.utility.TeamMemberLocation;
 
 import java.util.List;
 import java.util.UUID;
 
-public class TeamViewerManager extends AbstractTeamViewerManager {
+public class TeamMarkerManager extends AbstractTeamMarkerManager {
 
 	private final AbstractBukkitBadlionPlugin apiBukkit;
 
-	public TeamViewerManager(AbstractBukkitBadlionPlugin apiBukkit) {
+	public TeamMarkerManager(AbstractBukkitBadlionPlugin apiBukkit) {
 		this.apiBukkit = apiBukkit;
 	}
 
 	@Override
 	public void sendLocations(UUID player, List<TeamMemberLocation> locations) {
-		this.apiBukkit.getMessageSender().sendModData(player, ModType.TEAM_VIEWER, AbstractBadlionApi.GSON_NON_PRETTY.toJsonTree(locations));
+		this.apiBukkit.getMessageSender().sendModData(player, ModType.TEAM_MARKER, AbstractBadlionApi.GSON_NON_PRETTY.toJsonTree(locations));
 	}
 }

bungee/src/main/java/net/badlion/bungeeapi/BungeeBadlionPlugin.java

@@ -3,7 +3,7 @@
 import net.badlion.bungeeapi.cosmetics.UnsupportedCosmeticManager;
 import net.badlion.bungeeapi.listener.PlayerListener;
 import net.badlion.bungeeapi.survival.UnsupportedSurvivalManager;
-import net.badlion.bungeeapi.teamviewer.UnsupportedTeamViewerManager;
+import net.badlion.bungeeapi.teammarker.UnsupportedTeamMarkerManager;
 import net.badlion.bungeeapi.waypoints.UnsupportedWaypointManager;
 import net.md_5.bungee.api.plugin.Plugin;
 
@@ -22,7 +22,7 @@ public BungeeBadlionPlugin() {
 		this.badlionApi.setWaypointManager(new UnsupportedWaypointManager());
 		this.badlionApi.setCosmeticManager(new UnsupportedCosmeticManager());
 		this.badlionApi.setSurvivalManager(new UnsupportedSurvivalManager());
-		this.badlionApi.setTeamViewerManager(new UnsupportedTeamViewerManager());
+		this.badlionApi.setTeamMarkerManager(new UnsupportedTeamMarkerManager());
 	}
 
 	@Override

bungee/src/main/java/net/badlion/bungeeapi/teammarker/UnsupportedTeamMarkerManager.java

@@ -0,0 +1,15 @@
+package net.badlion.bungeeapi.teammarker;
+
+import net.badlion.modapicommon.utility.AbstractTeamMarkerManager;
+import net.badlion.modapicommon.utility.TeamMemberLocation;
+
+import java.util.List;
+import java.util.UUID;
+
+public class UnsupportedTeamMarkerManager extends AbstractTeamMarkerManager {
+
+	@Override
+	public void sendLocations(UUID player, List<TeamMemberLocation> locations) {
+		throw new UnsupportedOperationException("Team Marker mod hooks are not supported on bungee!");
+	}
+}

examples.md

@@ -5,7 +5,7 @@ Below are some examples of how you could hook into our mods using this API.
 * [Waypoints](https://github.com/BadlionClient/BadlionClientModAPI/blob/master/examples.md#waypoints)
 * [TNT Time](https://github.com/BadlionClient/BadlionClientModAPI/blob/master/examples.md#tnt-time)
 * [Height Limit Overlay](https://github.com/BadlionClient/BadlionClientModAPI/blob/master/examples.md#height-limit-overlay)
-* [Team Viewer](https://github.com/BadlionClient/BadlionClientModAPI/blob/master/examples.md#team-viewer)
+* [Team Marker](https://github.com/BadlionClient/BadlionClientModAPI/blob/master/examples.md#team-marker)
 * [Notifications](https://github.com/BadlionClient/BadlionClientModAPI/blob/master/examples.md#notifications)
   * [Click Event Types](https://github.com/BadlionClient/BadlionClientModAPI/blob/master/examples.md#click-event-types)
   * [Levels](https://github.com/BadlionClient/BadlionClientModAPI/blob/master/examples.md#levels)
@@ -144,15 +144,15 @@ public class Game {
 }
 ```
 
-## Team Viewer
+## Team Marker
 
-Using the `net.badlion.modapicommon.mods.TeamViewer` class you can send a list of team members and their locations to
-the player and support the team viewer icon to be shown.
+Using the `net.badlion.modapicommon.mods.TeamMarker` class you can send a list of team members and their locations to
+the player and support the team marker icon to be shown.
 
 ```java
 // Since we need to send the locations on a regular basis to update the locations it's best to put the logic in a task
 // We recommend running it faster than 3 seconds since the client removes the locations after 5 seconds of no updates
-public class TeamViewerTask extends BukkitRunnable {
+public class TeamMarkerTask extends BukkitRunnable {
 
   @Override
   public void run() {
@@ -187,7 +187,7 @@ public class TeamViewerTask extends BukkitRunnable {
       // Loop over all the players again and send the list
       for (Player player : team.getMembers()) {
 
-        TeamViewer.sendLocations(player.getUniqueId(), locations);
+        TeamMarker.sendLocations(player.getUniqueId(), locations);
 
       }
     }

modapi-common/src/main/java/net/badlion/modapicommon/AbstractBadlionApi.java

@@ -4,7 +4,7 @@
 import com.google.gson.GsonBuilder;
 import net.badlion.modapicommon.survival.AbstractSurvivalManager;
 import net.badlion.modapicommon.utility.AbstractCosmeticManager;
-import net.badlion.modapicommon.utility.AbstractTeamViewerManager;
+import net.badlion.modapicommon.utility.AbstractTeamMarkerManager;
 import net.badlion.modapicommon.utility.AbstractWaypointManager;
 
 import java.io.File;
@@ -19,7 +19,7 @@ public abstract class AbstractBadlionApi {
 	private AbstractWaypointManager waypointManager;
 	private AbstractCosmeticManager cosmeticManager;
 	private AbstractSurvivalManager survivalManager;
-	private AbstractTeamViewerManager teamViewerManager;
+	private AbstractTeamMarkerManager teamMarkerManager;
 
 	protected AbstractBadlionApi() {
 		AbstractBadlionApi.instance = this;
@@ -110,21 +110,21 @@ public AbstractSurvivalManager getSurvivalManager() {
 	}
 
 	/**
-	 * Sets the implementation for the {@link AbstractTeamViewerManager} class.
+	 * Sets the implementation for the {@link AbstractTeamMarkerManager} class.
 	 *
-	 * @param teamViewerManager The team viewer manager instance
+	 * @param teamMarkerManager The team marker manager instance
 	 */
-	public void setTeamViewerManager(AbstractTeamViewerManager teamViewerManager) {
-		this.teamViewerManager = teamViewerManager;
+	public void setTeamMarkerManager(AbstractTeamMarkerManager teamMarkerManager) {
+		this.teamMarkerManager = teamMarkerManager;
 	}
 
 	/**
-	 * Returns the implementation for the {@link AbstractTeamViewerManager} class.
+	 * Returns the implementation for the {@link AbstractTeamMarkerManager} class.
 	 *
-	 * @return The team viewer manager instance
+	 * @return The team marker manager instance
 	 */
-	public AbstractTeamViewerManager getTeamViewerManager() {
-		return this.teamViewerManager;
+	public AbstractTeamMarkerManager getTeamMarkerManager() {
+		return this.teamMarkerManager;
 	}
 
 	/**

modapi-common/src/main/java/net/badlion/modapicommon/mods/ModType.java

@@ -7,7 +7,7 @@ public enum ModType {
 	TNT_TIME("tntTime"),
 	NOTIFICATION("notification"),
 	SURVIVAL("survival"),
-	TEAM_VIEWER("teamViewer");
+	TEAM_MARKER("teamMarker");
 
 	private final String type;
 

modapi-common/src/main/java/net/badlion/modapicommon/mods/TeamViewer.java → modapi-common/src/main/java/net/badlion/modapicommon/mods/TeamMarker.java

@@ -7,9 +7,9 @@
 import java.util.UUID;
 
 /**
- * Class with API Hooks for our Team Viewer mod.
+ * Class with API Hooks for our Team Marker mod.
  */
-public class TeamViewer {
+public class TeamMarker {
 
 	/**
 	 * Update the team member locations. You always need to send all the locations that should be showing as on each call old points will be deleted
@@ -21,6 +21,6 @@ public class TeamViewer {
 	 * @param locations List of team member locations to show
 	 */
 	public static void sendLocations(UUID player, List<TeamMemberLocation> locations) {
-		AbstractBadlionApi.getInstance().getTeamViewerManager().sendLocations(player, locations);
+		AbstractBadlionApi.getInstance().getTeamMarkerManager().sendLocations(player, locations);
 	}
 }

modapi-common/src/main/java/net/badlion/modapicommon/utility/AbstractTeamViewerManager.java → modapi-common/src/main/java/net/badlion/modapicommon/utility/AbstractTeamMarkerManager.java

@@ -3,7 +3,7 @@
 import java.util.List;
 import java.util.UUID;
 
-public abstract class AbstractTeamViewerManager {
+public abstract class AbstractTeamMarkerManager {
 
 	public abstract void sendLocations(UUID player, List<TeamMemberLocation> locations);
 

velocity/src/main/java/net/badlion/velocityapi/VelocityBadlionPlugin.java

@@ -3,13 +3,12 @@
 import com.google.inject.Inject;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
-import com.velocitypowered.api.event.proxy.ProxyShutdownEvent;
 import com.velocitypowered.api.plugin.Plugin;
 import com.velocitypowered.api.proxy.ProxyServer;
 import net.badlion.velocityapi.cosmetics.UnsupportedCosmeticManager;
 import net.badlion.velocityapi.listener.PlayerListener;
 import net.badlion.velocityapi.survival.UnsupportedSurvivalManager;
-import net.badlion.velocityapi.teamviewer.UnsupportedTeamViewerManager;
+import net.badlion.velocityapi.teammarker.UnsupportedTeamMarkerManager;
 import net.badlion.velocityapi.waypoints.UnsupportedWaypointManager;
 import org.slf4j.Logger;
 
@@ -39,7 +38,7 @@ public VelocityBadlionPlugin(ProxyServer proxyServer, Logger logger) {
 		this.badlionApi.setWaypointManager(new UnsupportedWaypointManager());
 		this.badlionApi.setCosmeticManager(new UnsupportedCosmeticManager());
 		this.badlionApi.setSurvivalManager(new UnsupportedSurvivalManager());
-		this.badlionApi.setTeamViewerManager(new UnsupportedTeamViewerManager());
+		this.badlionApi.setTeamMarkerManager(new UnsupportedTeamMarkerManager());
 	}
 
 	@Subscribe

velocity/src/main/java/net/badlion/velocityapi/teammarker/UnsupportedTeamMarkerManager.java

@@ -0,0 +1,15 @@
+package net.badlion.velocityapi.teammarker;
+
+import net.badlion.modapicommon.utility.AbstractTeamMarkerManager;
+import net.badlion.modapicommon.utility.TeamMemberLocation;
+
+import java.util.List;
+import java.util.UUID;
+
+public class UnsupportedTeamMarkerManager extends AbstractTeamMarkerManager {
+
+	@Override
+	public void sendLocations(UUID player, List<TeamMemberLocation> locations) {
+		throw new UnsupportedOperationException("Team Marker mod hooks are not supported on bungee!");
+	}
+}