Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit c55ba4a

Browse files
kangarkokangarko
committed
Apply code cleanup
1 parent 225a3d4 commit c55ba4a

22 files changed

+253
-262
lines changed

‎src/main/java/org/mineacademy/chatcontrol/ChatControl.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -82,23 +82,23 @@ public void onEnable() {
8282
for (final Player onlinePlayer : CompatProvider.getOnlinePlayers())
8383
getCache(onlinePlayer);
8484

85-
chatCeaser = new ChatCeaser();
86-
chatCeaser.load();
85+
this.chatCeaser = new ChatCeaser();
86+
this.chatCeaser.load();
8787

88-
formatter = new ChatFormatListener();
88+
this.formatter = new ChatFormatListener();
8989

90-
registerEvent(CompatProvider.compatChatEvent(), new ChatCheckListener(), Settings.ListenerPriority.CHECKER);
90+
this.registerEvent(CompatProvider.compatChatEvent(), new ChatCheckListener(), Settings.ListenerPriority.CHECKER);
9191

92-
getServer().getPluginManager().registerEvents(new PlayerListener(), this);
93-
getServer().getPluginManager().registerEvents(new CommandListener(), this);
92+
this.getServer().getPluginManager().registerEvents(new PlayerListener(), this);
93+
this.getServer().getPluginManager().registerEvents(new CommandListener(), this);
9494

9595
if (Settings.Console.FILTER_ENABLED)
9696
try {
9797
Log4jFilter.init();
9898
Common.debug("Console filtering now using Log4j Filter.");
9999
} catch (final NoClassDefFoundError err) {
100100
final Filter filter = new ConsoleFilter();
101-
for (final Plugin plugin : getServer().getPluginManager().getPlugins())
101+
for (final Plugin plugin : this.getServer().getPluginManager().getPlugins())
102102
plugin.getLogger().setFilter(filter);
103103

104104
Bukkit.getLogger().setFilter(filter);
@@ -118,14 +118,14 @@ public void onEnable() {
118118
else {
119119
Common.log("&3Starting &fformatter listener &3with " + Settings.ListenerPriority.FORMATTER + " priority");
120120

121-
registerEvent(CompatProvider.compatChatEvent(), formatter, Settings.ListenerPriority.FORMATTER);
121+
this.registerEvent(CompatProvider.compatChatEvent(), this.formatter, Settings.ListenerPriority.FORMATTER);
122122
}
123123
} else
124124
Common.logInFrame(false, "You need Vault to enable ChatFormatter.");
125125

126-
scheduleTimedMessages();
126+
this.scheduleTimedMessages();
127127

128-
getCommand("chatcontrol").setExecutor(new CommandsHandler());
128+
this.getCommand("chatcontrol").setExecutor(new CommandsHandler());
129129

130130
Common.addLoggingPrefix();
131131

@@ -134,7 +134,7 @@ public void onEnable() {
134134

135135
Common.log("&4!----------------------------------------------!");
136136
Common.log(" &cError loading ChatControl, plugin is disabled!");
137-
Common.log(" &cRunning on " + getServer().getBukkitVersion() + " and Java " + System.getProperty("java.version"));
137+
Common.log(" &cRunning on " + this.getServer().getBukkitVersion() + " and Java " + System.getProperty("java.version"));
138138
Common.log("&4!----------------------------------------------!");
139139

140140
if (t instanceof InvalidConfigurationException) {
@@ -147,7 +147,7 @@ public void onEnable() {
147147
Common.log(" &cChatControl doesn't have the locale: " + Settings.LOCALIZATION_SUFFIX);
148148

149149
else if (t instanceof UnsupportedOperationException || t.getCause() != null && t.getCause() instanceof UnsupportedOperationException) {
150-
if (getServer().getBukkitVersion().startsWith("1.2.5"))
150+
if (this.getServer().getBukkitVersion().startsWith("1.2.5"))
151151
Common.log(" &cSorry but Minecraft 1.2.5 is no longer supported!");
152152
else {
153153
Common.log(" &cUnable to determine server version!");
@@ -169,7 +169,7 @@ else if (t instanceof UnsupportedOperationException || t.getCause() != null && t
169169
}
170170
Common.log("&4!----------------------------------------------!");
171171

172-
getPluginLoader().disablePlugin(this);
172+
this.getPluginLoader().disablePlugin(this);
173173
}
174174
}
175175

@@ -178,19 +178,19 @@ public void onDisable() {
178178
muted = false;
179179
playerCacheMap.clear();
180180

181-
getServer().getScheduler().cancelTasks(this);
181+
this.getServer().getScheduler().cancelTasks(this);
182182

183183
instance = null;
184184
}
185185

186186
public void onReload() {
187-
if (getServer().getScheduler().isCurrentlyRunning(timedMessageTask))
188-
getServer().getScheduler().cancelTask(timedMessageTask);
187+
if (this.getServer().getScheduler().isCurrentlyRunning(this.timedMessageTask))
188+
this.getServer().getScheduler().cancelTask(this.timedMessageTask);
189189

190190
playerCacheMap.clear();
191191

192-
scheduleTimedMessages();
193-
chatCeaser.load();
192+
this.scheduleTimedMessages();
193+
this.chatCeaser.load();
194194
}
195195

196196
private void scheduleTimedMessages() {
@@ -219,7 +219,7 @@ private void scheduleTimedMessages() {
219219
Common.debug(" - " + msg);
220220
}
221221

222-
timedMessageTask = Bukkit.getScheduler().scheduleSyncRepeatingTask(this, () -> {
222+
this.timedMessageTask = Bukkit.getScheduler().scheduleSyncRepeatingTask(this, () -> {
223223
for (final String world : timed.keySet()) {
224224
final List<String> msgs = timed.get(world); // messages in world
225225

@@ -267,7 +267,7 @@ private void scheduleTimedMessages() {
267267
Common.tell(online, message.replace("{world}", online.getWorld().getName()));
268268

269269
} else {
270-
final World bukkitworld = getServer().getWorld(world);
270+
final World bukkitworld = this.getServer().getWorld(world);
271271

272272
if (bukkitworld == null)
273273
Common.warn("World \"" + world + "\" doesn't exist. No timed messages broadcast.");
@@ -281,8 +281,8 @@ private void scheduleTimedMessages() {
281281
}, 20, 20 * Settings.Messages.TIMED_DELAY_SECONDS);
282282
}
283283

284-
private final void registerEvent(Class<? extends org.bukkit.event.Event> eventClass, Object listener, EventPriority priority) {
285-
getServer().getPluginManager().registerEvent(eventClass, (Listener) listener, priority, (EventExecutor) listener, this, true);
284+
private void registerEvent(Class<? extends org.bukkit.event.Event> eventClass, Object listener, EventPriority priority) {
285+
this.getServer().getPluginManager().registerEvent(eventClass, (Listener) listener, priority, (EventExecutor) listener, this, true);
286286
}
287287

288288
public static void removeCache(Player player) {

‎src/main/java/org/mineacademy/chatcontrol/CommandsHandler.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public final class CommandsHandler implements CommandExecutor {
2020
@Override
2121
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
2222
try {
23-
handleCommand(sender, args);
23+
this.handleCommand(sender, args);
2424

2525
} catch (final MissingPermissionException ex) {
2626
Common.tell(sender, ex.getMessage());
@@ -52,7 +52,7 @@ private void handleCommand(CommandSender sender, String[] args) {
5252
* MUTE COMMAND
5353
*/
5454
if ("mute".equals(argument) || "m".equals(argument)) {
55-
checkPerm(sender, Permissions.Commands.MUTE);
55+
this.checkPerm(sender, Permissions.Commands.MUTE);
5656

5757
if (param.isEmpty())
5858
Common.broadcastIfEnabled(Settings.Mute.BROADCAST, sender, ChatControl.isMuted() ? Localization.MUTE_UNMUTE_BROADCAST : Localization.MUTE_BROADCAST, reason);
@@ -73,7 +73,7 @@ else if (param.startsWith("-")) {
7373
* CLEAR COMMAND
7474
*/
7575
else if ("clear".equals(argument) || "c".equals(argument)) {
76-
checkPerm(sender, Permissions.Commands.CLEAR);
76+
this.checkPerm(sender, Permissions.Commands.CLEAR);
7777

7878
if ((param.equals("-console") || param.equals("-c")) && Common.hasPermission(sender, Permissions.Commands.CLEAR_CONSOLE)) {
7979
for (int i = 0; i < Settings.Clear.CONSOLE_LINES; i++)
@@ -120,7 +120,7 @@ else if (param.startsWith("-")) {
120120
* FAKE COMMAND
121121
*/
122122
else if ("fake".equals(argument) || "f".equals(argument)) {
123-
checkPerm(sender, Permissions.Commands.FAKE);
123+
this.checkPerm(sender, Permissions.Commands.FAKE);
124124

125125
if (args.length < 2 || args.length > 3) {
126126
Common.tell(sender, Localization.USAGE_FAKE_CMD);
@@ -147,7 +147,7 @@ else if (fakeMessage.getType() == ChatMessage.Type.HIDDEN)
147147
Common.tell(sender, Localization.CANNOT_BROADCAST_EMPTY_MESSAGE.replace("{event}", Localization.Parts.JOIN));
148148

149149
else
150-
Common.broadcast(replacePlayerVariables(fakeMessage.getMessage(), onlineFakePlayer, fakePlayer));
150+
Common.broadcast(this.replacePlayerVariables(fakeMessage.getMessage(), onlineFakePlayer, fakePlayer));
151151

152152
} else if (param.equals("quit") || param.equals("q") || param.equals("leave") || param.equals("l")) {
153153
messageHelper = Settings.Messages.QUIT;
@@ -160,7 +160,7 @@ else if (fakeMessage.getType() == ChatMessage.Type.HIDDEN)
160160
Common.tell(sender, Localization.CANNOT_BROADCAST_EMPTY_MESSAGE.replace("{event}", Localization.Parts.QUIT));
161161

162162
else
163-
Common.broadcast(replacePlayerVariables(fakeMessage.getMessage(), onlineFakePlayer, fakePlayer));
163+
Common.broadcast(this.replacePlayerVariables(fakeMessage.getMessage(), onlineFakePlayer, fakePlayer));
164164

165165
} else if (param.equals("kick") || param.equals("k")) {
166166
messageHelper = Settings.Messages.KICK;
@@ -173,7 +173,7 @@ else if (fakeMessage.getType() == ChatMessage.Type.HIDDEN)
173173
Common.tell(sender, Localization.CANNOT_BROADCAST_EMPTY_MESSAGE.replace("{event}", Localization.Parts.QUIT));
174174

175175
else
176-
Common.broadcast(replacePlayerVariables(fakeMessage.getMessage(), onlineFakePlayer, fakePlayer));
176+
Common.broadcast(this.replacePlayerVariables(fakeMessage.getMessage(), onlineFakePlayer, fakePlayer));
177177

178178
} else
179179
Common.tell(sender, Localization.USAGE_FAKE_CMD);
@@ -184,7 +184,7 @@ else if (fakeMessage.getType() == ChatMessage.Type.HIDDEN)
184184
* RELOAD COMMAND
185185
*/
186186
else if ("reload".equals(argument) || "znovunacitat".equals(argument) || "r".equals(argument) || "rl".equals(argument)) {
187-
checkPerm(sender, Permissions.Commands.RELOAD);
187+
this.checkPerm(sender, Permissions.Commands.RELOAD);
188188

189189
final ChatControl instance = ChatControl.getInstance();
190190
try {
@@ -203,7 +203,7 @@ else if ("reload".equals(argument) || "znovunacitat".equals(argument) || "r".equ
203203
* LIST COMMAND
204204
*/
205205
else if ("commands".equals(argument) || "?".equals(argument) || "list".equals(argument) || "help".equals(argument)) {
206-
checkPerm(sender, Permissions.Commands.LIST);
206+
this.checkPerm(sender, Permissions.Commands.LIST);
207207

208208
Common.tell(sender,
209209
" ",

‎src/main/java/org/mineacademy/chatcontrol/PlayerCache.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ public void assignGroups(Player player) {
2626
if (!Settings.Groups.ENABLED)
2727
return;
2828

29-
if (groups == null || Settings.Groups.ALWAYS_CHECK_UPDATES) {
29+
if (this.groups == null || Settings.Groups.ALWAYS_CHECK_UPDATES) {
3030
Common.debug("&bLoading group for &f" + player.getName() + "&b ...");
3131

32-
groups = Group.loadFor(player);
32+
this.groups = Group.loadFor(player);
3333
}
3434
}
3535
}

‎src/main/java/org/mineacademy/chatcontrol/group/Group.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public Group(String name, List<GroupOption> settings) {
4545
}
4646

4747
public Collection<GroupOption> getSettings() {
48-
return settings.values();
48+
return this.settings.values();
4949
}
5050

5151
/**
@@ -55,13 +55,13 @@ public Collection<GroupOption> getSettings() {
5555
* @return
5656
*/
5757
public GroupOption getSetting(OptionType type) {
58-
return settings.get(type);
58+
return this.settings.get(type);
5959
}
6060

6161
public void addSetting(OptionType type, Object value) {
62-
Common.checkBoolean(!settings.containsKey(type), "Duplicate setting: " + type + " for: " + name);
62+
Common.checkBoolean(!this.settings.containsKey(type), "Duplicate setting: " + type + " for: " + this.name);
6363

64-
settings.put(type, type.create(value));
64+
this.settings.put(type, type.create(value));
6565
}
6666

6767
public static List<Group> loadFor(Player player) {

‎src/main/java/org/mineacademy/chatcontrol/group/GroupOption.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ public enum OptionType {
3434

3535
OptionType(Class<?> validValue) {
3636
this.validValue = validValue;
37-
toString = makeString();
37+
this.toString = this.makeString();
3838
}
3939

4040
public <T> GroupOption create(T valueRaw) {
4141
Object value = valueRaw;
4242

43-
if (!value.getClass().isAssignableFrom(validValue)) {
43+
if (!value.getClass().isAssignableFrom(this.validValue)) {
4444
value = null;
4545

4646
try {
@@ -60,9 +60,9 @@ public <T> GroupOption create(T valueRaw) {
6060
value = valueRaw;
6161
}
6262

63-
checkValid(value);
63+
this.checkValid(value);
6464

65-
return new GroupOption(this, validValue == ChatMessage.class && valueRaw.getClass() != ChatMessage.class ? new ChatMessage(String.valueOf(value)) : value);
65+
return new GroupOption(this, this.validValue == ChatMessage.class && valueRaw.getClass() != ChatMessage.class ? new ChatMessage(String.valueOf(value)) : value);
6666
}
6767

6868
public static OptionType parseOption(String name) {
@@ -74,14 +74,14 @@ public static OptionType parseOption(String name) {
7474
}
7575

7676
private void checkValid(Object value) {
77-
if (validValue == ChatMessage.class) {
77+
if (this.validValue == ChatMessage.class) {
7878
// all valid
7979
} else
80-
Common.checkBoolean(value.getClass().isAssignableFrom(validValue), this + " has to be " + validValue.getSimpleName() + "! (got " + value + ")");
80+
Common.checkBoolean(value.getClass().isAssignableFrom(this.validValue), this + " has to be " + this.validValue.getSimpleName() + "! (got " + value + ")");
8181
}
8282

8383
private String makeString() {
84-
final String[] splitted = name().toLowerCase().split("_");
84+
final String[] splitted = this.name().toLowerCase().split("_");
8585
String nazov = "";
8686

8787
for (final String part : splitted)
@@ -92,7 +92,7 @@ private String makeString() {
9292

9393
@Override
9494
public String toString() {
95-
return toString;
95+
return this.toString;
9696
}
9797
}
9898
}

0 commit comments

Comments
 (0)