Skip to content

Commit 4ee8061

Browse files
pownsggpownsgg
committed
Renamed the teamviewer to teammarker
1 parent ee608f3 commit 4ee8061

File tree

13 files changed

+62
-65
lines changed

13 files changed

+62
-65
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import net.badlion.bukkitapi.cosmetics.CosmeticManager;
44
import net.badlion.bukkitapi.listener.PlayerListener;
55
import net.badlion.bukkitapi.survival.AbstractBukkitSurvivalManager;
6-
import net.badlion.bukkitapi.teamviewer.TeamViewerManager;
6+
import net.badlion.bukkitapi.teammarker.TeamMarkerManager;
77
import net.badlion.bukkitapi.timers.TimerApi;
88
import net.badlion.bukkitapi.timers.TimerApiImpl;
99
import net.badlion.bukkitapi.waypoints.WaypointManager;
@@ -28,7 +28,7 @@ public AbstractBukkitBadlionPlugin() {
2828
this.badlionApi.setWaypointManager(this.waypointManager);
2929
this.cosmeticManager = new CosmeticManager();
3030
this.badlionApi.setCosmeticManager(this.cosmeticManager);
31-
this.badlionApi.setTeamViewerManager(new TeamViewerManager(this));
31+
this.badlionApi.setTeamMarkerManager(new TeamMarkerManager(this));
3232
}
3333

