Skip to content

Fix formatting inconsistencies #49

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

Open
luke560 wants to merge 1 commit into
base: prod
Choose a base branch
from
Open

Fix formatting inconsistencies #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/me/totalfreedom/totalfreedommod/cmd/Command_kick.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public void kick(CommandSender sender, Player player, @Greedy String reason, @Sw

if (!silent)
{
adminAction(sender, reason == null ? "<aqua>Kicking <player>" : "<aqua>Kicking <player> - Reason: <reason>",
adminAction(sender, reason == null ? "<red>Kicking <player>" : "<red>Kicking <player> - Reason: <reason>",
Placeholder.unparsed("player", player.getName()),
MessageUtils.parsed("reason", reason != null ? reason : ""));

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/me/totalfreedom/totalfreedommod/cmd/Command_lockup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class Command_lockup extends FCommand
@Subcommand("all")
public void lockAll(CommandSender sender)
{
adminAction(sender, "<aqua>Locking up all players");
adminAction(sender, "<red>Locking up all players");

server().getOnlinePlayers().forEach(this::startLockup);

Expand Down Expand Up @@ -52,7 +52,7 @@ public void toggle(CommandSender sender, String name, String state)

if (state.equalsIgnoreCase("on"))
{
adminAction(sender, "<aqua>Locking up <player>", Placeholder.unparsed("player", player.getName()));
adminAction(sender, "<red>Locking up <player>", Placeholder.unparsed("player", player.getName()));
startLockup(player);
msg(sender, "<gray>Locked up <player>.", Placeholder.unparsed("player", player.getName()));
}
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/me/totalfreedom/totalfreedommod/cmd/Command_smite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,10 @@ public void smite(CommandSender sender, Player player, @Greedy String reason)

if (reason != null)
msg(
player,
// We take advantage of the String blocks newline byte here because it's encoded by MiniMessage and preserved in display.

@Paldiu Paldiu Jul 26, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not intuitive to most people so I would please leave this in place or move it to a JavaDoc on the method

@luke560 luke560 Jul 26, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then only people looking at this file will see the comment; I can put it back but imo it would be better to have this info available somewhere people would actually see it

@Paldiu Paldiu Jul 26, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should have a javadoc on the method itself in MessageUtils I think.

player,
"""
You have been smitten.
Reason: <yellow><reason>
<red>You have been smitten.
<red>Reason: <yellow><reason>\
""",
MessageUtils.parsed("reason", reason)
);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/me/totalfreedom/totalfreedommod/cmd/Command_stfu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public void list(CommandSender sender)
@Subcommand("purge")
public void purge(CommandSender sender)
{
adminAction(sender, "<aqua>Unmuting all players");
adminAction(sender, "<red>Unmuting all players");

final List<FPlayer> players = server().getOnlinePlayers()
.stream()
Expand Down Expand Up @@ -96,7 +96,7 @@ public void mutePlayerWithReason(CommandSender sender, Player player, @Greedy St

if (fplayer.isMuted())
{
adminAction(sender, "<aqua>Unmuting <player>", Placeholder.unparsed("player", player.getName()));
adminAction(sender, "<red>Unmuting <player>", Placeholder.unparsed("player", player.getName()));
fplayer.setMuted(false);
msg(player, "<green>You have been unmuted.");
}
Expand Down