Skip to content

Commit 4a30d72

Browse files
committed
Code improvements
1 parent 4599118 commit 4a30d72

File tree

9 files changed

+17
-17
lines changed

9 files changed

+17
-17
lines changed

src/main/java/me/rothes/protocolstringreplacer/Updater.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
public class Updater implements Listener {
2929

30-
private static final String VERSION_CHANCEL = "Stable";
30+
private static final String VERSION_CHANNEL = "Stable";
3131
private static final int VERSION_NUMBER = 105;
3232
private final HashMap<String, Integer> msgTimesMap = new HashMap<>();
3333
private final List<String> messages = new ArrayList<>();
@@ -123,15 +123,15 @@ private void checkJson(String json) {
123123
JsonObject channels = root.getAsJsonObject("Version_Channels");
124124

125125
messages.clear();
126-
if (channels.has(VERSION_CHANCEL)) {
127-
JsonObject channel = channels.getAsJsonObject(VERSION_CHANCEL);
126+
if (channels.has(VERSION_CHANNEL)) {
127+
JsonObject channel = channels.getAsJsonObject(VERSION_CHANNEL);
128128
if (channel.has("Message")
129129
&& channel.getAsJsonPrimitive("Latest_Version_Number").getAsInt() > VERSION_NUMBER) {
130130
sendJsonMessage(channel, "updater");
131131
}
132132
} else {
133-
ProtocolStringReplacer.warn(PsrLocalization.getLocaledMessage("Console-Sender.Messages.Updater.Invalid-Channel", VERSION_CHANCEL));
134-
messages.add(PsrLocalization.getLocaledMessage("Console-Sender.Messages.Updater.Invalid-Channel", VERSION_CHANCEL));
133+
ProtocolStringReplacer.warn(PsrLocalization.getLocaledMessage("Console-Sender.Messages.Updater.Invalid-Channel", VERSION_CHANNEL));
134+
messages.add(PsrLocalization.getLocaledMessage("Console-Sender.Messages.Updater.Invalid-Channel", VERSION_CHANNEL));
135135
return;
136136
}
137137

src/main/java/me/rothes/protocolstringreplacer/api/user/PsrUserManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
public class PsrUserManager {
1313

14-
private HashMap<UUID, PsrUser> users = new HashMap<>();
15-
private PsrUser console = new PsrUser(Bukkit.getConsoleSender());
14+
private final HashMap<UUID, PsrUser> users = new HashMap<>();
15+
private final PsrUser console = new PsrUser(Bukkit.getConsoleSender());
1616

1717
public PsrUser getUser(@NotNull UUID uuid) {
1818
return users.getOrDefault(uuid, loadUser(uuid));

src/main/java/me/rothes/protocolstringreplacer/commands/CommandHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
public class CommandHandler implements TabCompleter, CommandExecutor {
2626

27-
private LinkedList<SubCommand> subCommands = new LinkedList<>();
27+
private final LinkedList<SubCommand> subCommands = new LinkedList<>();
2828

2929
public void initialize() {
3030
ProtocolStringReplacer.getInstance().getCommand("ProtocolStringReplacer").setExecutor(this);

src/main/java/me/rothes/protocolstringreplacer/commands/SubCommand.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
public abstract class SubCommand {
99

10-
private String name;
11-
private String permission;
12-
private String description;
10+
private final String name;
11+
private final String permission;
12+
private final String description;
1313

1414
public SubCommand(@Nonnull String name, @Nonnull String permission, @Nonnull String description) {
1515
this.name = name;

src/main/java/me/rothes/protocolstringreplacer/commands/subcommands/Edit.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
public class Edit extends SubCommand {
1717

18-
private LinkedList<SubCommand> childCommands = new LinkedList<>();
18+
private final LinkedList<SubCommand> childCommands = new LinkedList<>();
1919

2020
public Edit() {
2121
super("edit", "protocolstringreplacer.command.edit",

src/main/java/me/rothes/protocolstringreplacer/console/PsrFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
public class PsrFilter implements Filter {
1818

19-
private ProtocolStringReplacer plugin;
19+
private final ProtocolStringReplacer plugin;
2020
private boolean started = false;
2121

2222
public PsrFilter(@NotNull ProtocolStringReplacer plugin) {

src/main/java/me/rothes/protocolstringreplacer/console/PsrWrappedLineReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
public class PsrWrappedLineReader implements LineReader{
2525

26-
private LineReader reader;
26+
private final LineReader reader;
2727

2828
public PsrWrappedLineReader(LineReader reader) {
2929
this.reader = reader;

src/main/java/me/rothes/protocolstringreplacer/packetlisteners/server/AbstractServerComponentsPacketListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ protected AbstractServerComponentsPacketListener(PacketType packetType, ListenTy
1919
super(packetType, listenType);
2020
}
2121

22-
protected BaseComponent[] getSpigotComponent(StructureModifier<Object> modifier) {
22+
protected static BaseComponent[] getSpigotComponent(StructureModifier<Object> modifier) {
2323
if (!ProtocolStringReplacer.getInstance().isSpigot()) {
2424
return null;
2525
}
@@ -48,7 +48,7 @@ protected String processSpigotComponent(StructureModifier<Object> modifier, Pack
4848
return result == null ? BLOCKED_JSON : result;
4949
}
5050

51-
protected Component getPaperComponent(StructureModifier<Object> modifier) {
51+
protected static Component getPaperComponent(StructureModifier<Object> modifier) {
5252
if (!ProtocolStringReplacer.getInstance().hasPaperComponent()) {
5353
return null;
5454
}

src/main/java/me/rothes/protocolstringreplacer/utils/ArgUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
public class ArgUtils {
1111

12-
private static Pattern lastQuotes = Pattern.compile("\"+$");
12+
private static final Pattern lastQuotes = Pattern.compile("\"+$");
1313

1414
@Nonnull
1515
public static String formatWithQuotes(@Nonnull String string) {

0 commit comments

Comments
 (0)