3434
protected void setMessageSender(AbstractBukkitPluginMessageSender messageSender) {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
package net.badlion.bukkitapi.teamviewer;
1+
package net.badlion.bukkitapi.teammarker;
22

33
import net.badlion.bukkitapi.AbstractBukkitBadlionPlugin;
44
import net.badlion.modapicommon.AbstractBadlionApi;
55
import net.badlion.modapicommon.mods.ModType;
6-
import net.badlion.modapicommon.utility.AbstractTeamViewerManager;
6+
import net.badlion.modapicommon.utility.AbstractTeamMarkerManager;
77
import net.badlion.modapicommon.utility.TeamMemberLocation;
88

99
import java.util.List;
1010
import java.util.UUID;
1111

12-
public class TeamViewerManager extends AbstractTeamViewerManager {
12+
public class TeamMarkerManager extends AbstractTeamMarkerManager {
1313

1414
private final AbstractBukkitBadlionPlugin apiBukkit;
1515

16-
public TeamViewerManager(AbstractBukkitBadlionPlugin apiBukkit) {
16+
public TeamMarkerManager(AbstractBukkitBadlionPlugin apiBukkit) {
1717
this.apiBukkit = apiBukkit;
1818
}
1919

2020
@Override
2121
public void sendLocations(UUID player, List<TeamMemberLocation> locations) {
22-
this.apiBukkit.getMessageSender().sendModData(player, ModType.TEAM_VIEWER, AbstractBadlionApi.GSON_NON_PRETTY.toJsonTree(locations));
22+
this.apiBukkit.getMessageSender().sendModData(player, ModType.TEAM_MARKER, AbstractBadlionApi.GSON_NON_PRETTY.toJsonTree(locations));
2323
}
2424
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import net.badlion.bungeeapi.cosmetics.UnsupportedCosmeticManager;
44
import net.badlion.bungeeapi.listener.PlayerListener;
55
import net.badlion.bungeeapi.survival.UnsupportedSurvivalManager;
6-
import net.badlion.bungeeapi.teamviewer.UnsupportedTeamViewerManager;
6+
import net.badlion.bungeeapi.teammarker.UnsupportedTeamMarkerManager;
77
import net.badlion.bungeeapi.waypoints.UnsupportedWaypointManager;
88
import net.md_5.bungee.api.plugin.Plugin;
99

@@ -22,7 +22,7 @@ public BungeeBadlionPlugin() {
2222
this.badlionApi.setWaypointManager(new UnsupportedWaypointManager());
2323
this.badlionApi.setCosmeticManager(new UnsupportedCosmeticManager());
2424
this.badlionApi.setSurvivalManager(new UnsupportedSurvivalManager());
25-
this.badlionApi.setTeamViewerManager(new UnsupportedTeamViewerManager());
25+
this.badlionApi.setTeamMarkerManager(new UnsupportedTeamMarkerManager());
2626
}
2727

2828
@Override

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package net.badlion.bungeeapi.teammarker;
2+
3+
import net.badlion.modapicommon.utility.AbstractTeamMarkerManager;
4+
import net.badlion.modapicommon.utility.TeamMemberLocation;
5+
6+
import java.util.List;
7+
import java.util.UUID;
8+
9+
public class UnsupportedTeamMarkerManager extends AbstractTeamMarkerManager {
10+
11+
@Override
12+
public void sendLocations(UUID player, List<TeamMemberLocation> locations) {
13+
throw new UnsupportedOperationException("Team Marker mod hooks are not supported on bungee!");
14+
}
15+
}

‎bungee/src/main/java/net/badlion/bungeeapi/teamviewer/UnsupportedTeamViewerManager.java‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎examples.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Below are some examples of how you could hook into our mods using this API.
55
* [Waypoints](https://github.com/BadlionClient/BadlionClientModAPI/blob/master/examples.md#waypoints)
66
* [TNT Time](https://github.com/BadlionClient/BadlionClientModAPI/blob/master/examples.md#tnt-time)
77
* [Height Limit Overlay](https://github.com/BadlionClient/BadlionClientModAPI/blob/master/examples.md#height-limit-overlay)
8-
* [Team Viewer](https://github.com/BadlionClient/BadlionClientModAPI/blob/master/examples.md#team-viewer)
8+
* [Team Marker](https://github.com/BadlionClient/BadlionClientModAPI/blob/master/examples.md#team-marker)
99
* [Notifications](https://github.com/BadlionClient/BadlionClientModAPI/blob/master/examples.md#notifications)
1010
* [Click Event Types](https://github.com/BadlionClient/BadlionClientModAPI/blob/master/examples.md#click-event-types)
1111
* [Levels](https://github.com/BadlionClient/BadlionClientModAPI/blob/master/examples.md#levels)
@@ -144,15 +144,15 @@ public class Game {
144144
}
145145
```
146146

147-
## Team Viewer
147+
## Team Marker
148148

149-
Using the `net.badlion.modapicommon.mods.TeamViewer` class you can send a list of team members and their locations to
150-
the player and support the team viewer icon to be shown.
149+
Using the `net.badlion.modapicommon.mods.TeamMarker` class you can send a list of team members and their locations to
150+
the player and support the team marker icon to be shown.
151151

152152
```java
153153
// 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
154154
// We recommend running it faster than 3 seconds since the client removes the locations after 5 seconds of no updates
155-
public class TeamViewerTask extends BukkitRunnable {
155+
public class TeamMarkerTask extends BukkitRunnable {
156156

157157
@Override
158158
public void run() {
@@ -187,7 +187,7 @@ public class TeamViewerTask extends BukkitRunnable {
187187
// Loop over all the players again and send the list
188188
for (Player player : team.getMembers()) {
189189

190-
TeamViewer.sendLocations(player.getUniqueId(), locations);
190+
TeamMarker.sendLocations(player.getUniqueId(), locations);
191191

192192
}
193193
}

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.google.gson.GsonBuilder;
55
import net.badlion.modapicommon.survival.AbstractSurvivalManager;
66
import net.badlion.modapicommon.utility.AbstractCosmeticManager;
7-
import net.badlion.modapicommon.utility.AbstractTeamViewerManager;
7+
import net.badlion.modapicommon.utility.AbstractTeamMarkerManager;
88
import net.badlion.modapicommon.utility.AbstractWaypointManager;
99

1010
import java.io.File;
@@ -19,7 +19,7 @@ public abstract class AbstractBadlionApi {
1919
private AbstractWaypointManager waypointManager;
2020
private AbstractCosmeticManager cosmeticManager;
2121
private AbstractSurvivalManager survivalManager;
22-
private AbstractTeamViewerManager teamViewerManager;
22+
private AbstractTeamMarkerManager teamMarkerManager;
2323

2424
protected AbstractBadlionApi() {
2525
AbstractBadlionApi.instance = this;
@@ -110,21 +110,21 @@ public AbstractSurvivalManager getSurvivalManager() {
110110
}
111111

112112
/**
113-
* Sets the implementation for the {@link AbstractTeamViewerManager} class.
113+
* Sets the implementation for the {@link AbstractTeamMarkerManager} class.
114114
*
115-
* @param teamViewerManager The team viewer manager instance
115+
* @param teamMarkerManager The team marker manager instance
116116
*/
117-
public void setTeamViewerManager(AbstractTeamViewerManager teamViewerManager) {
118-
this.teamViewerManager = teamViewerManager;
117+
public void setTeamMarkerManager(AbstractTeamMarkerManager teamMarkerManager) {
118+
this.teamMarkerManager = teamMarkerManager;
119119
}
120120

121121
/**
122-
* Returns the implementation for the {@link AbstractTeamViewerManager} class.
122+
* Returns the implementation for the {@link AbstractTeamMarkerManager} class.
123123
*
124-
* @return The team viewer manager instance
124+
* @return The team marker manager instance
125125
*/
126-
public AbstractTeamViewerManager getTeamViewerManager() {
127-
return this.teamViewerManager;
126+
public AbstractTeamMarkerManager getTeamMarkerManager() {
127+
return this.teamMarkerManager;
128128
}
129129

130130
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public enum ModType {
77
TNT_TIME("tntTime"),
88
NOTIFICATION("notification"),
99
SURVIVAL("survival"),
10-
TEAM_VIEWER("teamViewer");
10+
TEAM_MARKER("teamMarker");
1111

1212
private final String type;
1313

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import java.util.UUID;
88

99
/**
10-
* Class with API Hooks for our Team Viewer mod.
10+
* Class with API Hooks for our Team Marker mod.
1111
*/
12-
public class TeamViewer {
12+
public class TeamMarker {
1313

1414
/**
1515
* 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 {
2121
* @param locations List of team member locations to show
2222
*/
2323
public static void sendLocations(UUID player, List<TeamMemberLocation> locations) {
24-
AbstractBadlionApi.getInstance().getTeamViewerManager().sendLocations(player, locations);
24+
AbstractBadlionApi.getInstance().getTeamMarkerManager().sendLocations(player, locations);
2525
}
2626
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.List;
44
import java.util.UUID;
55

6-
public abstract class AbstractTeamViewerManager {
6+
public abstract class AbstractTeamMarkerManager {
77

88
public abstract void sendLocations(UUID player, List<TeamMemberLocation> locations);
99

0 commit comments

Comments
 (0)