Skip to content
This repository has been archived by the owner on Jan 20, 2024. It is now read-only.

Commit

Permalink
Plugin: replace String to UUID
Browse files Browse the repository at this point in the history
  • Loading branch information
@TheFaser
TheFaser committed Aug 23, 2023
1 parent e949d3e commit 2500783
Show file tree
Hide file tree
Showing 11 changed files with 85 additions and 81 deletions.
3 changes: 2 additions & 1 deletion src/main/java/net/flectone/commands/CommandIgnore.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.UUID;

public class CommandIgnore implements FTabCompleter {

Expand All @@ -38,7 +39,7 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command

if (fCommand.isHaveCD() || fCommand.getFPlayer() == null) return true;

ArrayList<String> ignoreList = fCommand.getFPlayer().getIgnoreList();
ArrayList<UUID> ignoreList = fCommand.getFPlayer().getIgnoreList();

boolean isIgnored = fCommand.getFPlayer().isIgnored(ignoredFPlayer.getUUID());
fCommand.sendMeMessage("command.ignore." + !isIgnored + "-message", "<player>", ignoredFPlayer.getRealName());
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/net/flectone/commands/CommandIgnoreList.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import java.util.ArrayList;
import java.util.List;
import java.util.UUID;

import static net.flectone.managers.FileManager.locale;

Expand All @@ -23,7 +24,7 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command

if (fCommand.isConsoleMessage() || fCommand.getFPlayer() == null || fCommand.getPlayer() == null) return true;

List<String> ignoreList = fCommand.getFPlayer().getIgnoreList();
List<UUID> ignoreList = fCommand.getFPlayer().getIgnoreList();

if (ignoreList.isEmpty()) {
fCommand.sendMeMessage("command.ignore-list.empty");
Expand Down
13 changes: 5 additions & 8 deletions src/main/java/net/flectone/commands/CommandMailClear.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

public class CommandMailClear implements FTabCompleter {

Expand All @@ -33,7 +30,7 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
return true;
}

HashMap<String, Mail> mailsList = fPlayer.getMails();
HashMap<UUID, Mail> mailsList = fPlayer.getMails();

if (fPlayer.isOnline() || mailsList.isEmpty()) {
fCommand.sendMeMessage("command.mail-clear.empty");
Expand All @@ -49,8 +46,8 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command

int number = Integer.parseInt(strings[1]);

Map.Entry<String, Mail> entry = mailsList.entrySet().parallelStream()
.filter(stringMailEntry -> !stringMailEntry.getValue().isRemoved())
Map.Entry<UUID, Mail> entry = mailsList.entrySet().parallelStream()
.filter(mailEntry -> !mailEntry.getValue().isRemoved())
.skip(number - 1)
.findFirst()
.orElse(null);
Expand Down Expand Up @@ -84,7 +81,7 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull

if (fPlayer == null) break;

HashMap<String, Mail> mailsList = fPlayer.getMails();
HashMap<UUID, Mail> mailsList = fPlayer.getMails();

if (mailsList.isEmpty()) break;

Expand Down
13 changes: 11 additions & 2 deletions src/main/java/net/flectone/commands/CommandTicTacToe.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

import java.util.Collections;
import java.util.List;
import java.util.UUID;

import static net.flectone.managers.FileManager.locale;

Expand Down Expand Up @@ -47,8 +48,16 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
if (ticTacToe == null) {
boolean isFirstPlayer = Math.random() > 0.5;

String firstPlayer = isFirstPlayer ? fCommand.getFPlayer().getUUID() : secondFPlayer.getUUID();
String secondPlayer = isFirstPlayer ? secondFPlayer.getUUID() : fCommand.getFPlayer().getUUID();
UUID firstPlayer;
UUID secondPlayer;

if (isFirstPlayer) {
firstPlayer = fCommand.getFPlayer().getUUID();
secondPlayer = secondFPlayer.getUUID();
} else {
firstPlayer = secondFPlayer.getUUID();
secondPlayer = fCommand.getFPlayer().getUUID();
}

int size = getValidSize(strings);
ticTacToe = new TicTacToe(size, firstPlayer, secondPlayer);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/flectone/listeners/InventoryOpenListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public void inventoryOpen(@NotNull InventoryOpenEvent event) {

if (!inventoryList.contains(event.getInventory())) return;

List<String> ignoreList = fPlayer.getIgnoreList();
List<UUID> ignoreList = fPlayer.getIgnoreList();

int indexItem = 0;
int numberInventory = 0;
Expand All @@ -49,7 +49,7 @@ public void inventoryOpen(@NotNull InventoryOpenEvent event) {

SkullMeta skullMeta = (SkullMeta) blockForHead.getItemMeta();

String playerName = Bukkit.getOfflinePlayer(UUID.fromString(ignoreList.get(y))).getName();
String playerName = Bukkit.getOfflinePlayer(ignoreList.get(y)).getName();

skullMeta.setDisplayName("§e" + playerName);
skullMeta.setLocalizedName(playerName);
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/net/flectone/listeners/PlayerJoinListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import org.jetbrains.annotations.NotNull;

import java.util.HashMap;
import java.util.UUID;

import static net.flectone.managers.FileManager.config;
import static net.flectone.managers.FileManager.locale;
Expand All @@ -33,7 +34,7 @@ public static void sendJoinMessage(@NotNull FPlayer fPlayer, @NotNull Player pla
fCommand.sendGlobalMessage(string);
}

HashMap<String, Mail> mails = fPlayer.getMails();
HashMap<UUID, Mail> mails = fPlayer.getMails();
if (mails.isEmpty()) return;

mails.values().parallelStream().filter(mail -> !mail.isRemoved()).forEach(mail -> {
Expand Down Expand Up @@ -66,6 +67,7 @@ public void joinPlayer(@NotNull PlayerJoinEvent event) {
event.setJoinMessage(null);

FPlayer fPlayer = FPlayerManager.addPlayer(event.getPlayer());
if (fPlayer == null) return;
sendJoinMessage(fPlayer, player, fPlayer.isOnline());
}

Expand Down
18 changes: 5 additions & 13 deletions src/main/java/net/flectone/managers/FPlayerManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

public class FPlayerManager {

private static final HashMap<String, FPlayer> fPlayerHashMap = new HashMap<>();
private static final HashMap<UUID, FPlayer> fPlayerHashMap = new HashMap<>();
private static final Set<FPlayer> bannedPlayers = new HashSet<>();
private static final Set<FPlayer> mutedPlayers = new HashSet<>();
private static Scoreboard scoreBoard;
Expand Down Expand Up @@ -98,7 +98,7 @@ public static void removePlayersFromTeams() {
}

public static void addPlayer(@NotNull OfflinePlayer offlinePlayer) {
String uuid = offlinePlayer.getUniqueId().toString();
UUID uuid = offlinePlayer.getUniqueId();
if (fPlayerHashMap.containsKey(uuid)) return;

FPlayer fPlayer = new FPlayer(offlinePlayer);
Expand All @@ -107,7 +107,7 @@ public static void addPlayer(@NotNull OfflinePlayer offlinePlayer) {


public static FPlayer addPlayer(@NotNull Player player) {
String uuid = player.getUniqueId().toString();
UUID uuid = player.getUniqueId();
if (fPlayerHashMap.containsKey(uuid)) {
FPlayer fPlayer = getPlayer(uuid);
if (fPlayer == null) return null;
Expand Down Expand Up @@ -141,22 +141,14 @@ public static FPlayer getPlayer(@NotNull Player player) {
return getPlayer(player.getUniqueId());
}

@Nullable
public static FPlayer getPlayer(@NotNull String uuid) {
return fPlayerHashMap.get(uuid);
}

@Nullable
public static FPlayer getPlayer(@NotNull UUID uuid) {
return getPlayer(uuid.toString());
return fPlayerHashMap.get(uuid);
}

public static void removePlayer(@NotNull String uuid) {
fPlayerHashMap.remove(uuid);
}

public static void removePlayer(@NotNull UUID uuid) {
removePlayer(uuid.toString());
fPlayerHashMap.remove(uuid);
}

public static void removePlayer(@NotNull Player player) {
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/net/flectone/misc/actions/Mail.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,31 @@

public class Mail {

private final String uuid;
private final String sender;
private final String receiver;
private final UUID uuid;
private final UUID sender;
private final UUID receiver;
private final String message;
private boolean isRemoved = false;

public Mail(@NotNull String sender, @NotNull String receiver, @NotNull String message) {
this.uuid = UUID.randomUUID().toString();
public Mail(@NotNull UUID sender, @NotNull UUID receiver, @NotNull String message) {
this.uuid = UUID.randomUUID();
this.sender = sender;
this.receiver = receiver;
this.message = message;
}

@NotNull
public String getUUID() {
public UUID getUUID() {
return uuid;
}

@NotNull
public String getSender() {
public UUID getSender() {
return sender;
}

@NotNull
public String getReceiver() {
public UUID getReceiver() {
return receiver;
}

Expand Down
14 changes: 7 additions & 7 deletions src/main/java/net/flectone/misc/actions/TicTacToe.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@ public class TicTacToe {

private final String[][] marks;

private final String firstPlayer;
private final UUID firstPlayer;

private final String secondPlayer;
private final UUID secondPlayer;

private String nextPlayer;
private UUID nextPlayer;

private boolean isEnded;

private boolean isAccepted = false;

public TicTacToe(int size, @NotNull String firstPlayer, @NotNull String secondPlayer) {
public TicTacToe(int size, @NotNull UUID firstPlayer, @NotNull UUID secondPlayer) {
this.uuid = UUID.randomUUID().toString();
this.firstPlayer = firstPlayer;
this.secondPlayer = secondPlayer;
Expand Down Expand Up @@ -70,7 +70,7 @@ public void setAccepted(boolean accepted) {
isAccepted = accepted;
}

public void setMark(@NotNull String player, int number) {
public void setMark(@NotNull UUID player, int number) {
int row = (number - 1) / marks.length;
int column = (number - 1) % marks.length;

Expand All @@ -82,7 +82,7 @@ public void setMark(@NotNull String player, int number) {
}

@Nullable
public FPlayer getSecondFPlayer(@NotNull String player) {
public FPlayer getSecondFPlayer(@NotNull UUID player) {
return FPlayerManager.getPlayer(player.equals(firstPlayer) ? secondPlayer : firstPlayer);
}

Expand All @@ -92,7 +92,7 @@ public boolean isBusy(int number) {
return !marks[row][column].equals(mark);
}

public boolean isNextPlayer(@NotNull String player) {
public boolean isNextPlayer(@NotNull UUID player) {
return nextPlayer.equals(player);
}

Expand Down
29 changes: 15 additions & 14 deletions src/main/java/net/flectone/misc/entity/FPlayer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;

import static net.flectone.managers.FileManager.locale;
Expand All @@ -32,8 +33,8 @@ public class FPlayer {

private final OfflinePlayer offlinePlayer;
private final String name;
private final String uuid;
private final HashMap<String, Mail> mails = new HashMap<>();
private final UUID uuid;
private final HashMap<UUID, Mail> mails = new HashMap<>();
private final List<String> listChatBubbles = new ArrayList<>();
private Player player;
private Block block;
Expand All @@ -42,7 +43,7 @@ public class FPlayer {
private boolean isStreaming = false;
private boolean isStreamer = false;
private String[] colors = new String[]{};
private ArrayList<String> ignoreList = new ArrayList<>();
private ArrayList<UUID> ignoreList = new ArrayList<>();
private List<Inventory> inventoryList = new ArrayList<>();
private String muteReason;
private int muteTime;
Expand All @@ -62,7 +63,7 @@ public class FPlayer {

public FPlayer(@NotNull OfflinePlayer offlinePlayer) {
this.offlinePlayer = offlinePlayer;
this.uuid = offlinePlayer.getUniqueId().toString();
this.uuid = offlinePlayer.getUniqueId();

String offlinePlayerName = offlinePlayer.getName();
this.name = offlinePlayerName != null ? offlinePlayerName : "";
Expand All @@ -72,7 +73,7 @@ public FPlayer(@NotNull Player player) {
this.player = player;
this.offlinePlayer = player;
this.name = player.getName();
this.uuid = player.getUniqueId().toString();
this.uuid = player.getUniqueId();
}

public void initialize(@NotNull Player player) {
Expand Down Expand Up @@ -115,7 +116,7 @@ public OfflinePlayer getOfflinePlayer() {
}

@NotNull
public String getUUID() {
public UUID getUUID() {
return this.uuid;
}

Expand Down Expand Up @@ -261,27 +262,27 @@ public void unban() {
}

@NotNull
public ArrayList<String> getIgnoreList() {
public ArrayList<UUID> getIgnoreList() {
return ignoreList;
}

public void setIgnoreList(@NotNull ArrayList<String> ignoreList) {
public void setIgnoreList(@NotNull ArrayList<UUID> ignoreList) {
this.ignoreList = ignoreList;
}

public boolean isIgnored(@Nullable Player player) {
if (player == null || this.player == player) return false;

return isIgnored(player.getUniqueId().toString());
return isIgnored(player.getUniqueId());
}

public boolean isIgnored(@Nullable OfflinePlayer offlinePlayer) {
if (offlinePlayer == null || this.offlinePlayer == offlinePlayer) return false;

return isIgnored(offlinePlayer.getUniqueId().toString());
return isIgnored(offlinePlayer.getUniqueId());
}

public boolean isIgnored(@NotNull String uuid) {
public boolean isIgnored(@NotNull UUID uuid) {
return this.ignoreList.contains(uuid);
}

Expand Down Expand Up @@ -460,15 +461,15 @@ public void setWorldPrefix(World world) {
}

@NotNull
public HashMap<String, Mail> getMails() {
public HashMap<UUID, Mail> getMails() {
return mails;
}

public void addMail(@NotNull String uuid, @NotNull Mail mail) {
public void addMail(@NotNull UUID uuid, @NotNull Mail mail) {
mails.put(uuid, mail);
}

public void removeMail(@NotNull String uuid) {
public void removeMail(@NotNull UUID uuid) {
mails.get(uuid).setRemoved(true);
}

Expand Down

0 comments on commit 2500783

Please sign in to comment.