Skip to content

Commit 883fb19

Browse files
committed
[Server] Team API, Offline Players
1 parent 8e6efdc commit 883fb19

5 files changed

Lines changed: 202 additions & 5 deletions

File tree

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
package pl.olafcio.avoid_impl.net.team;
2+
3+
import net.minecraft.world.scores.PlayerTeam;
4+
import org.jetbrains.annotations.NotNull;
5+
import pl.olafcio.avoid.net.player.OfflinePlayer;
6+
import pl.olafcio.avoid.net.server.Server;
7+
import pl.olafcio.avoid.net.team.Team;
8+
9+
import java.util.HashSet;
10+
11+
public class TeamNative {
12+
public static @NotNull Team convert(PlayerTeam team) {
13+
return new Team(team.getName(), new HashSet<>() {
14+
private boolean setup = false;
15+
16+
{
17+
for (var player : team.getPlayers())
18+
add(Server.getOfflinePlayer(player));
19+
20+
setup = true;
21+
}
22+
23+
@Override
24+
public boolean add(OfflinePlayer player) {
25+
if (setup)
26+
team.getPlayers().add(player.getName());
27+
28+
return super.add(player);
29+
}
30+
31+
@Override
32+
public boolean remove(Object o) {
33+
if (o instanceof OfflinePlayer player)
34+
team.getPlayers().remove(player.getName());
35+
36+
return super.remove(o);
37+
}
38+
});
39+
}
40+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package pl.olafcio.avoid.net.player;
2+
3+
import java.util.UUID;
4+
5+
public interface OfflinePlayer {
6+
String getNick();
7+
UUID uuid();
8+
9+
default String getName() {
10+
return getNick().replace("§", "");
11+
}
12+
}

‎src/main/java/pl/olafcio/avoid/net/player/Player.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
* This is mixed to ease massive refactorings in Minecraft code for AvoidLib.
5353
*/
5454
@NeverRemoval
55-
public class Player extends Entity implements Executor {
55+
public class Player extends Entity implements Executor, OfflinePlayer {
5656
private final PlayerProfile profile;
5757
private final Object connection;
5858

@@ -69,7 +69,7 @@ public Player(
6969

7070
@Override
7171
public @NotNull String getName() {
72-
return getNick().replace("§", "");
72+
return OfflinePlayer.super.getName();
7373
}
7474

7575
public String getNick() {

‎src/main/java/pl/olafcio/avoid/net/server/Server.java‎

Lines changed: 82 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
import net.minecraft.server.players.NameAndId;
55
import net.minecraft.world.level.Level;
66
import org.jetbrains.annotations.ApiStatus;
7+
import org.jetbrains.annotations.NotNull;
8+
import org.jetbrains.annotations.Nullable;
9+
import pl.olafcio.avoid.net.player.OfflinePlayer;
10+
import pl.olafcio.avoid.net.team.Team;
711
import pl.olafcio.avoid_impl.AvoidInternal;
812
import pl.olafcio.avoid.platform.AvoidWrappedLoader;
913
import pl.olafcio.avoid.errors.ImproperEnvironment;
@@ -13,11 +17,10 @@
1317
import pl.olafcio.avoid.net.player.Player;
1418
import pl.olafcio.avoid.net.player.PlayerNative;
1519
import pl.olafcio.avoid.net.world.World;
20+
import pl.olafcio.avoid_impl.net.team.TeamNative;
1621
import pl.olafcio.avoid_impl.net.world.WorldNative;
1722

18-
import java.util.ArrayList;
19-
import java.util.List;
20-
import java.util.UUID;
23+
import java.util.*;
2124
import java.util.function.Consumer;
2225
import java.util.function.Predicate;
2326

@@ -60,6 +63,46 @@ public static Player getPlayer(UUID uuid) {
6063
return PlayerNative.convertFrom(ret);
6164
}
6265

66+
public static OfflinePlayer getOfflinePlayer(String nick) {
67+
var optional = AvoidInternal.getServer().services().nameToIdCache().get(nick);
68+
if (optional.isEmpty())
69+
return null;
70+
71+
var uuid = optional.orElseThrow().id();
72+
73+
return new OfflinePlayer() {
74+
@Override
75+
public String getNick() {
76+
return nick;
77+
}
78+
79+
@Override
80+
public UUID uuid() {
81+
return uuid;
82+
}
83+
};
84+
}
85+
86+
public static OfflinePlayer getOfflinePlayer(UUID uuid) {
87+
var optional = AvoidInternal.getServer().services().nameToIdCache().get(uuid);
88+
if (optional.isEmpty())
89+
return null;
90+
91+
var nick = optional.orElseThrow().name();
92+
93+
return new OfflinePlayer() {
94+
@Override
95+
public String getNick() {
96+
return nick;
97+
}
98+
99+
@Override
100+
public UUID uuid() {
101+
return uuid;
102+
}
103+
};
104+
}
105+
63106
public static List<Operator> getOperators() {
64107
return AvoidInternal.getServer().getPlayerList().getOps().getEntries().stream().map(op -> {
65108
var user = op.getUser();
@@ -168,4 +211,40 @@ public static Properties getProperties() {
168211

169212
return new Properties(((DedicatedServer) AvoidInternal.getServer()).getProperties());
170213
}
214+
215+
@Nullable
216+
public static Team getTeam(String name) {
217+
var team = AvoidInternal.getServer().getScoreboard().getPlayerTeam(name);
218+
if (team == null)
219+
return null;
220+
221+
return TeamNative.convert(team);
222+
}
223+
224+
@NotNull
225+
public static Team createTeam(String name) {
226+
return TeamNative.convert(AvoidInternal.getServer().getScoreboard().addPlayerTeam(name));
227+
}
228+
229+
public static boolean deleteTeam(String name) {
230+
var scoreboard = AvoidInternal.getServer().getScoreboard();
231+
var team = scoreboard.getPlayerTeam(name);
232+
233+
if (team == null)
234+
return false;
235+
236+
scoreboard.removePlayerTeam(team);
237+
return true;
238+
}
239+
240+
public static List<Team> getTeams() {
241+
return AvoidInternal.getServer().getScoreboard().getPlayerTeams()
242+
.stream()
243+
.map(TeamNative::convert)
244+
.toList();
245+
}
246+
247+
public static Collection<String> getTeamNames() {
248+
return AvoidInternal.getServer().getScoreboard().getTeamNames();
249+
}
171250
}
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
package pl.olafcio.avoid.net.team;
2+
3+
import pl.olafcio.avoid.net.chat.component.BaseComponent;
4+
import pl.olafcio.avoid.net.player.OfflinePlayer;
5+
6+
import java.util.Set;
7+
8+
/**
9+
* <b>WARNING:</b> The team system is notoriously insecure. <u>Player names are stored instead of UUID-s</u>.<br/>&emsp;&emsp;&emsp;&emsp;&nbsp;&ensp;&ensp;Go complain to Mojang i'll make avoid like paper (that is fixing some minecraft bugs) and fix this someday later.
10+
*/
11+
public final class Team {
12+
private final String name;
13+
private final Set<OfflinePlayer> players;
14+
15+
private BaseComponent<?> displayName;
16+
private BaseComponent<?> prefix;
17+
private BaseComponent<?> suffix;
18+
19+
private boolean allowFriendlyFire = true;
20+
private boolean seeFriendlyInvisibles = true;
21+
22+
public Team(String name, Set<OfflinePlayer> players) {
23+
this.name = name;
24+
this.players = players;
25+
}
26+
27+
public String getName() {
28+
return name;
29+
}
30+
31+
public Set<OfflinePlayer> getPlayers() {
32+
return players;
33+
}
34+
35+
public BaseComponent<?> getDisplayName() {
36+
return displayName;
37+
}
38+
39+
public void setDisplayName(BaseComponent<?> displayName) {
40+
this.displayName = displayName;
41+
}
42+
43+
public BaseComponent<?> getPrefix() {
44+
return prefix;
45+
}
46+
47+
public void setPrefix(BaseComponent<?> prefix) {
48+
this.prefix = prefix;
49+
}
50+
51+
public BaseComponent<?> getSuffix() {
52+
return suffix;
53+
}
54+
55+
public void setSuffix(BaseComponent<?> suffix) {
56+
this.suffix = suffix;
57+
}
58+
59+
public boolean isFriendlyFire() {
60+
return allowFriendlyFire;
61+
}
62+
63+
public boolean seeFriendlyInvisibles() {
64+
return seeFriendlyInvisibles;
65+
}
66+
}

0 commit comments

Comments
 (0)