Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #3 - Changed classes to be records #5

Merged
merged 5 commits into from
Nov 6, 2021
Merged

Issue #3 - Changed classes to be records #5

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c12bbb2
Changed classes to be records
ReyhanPatria Nov 4, 2021
b5c11ee
Changed get methods to comply with records
ReyhanPatria Nov 4, 2021
9d8e5bd
Reverted deleted toString function
ReyhanPatria Nov 4, 2021
64530e8
Reverted Birthday to class
ReyhanPatria Nov 5, 2021
e917d18
Merge branch 'issue-#3' of https://github.com/ReyhanPatria/FarLands i…
ReyhanPatria Nov 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/net/farlands/sanctuary/command/player/CommandLastDeath.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ protected boolean execute(Player sender, String[] args) {
return true;
}

Location deathLocation = deaths.get(deaths.size()-1).getLocation();
Location deathLocation = deaths.get(deaths.size()-1).location();
String s = "You died at " +
deathLocation.getBlockX() + ", " +
deathLocation.getBlockY() + ", " +
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/farlands/sanctuary/command/player/CommandMail.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public boolean execute(CommandSender sender, String[] args) {
}

// Prevent someone from spamming mail
if (recipientFlp.mail.stream().filter(msg -> msg.getSender().equals(sender.getName())).count() >= 5) {
if (recipientFlp.mail.stream().filter(msg -> msg.sender().equals(sender.getName())).count() >= 5) {
sendFormatted(sender, "&(red)You cannot send any more mail to this person until they " +
"read your current messages and clear them.");
return true;
Expand Down Expand Up @@ -123,7 +123,7 @@ else if (index >= senderFlp.mail.size()) {
MailMessage message;
for (int i = index; i < Math.min(index + 5, senderFlp.mail.size()); ++i) {
message = senderFlp.mail.get(i);
sendMailMessage(sender, "From", ChatColor.GOLD, message.getSender(), message.getMessage());
sendMailMessage(sender, "From", ChatColor.GOLD, message.sender(), message.message());
}

sendFormatted(sender, "&(gold)Clear your mail with $(hovercmd,/mail clear,{&(gray)Click to Run},&(yellow)/mail clear)");
Expand Down
20 changes: 10 additions & 10 deletions src/main/java/net/farlands/sanctuary/command/player/CommandPackageAccept.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protected boolean execute(Player sender, String[] args) {

String packageID = "";
if (packages.size() == 1) {
packageID = packages.get(0).senderName;
packageID = packages.get(0).senderName();
}

if (!packageID.isEmpty()) {
Expand All @@ -60,7 +60,7 @@ protected boolean execute(Player sender, String[] args) {
}

for (Package lPackage : packages) {
if (Chat.removeColorCodes(lPackage.senderName.replaceAll("\\{+|}+", "")).equalsIgnoreCase(packageID)) {
if (Chat.removeColorCodes(lPackage.senderName().replaceAll("\\{+|}+", "")).equalsIgnoreCase(packageID)) {
if ("paccept".equalsIgnoreCase(args[0])) {
accept(sender, lPackage);
} else {
Expand All @@ -78,29 +78,29 @@ protected boolean execute(Player sender, String[] args) {
private void accept(Player sender, Package lPackage){
sender.sendMessage(
ComponentColor.gold("Receiving package from ")
.append(ComponentColor.aqua(lPackage.senderName))
.append(ComponentColor.aqua(lPackage.senderName()))
.append(ComponentColor.gold("."))
);
final String message = lPackage.message;
final String message = lPackage.message();
if (message != null && !message.isEmpty()) {
sender.sendMessage(
ComponentColor.gold("Item ")
.append(ComponentUtils.item(lPackage.item))
.append(ComponentUtils.item(lPackage.item()))
.append(ComponentColor.gold(" was sent with the following message "))
.append(ComponentColor.aqua(message))
);
}
FLUtils.giveItem(sender, lPackage.item, true);
FLUtils.giveItem(sender, lPackage.item(), true);
}
private void decline(Player sender, Package lPackage){
sender.sendMessage(
ComponentColor.gold("Returning package to ")
.append(ComponentColor.aqua(lPackage.senderName))
.append(ComponentColor.aqua(lPackage.senderName()))
);
OfflineFLPlayer packageSenderFlp = FarLands.getDataHandler().getOfflineFLPlayer(lPackage.senderUuid);
OfflineFLPlayer packageSenderFlp = FarLands.getDataHandler().getOfflineFLPlayer(lPackage.senderUuid());
FarLands.getDataHandler().addPackage(packageSenderFlp.uuid,
new Package(null, "FarLands Packaging Service",
lPackage.item, "Return To Sender", true)
lPackage.item(), "Return To Sender", true)
);
if (packageSenderFlp.isOnline()) {
packageSenderFlp.getSession().givePackages();
Expand All @@ -114,6 +114,6 @@ public List<String> tabComplete(CommandSender sender, String alias, String[] arg
Player player = (Player)sender;
return TabCompleterBase.filterStartingWith(args.length > 1 ? args[1] : "",
FarLands.getDataHandler().getPackages(player.getUniqueId()).stream()
.map(p -> Chat.removeColorCodes(p.senderName.replaceAll("\\{+|}+", ""))));
.map(p -> Chat.removeColorCodes(p.senderName().replaceAll("\\{+|}+", ""))));
}
}
18 changes: 9 additions & 9 deletions src/main/java/net/farlands/sanctuary/command/player/CommandPackageView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public boolean execute(CommandSender sender, String[] args) {

List<Package> validPackages = packages.stream()
.filter(p -> {
String formattedSenderName = Chat.removeColorCodes(p.senderName.replaceAll("\\{+|}+", ""));;
String formattedSenderName = Chat.removeColorCodes(p.senderName().replaceAll("\\{+|}+", ""));;
return (args.length >= 1 && !args[0].equalsIgnoreCase("all") &&
viewFlp.getDisplayName().equalsIgnoreCase(formattedSenderName)) ||
args.length == 0 || args[0].equalsIgnoreCase("all");
Expand Down Expand Up @@ -96,7 +96,7 @@ public boolean execute(CommandSender sender, String[] args) {
String username = FarLands
.getDataHandler()
.getOfflineFLPlayer(
validPackages.get(0).senderUuid
validPackages.get(0).senderUuid()
).username;
Component accept = ComponentUtils.command(
"/paccept " + username,
Expand Down Expand Up @@ -126,24 +126,24 @@ public boolean execute(CommandSender sender, String[] args) {
TextComponent.Builder line = Component.text()
.color(NamedTextColor.GOLD);

Component itemDisplay = ComponentColor.gold(lPackage.item.getAmount() + " x [")
.append(ComponentUtils.item(lPackage.item))
Component itemDisplay = ComponentColor.gold(lPackage.item().getAmount() + " x [")
.append(ComponentUtils.item(lPackage.item()))
.append(ComponentColor.gold("]"));

OfflineFLPlayer packageSender = FarLands.getDataHandler().getOfflineFLPlayer(lPackage.senderUuid);
String username = Chat.removeColorCodes(lPackage.senderName.replaceAll("\\{+|}+", ""));
OfflineFLPlayer packageSender = FarLands.getDataHandler().getOfflineFLPlayer(lPackage.senderUuid());
String username = Chat.removeColorCodes(lPackage.senderName().replaceAll("\\{+|}+", ""));

if (args.length >= 1 && !args[0].equalsIgnoreCase("all") && viewFlp.getDisplayName().equalsIgnoreCase(username)) {
line.append(itemDisplay)
.append(ComponentColor.gold(" - "))
.append(ComponentColor.green(lPackage.message));
.append(ComponentColor.green(lPackage.message()));

}
if (args.length == 0 || args[0].equalsIgnoreCase("all")) {
line.append(
ComponentUtils.hover(
ComponentColor.aqua(packageSender.username),
ComponentColor.aqua(lPackage.message)
ComponentColor.aqua(lPackage.message())
)
)
.append(ComponentColor.gold(": "))
Expand Down Expand Up @@ -196,7 +196,7 @@ public List<String> tabComplete(CommandSender sender, String alias, String[] arg
}
switch(args.length){
case 1:
List<String> values = FarLands.getDataHandler().getPackages(flp.uuid).stream().map(p -> FarLands.getDataHandler().getOfflineFLPlayer(p.senderUuid).username).collect(Collectors.toList());
List<String> values = FarLands.getDataHandler().getPackages(flp.uuid).stream().map(p -> FarLands.getDataHandler().getOfflineFLPlayer(p.senderUuid()).username).collect(Collectors.toList());
values.add("all");
return TabCompleterBase.filterStartingWith(args[0], values);
case 2:
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/net/farlands/sanctuary/command/player/CommandSharehome.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ private boolean acceptDeclineHome(boolean accepted, Player sender, String[] args
return true;
}

String homeName = shareHome.home.getName();
String homeName = shareHome.home().getName();
if (args.length == 3) {
// Make sure the home name is valid
if (args[2].isEmpty() || args[2].matches("\\s+") || Chat.getMessageFilter().isProfane(args[2])) {
Expand All @@ -157,16 +157,16 @@ private boolean acceptDeclineHome(boolean accepted, Player sender, String[] args
sender.sendMessage(ComponentColor.red("You already have a home by this name."));
return true;
}
flp.addHome(homeName, shareHome.home.asLocation());
flp.addHome(homeName, shareHome.home().asLocation());
sender.sendMessage(
ComponentColor.green("Home ")
.append(ComponentColor.aqua(homeName))
.append(ComponentColor.green(" added!"))
);
} else {
sender.sendMessage(ComponentColor.green("Declined home sent by %s.", shareHome.sender));
sender.sendMessage(ComponentColor.green("Declined home sent by %s.", shareHome.sender()));
}
flp.removeShareHome(shareHome.sender);
flp.removeShareHome(shareHome.sender());
return true;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/farlands/sanctuary/command/staff/CommandDeath.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public boolean execute(Player sender, String[] args) {
return true;
}
}
Location deathLocation = deaths.get(death).getLocation();
Location deathLocation = deaths.get(death).location();
sender.teleport(deathLocation);
sendFormatted(sender, "&(gray)Player {&(white)%0} died at " +
"$(hovercmd,/tl %1 %2 %3 %4 %5 %6,{&(gray)Click to teleport},&(white)%1 %2 %3 %4 %5 %6)",
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/farlands/sanctuary/command/staff/CommandMute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public boolean execute(CommandSender sender, String[] args) {
if(flp.isOnline())
mute.sendMuteMessage(flp.getOnlinePlayer());
// Send formatted message to player and discord
String message = "uted " + flp.username + " with reason `" + mute.getReason() + "`. Expires: " +
String message = "uted " + flp.username + " with reason `" + mute.reason() + "`. Expires: " +
TimeInterval.formatTime(1000L * time, false);
sendFormatted(sender, "&(gold)M%0", message.replaceAll("`", "\""));
FarLands.getDiscordHandler().sendMessageRaw(DiscordChannel.NOTEBOOK, Chat.applyDiscordFilters(sender.getName()) + " m" +
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/farlands/sanctuary/command/staff/CommandRestoreDeath.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public boolean execute(CommandSender sender, String[] args) {
}

PlayerDeath deathData = deaths.get(death);
List<ItemStack> deathInv = deathData.getInventory();
List<ItemStack> deathInv = deathData.inventory();

if (preview) {
if (!(sender instanceof Player)) {
Expand All @@ -75,8 +75,8 @@ public boolean execute(CommandSender sender, String[] args) {
return true;
}

player.setLevel(deathData.getXpLevels());
player.setExp(deathData.getXpPoints());
player.setLevel(deathData.xpLevels());
player.setExp(deathData.xpPoints());
for (int i = deathInv.size(); --i >= 0;)
player.getInventory().setItem(i, deathInv.get(i));

Expand Down
18 changes: 9 additions & 9 deletions src/main/java/net/farlands/sanctuary/data/DataHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,9 +546,9 @@ public void loadPackages() {
});
packages.put(UUID.fromString(key), individualPackages);
});
rtsPackages.forEach(lPackage -> addPackage(lPackage.senderUuid,
rtsPackages.forEach(lPackage -> addPackage(lPackage.senderUuid(),
new Package(null, "FarLands Packaging Service",
lPackage.item, "Return To Sender", true)
lPackage.item(), "Return To Sender", true)
));
}

Expand All @@ -559,12 +559,12 @@ public void savePackages() {
NBTTagCompound serIndividualPackages = new NBTTagCompound();
individualPackages.forEach(lPackage -> {
NBTTagCompound packageNBT = new NBTTagCompound();
packageNBT.setString("sender", lPackage.senderUuid == null ? "" : lPackage.senderUuid.toString());
packageNBT.set("item", FLUtils.itemStackToNBT(lPackage.item));
packageNBT.setString("message", lPackage.message);
packageNBT.setLong("sentTime", lPackage.sentTime);
packageNBT.setBoolean("forceSend", lPackage.forceSend);
serIndividualPackages.set(lPackage.senderName, packageNBT);
packageNBT.setString("sender", lPackage.senderUuid() == null ? "" : lPackage.senderUuid().toString());
packageNBT.set("item", FLUtils.itemStackToNBT(lPackage.item()));
packageNBT.setString("message", lPackage.message());
packageNBT.setLong("sentTime", lPackage.sentTime());
packageNBT.setBoolean("forceSend", lPackage.forceSend());
serIndividualPackages.set(lPackage.senderName(), packageNBT);
});
nbt.set(uuid.toString(), serIndividualPackages);
}
Expand All @@ -585,7 +585,7 @@ public boolean addPackage(UUID recipient, Package pack) {
localPackages = packages.get(recipient);

for (Package lPackage : localPackages) {
if (pack.senderUuid != null && pack.senderUuid.equals(lPackage.senderUuid))
if (pack.senderUuid() != null && pack.senderUuid().equals(lPackage.senderUuid()))
return false;
}
localPackages.add(pack);
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/net/farlands/sanctuary/data/FLPlayerSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,13 +246,13 @@ public void update(boolean sendMessages) {
List<String> pendingHomes = new ArrayList<>();

handle.pendingSharehomes.forEach((k, v) -> {
String message = v.message == null ? "" : "&(gold)Message: &(aqua)" + v.message.replaceAll(",", " ") + "\n";
String message = v.message() == null ? "" : "&(gold)Message: &(aqua)" + v.message().replaceAll(",", " ") + "\n";
pendingHomes.add(
"{" +
"$(click:suggest_command,/sharehome accept " + k + " )" +
"$(hover:show_text," +
"&(gold)Sender: &(aqua)" + k + "\n" +
message + "&(gold)Name: &(aqua)" + v.home.getName() + "\n" +
message + "&(gold)Name: &(aqua)" + v.home().getName() + "\n" +
"&(" +
"gray)Click to accept" +
")&(aqua)" + k +
Expand Down Expand Up @@ -312,24 +312,24 @@ public void givePackages() {
List<Package> packages = FarLands.getDataHandler().getPackages(handle.uuid);
boolean sentMessage = true;
for (int i = packages.size(); --i >= 0; ) {
if (packages.get(i).forceSend || handle.packageToggle == PackageToggle.ACCEPT) {
if (packages.get(i).forceSend() || handle.packageToggle == PackageToggle.ACCEPT) {
if (sentMessage) {
sentMessage = false;
// Notify the player how many packages they've been sent
TextUtils.sendFormatted(
player, "&(gold)Receiving {&(aqua)%0} $(inflect,noun,0,package) from {&(aqua)%1}.",
packages.size(),
packages.stream().filter(p -> p.forceSend || handle.packageToggle == PackageToggle.ACCEPT)
.map(laPackage -> "{" + laPackage.senderName + "}")
packages.stream().filter(p -> p.forceSend() || handle.packageToggle == PackageToggle.ACCEPT)
.map(laPackage -> "{" + laPackage.senderName() + "}")
.collect(Collectors.joining(", "))
);
}
// Give the packages and send the messages
final String message = packages.get(i).message;
final String message = packages.get(i).message();
if (message != null && !message.isEmpty())
TextUtils.sendFormatted(player, "&(gold)Item {&(aqua)%0} was sent with the following message {&(aqua)%1}",
FLUtils.itemName(packages.get(i).item), message);
FLUtils.giveItem(player, packages.get(i).item, true);
FLUtils.itemName(packages.get(i).item()), message);
FLUtils.giveItem(player, packages.get(i).item(), true);
packages.remove(i);
}
}
Expand All @@ -340,7 +340,7 @@ public void givePackages() {
player, "&(gold)Receiving {&(aqua)%0} $(inflect,noun,0,package) from {&(aqua)%1}." +
" Use /paccecpt|pdecline <player> to accept or decline the packages.",
packages.size(),
packages.stream().map(lPackage -> "{" + lPackage.senderName + "}").collect(Collectors.joining(", "))
packages.stream().map(lPackage -> "{" + lPackage.senderName() + "}").collect(Collectors.joining(", "))
);
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/farlands/sanctuary/data/PlayerDataHandlerOld.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ public synchronized void saveFLPlayerComplete(OfflineFLPlayer flp) {
ps.setBytes(1, uuid);
ps.executeUpdate();
ps.close();
flp.mail.forEach(m -> addMail(flp.uuid, m.getSender(), m.getMessage()));
flp.mail.forEach(m -> addMail(flp.uuid, m.sender(), m.message()));
} catch (SQLException ex) {
ex.printStackTrace();
}
Expand Down Expand Up @@ -489,8 +489,8 @@ public synchronized void saveFLPlayer(OfflineFLPlayer flp, PreparedStatement sav
saveFlp.setLong(22, 0);
saveFlp.setString(23, "");
} else {
saveFlp.setLong(22, flp.currentMute.getDateEnds());
saveFlp.setString(23, flp.currentMute.getReason());
saveFlp.setLong(22, flp.currentMute.dateEnds());
saveFlp.setString(23, flp.currentMute.reason());
}
byte[] ignored = new byte[flp.ignoreStatusMap.size() * 16];
int i = 0;
Expand Down
7 changes: 2 additions & 5 deletions src/main/java/net/farlands/sanctuary/data/struct/Birthday.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@
/**
* Represents a player birthday!
*/
public class Birthday {
private final int month;
private final int day;

public record Birthday(int month, int day) {
public Birthday(int month, int day) {
this.month = month - 1;
this.day = day;
Expand All @@ -35,7 +32,7 @@ public boolean isToday() {
public String toString() {
return (month + 1) + "/" + day;
}

/**
* Formats the Birthday as month + Day
*
Expand Down
8 changes: 3 additions & 5 deletions src/main/java/net/farlands/sanctuary/data/struct/EvidenceLocker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,14 @@
/**
* A player evidence locker for storing items when a player has been punished.
*/
public class EvidenceLocker {
private final Map<String, List<ItemStack>> lockers;

public record EvidenceLocker(Map<String, List<ItemStack>> lockers) {
public EvidenceLocker(OfflineFLPlayer flp) {
this.lockers = new HashMap<>();
this(new HashMap<>());
flp.punishments.forEach(punishment -> lockers.put(punishment.toUniqueString(), new ArrayList<>()));
}

public EvidenceLocker(NBTTagCompound nbt) {
this.lockers = new HashMap<>();
this(new HashMap<>());
for (String key : nbt.getKeys()) {
NBTTagList serLocker = nbt.getList(key, 10);
List<ItemStack> locker = new ArrayList<>();
Expand Down
Loading