Skip to content

Commit 0514ef2

Browse files
bierdosenhalterbierdosenhalter
committed
code cleanup
1 parent 2506c22 commit 0514ef2

10 files changed

Lines changed: 419 additions & 365 deletions

File tree

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
- Players can whisper other players (defaults to a purple color).
88
- Players can ignore another player (works for both world and whisper chat). Ignore lists are persistent between logins.
99
Players can also unignore a previously ignored player.
10-
- Allows for a cusomizable spoiler text system (who wants to ruin the walking dead for everyone?).
10+
- Allows for a customizable spoiler text system (who wants to ruin the walking dead for everyone?).
1111
- Players can toggle chat on/off.
1212
- Full permission support so that you can limit who has access to what colors / features.
1313
- Allows the administrator to log whispers between players.
1414

15-
**Popular servers known (or thought) to be running this plugin:**
15+
**Popular servers known or thought to be running this plugin:**
1616

1717
- 9b9t.com
1818
- Anarchy.pw
@@ -78,7 +78,7 @@ You can customize the appearance of whispers.
7878

7979
- Fully Async Chat
8080
- Groups?
81-
- Customizeable Death Messages
81+
- Customizable Death Messages
8282
- Last time a player was seen online?
8383

8484
**Minecraft Versions (Confirmed Working):**

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>com.gmail.fyrvelm.ChatCo</groupId>
7+
<groupId>com.gmail.fyrvelm.chatco</groupId>
88
<artifactId>ChatCo</artifactId>
9-
<version>0.24</version>
9+
<version>0.25</version>
1010
<packaging>jar</packaging>
1111

1212
<name>ChatCo</name>
@@ -16,7 +16,7 @@
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
</properties>
1818

19-
<description>ChatCo is a simple chat plugin.</description>
19+
<description>An efficient chat system with green-text, ignore, whispers and chat logging.</description>
2020

2121
<build>
2222
<plugins>

src/main/java/com/gmail/fyrvelm/ChatCo/CCAllChat.java renamed to src/main/java/com/gmail/fyrvelm/chatco/CCAllChat.java

Lines changed: 38 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,27 @@
1-
package com.gmail.fyrvelm.ChatCo;
1+
package com.gmail.fyrvelm.chatco;
22

3-
import org.bukkit.event.player.PlayerKickEvent;
4-
import org.bukkit.event.player.PlayerQuitEvent;
5-
import org.bukkit.event.EventHandler;
6-
import java.io.IOException;
7-
import org.bukkit.configuration.file.YamlConfiguration;
8-
import org.bukkit.event.player.AsyncPlayerChatEvent;
93
import org.bukkit.ChatColor;
10-
import org.bukkit.entity.Player;
11-
import java.io.File;
124
import org.bukkit.configuration.file.FileConfiguration;
5+
import org.bukkit.configuration.file.YamlConfiguration;
6+
import org.bukkit.entity.Player;
7+
import org.bukkit.event.EventHandler;
138
import org.bukkit.event.Listener;
9+
import org.bukkit.event.player.AsyncPlayerChatEvent;
10+
import org.bukkit.event.player.PlayerKickEvent;
11+
import org.bukkit.event.player.PlayerQuitEvent;
12+
13+
import java.io.File;
14+
import java.io.IOException;
1415

15-
public class CCAllChat implements Listener
16-
{
17-
public ChatCo plugin;
16+
public class CCAllChat implements Listener {
17+
private static final String CANCEL = "14CANCELIMMEDIATELY14712381230412A42088";
18+
public final ChatCo plugin;
1819
private FileConfiguration permissionConfig;
19-
private File customConfig;
20-
private static String CANCEL;
21-
22-
static {
23-
CCAllChat.CANCEL = "14CANCELIMMEDIATELY14712381230412A42088";
24-
}
25-
20+
2621
public CCAllChat(final ChatCo plugin) {
2722
this.plugin = plugin;
2823
}
29-
24+
3025
public String ColorManager(String msg, final Player player) {
3126
if ((this.permissionConfig.getBoolean("ChatCo.ChatPrefixes.Green") || player.hasPermission("ChatCo.ChatPrefixes.Green")) && !this.plugin.getConfig().getString("ChatCo.ChatPrefixes.Green").equals("!#") && msg.startsWith(this.plugin.getConfig().getString("ChatCo.ChatPrefixes.Green"))) {
3227
msg = ChatColor.GREEN + msg;
@@ -87,7 +82,7 @@ public String ColorManager(String msg, final Player player) {
8782
}
8883
return msg;
8984
}
90-
85+
9186
public String ColorCodeManager(String data, final Player player) {
9287
if ((this.permissionConfig.getBoolean("ChatCo.ColorCodes.White") || player.hasPermission("ChatCo.ColorCodes.White")) && !this.plugin.getConfig().getString("ChatCo.ChatColors.White").equals("!#")) {
9388
data = data.replace(this.plugin.getConfig().getString("ChatCo.ChatColors.White"), ChatColor.WHITE.toString());
@@ -154,45 +149,44 @@ public String ColorCodeManager(String data, final Player player) {
154149
}
155150
return data;
156151
}
157-
158-
@EventHandler
159-
public void onPlayerChat(final AsyncPlayerChatEvent event) throws IOException {
160-
if (event.isCancelled()) {
161-
return;
162-
}
163-
this.customConfig = ChatCo.Configuration2;
164-
this.permissionConfig = (FileConfiguration)YamlConfiguration.loadConfiguration(this.customConfig);
152+
153+
@EventHandler(ignoreCancelled = true)
154+
public void onPlayerChat(final AsyncPlayerChatEvent event) {
155+
File customConfig = ChatCo.Configuration2;
156+
this.permissionConfig = YamlConfiguration.loadConfiguration(customConfig);
165157
final Player player = event.getPlayer();
166158
final Player[] recipients = event.getRecipients().toArray(new Player[0]);
167-
CCPlayer cp = null;
168-
for (int i = 0; i < recipients.length; ++i) {
159+
CCPlayer cp;
160+
161+
for (Player recipient : recipients) {
169162
try {
170-
cp = this.plugin.getCCPlayer(recipients[i]);
171-
}
172-
catch (IOException e) {
163+
cp = this.plugin.getCCPlayer(recipient);
164+
165+
if ((cp.chatDisabled && this.plugin.checkForChatDisable) || (cp.isIgnored(player.getName()) && this.plugin.checkForIgnores)) {
166+
event.getRecipients().remove(recipient);
167+
}
168+
} catch (IOException | NullPointerException e) {
173169
e.printStackTrace();
174170
}
175-
if ((cp.chatDisabled && this.plugin.checkForChatDisable) || (cp.isIgnored(player.getName()) && this.plugin.checkForIgnores)) {
176-
event.getRecipients().remove(recipients[i]);
177-
}
178171
}
172+
179173
String msg = this.ColorManager(event.getMessage(), player);
180174
msg = this.ColorCodeManager(msg, player);
181-
if (msg == CCAllChat.CANCEL) {
175+
176+
if (msg.equals(CCAllChat.CANCEL)) {
182177
event.setCancelled(true);
183-
}
184-
else {
178+
} else {
185179
event.setMessage(msg);
186180
}
187181
}
188-
182+
189183
@EventHandler
190184
public void onPlayerQuit(final PlayerQuitEvent e) {
191-
this.plugin.playerlist.remove(e.getPlayer());
185+
this.plugin.remove(e.getPlayer());
192186
}
193-
187+
194188
@EventHandler
195189
public void onPlayerKick(final PlayerKickEvent e) {
196-
this.plugin.playerlist.remove(e.getPlayer());
190+
this.plugin.remove(e.getPlayer());
197191
}
198192
}

src/main/java/com/gmail/fyrvelm/ChatCo/CCPlayer.java renamed to src/main/java/com/gmail/fyrvelm/chatco/CCPlayer.java

Lines changed: 29 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,21 @@
1-
package com.gmail.fyrvelm.ChatCo;
1+
package com.gmail.fyrvelm.chatco;
22

3-
import java.util.ArrayList;
4-
import java.io.Reader;
5-
import java.io.BufferedReader;
6-
import java.io.InputStream;
7-
import java.io.InputStreamReader;
8-
import java.io.FileInputStream;
93
import org.bukkit.Bukkit;
10-
import java.util.Iterator;
11-
import java.io.Writer;
12-
import java.io.BufferedWriter;
13-
import java.io.FileWriter;
14-
import java.io.IOException;
15-
import java.util.List;
16-
import java.io.File;
174
import org.bukkit.entity.Player;
185

19-
public class CCPlayer
20-
{
21-
public Player player;
22-
public String playerName;
6+
import java.io.*;
7+
import java.util.ArrayList;
8+
import java.util.List;
9+
10+
public class CCPlayer {
11+
public final Player player;
12+
public final String playerName;
2313
public boolean chatDisabled;
2414
public boolean tellsDisabled;
2515
public String LastMessenger;
26-
public long timeUnset;
2716
private File IgnoreList;
2817
private List<String> ignores;
29-
18+
3019
public CCPlayer(final Player p, final String pN) throws IOException {
3120
this.player = p;
3221
this.playerName = pN;
@@ -35,66 +24,74 @@ public CCPlayer(final Player p, final String pN) throws IOException {
3524
this.LastMessenger = null;
3625
this.saveIgnoreList("");
3726
}
38-
27+
28+
@SuppressWarnings("ResultOfMethodCallIgnored")
3929
public void saveIgnoreList(final String p) throws IOException {
4030
this.IgnoreList = new File(ChatCo.dataFolder, "/ignorelists/" + this.playerName + ".txt");
31+
4132
if (!this.IgnoreList.exists()) {
4233
this.IgnoreList.getParentFile().mkdir();
4334
final FileWriter fwo = new FileWriter(this.IgnoreList, true);
4435
final BufferedWriter bwo = new BufferedWriter(fwo);
4536
bwo.close();
4637
}
38+
4739
if (!p.equals("")) {
4840
if (!this.isIgnored(p)) {
4941
final FileWriter fwo = new FileWriter(this.IgnoreList, true);
5042
final BufferedWriter bwo = new BufferedWriter(fwo);
5143
bwo.write(p);
5244
bwo.newLine();
5345
bwo.close();
54-
}
55-
else {
46+
} else {
5647
this.ignores.remove(p);
5748
this.ignores.remove("");
5849
final FileWriter fwo = new FileWriter(this.IgnoreList);
5950
final BufferedWriter bwo = new BufferedWriter(fwo);
51+
6052
for (final String print : this.ignores) {
6153
bwo.write(print);
6254
bwo.newLine();
6355
}
56+
6457
bwo.close();
6558
}
6659
}
60+
6761
this.updateIgnoreList();
6862
}
69-
70-
public void setLastMessenger(final Player sender) {
71-
this.LastMessenger = sender.getName();
72-
}
73-
63+
7464
public Player getLastMessenger() {
7565
if (this.LastMessenger != null) {
7666
return Bukkit.getPlayerExact(this.LastMessenger);
7767
}
68+
7869
return null;
7970
}
80-
71+
72+
public void setLastMessenger(final Player sender) {
73+
this.LastMessenger = sender.getName();
74+
}
75+
8176
private void updateIgnoreList() throws IOException {
8277
final FileInputStream file = new FileInputStream(this.IgnoreList);
8378
final InputStreamReader fileReader = new InputStreamReader(file);
8479
final BufferedReader inIgnores = new BufferedReader(fileReader);
8580
String data = inIgnores.readLine();
86-
this.ignores = new ArrayList<String>();
81+
this.ignores = new ArrayList<>();
82+
8783
while (data != null) {
8884
this.ignores.add(data);
8985
data = inIgnores.readLine();
9086
}
87+
9188
file.close();
9289
}
93-
90+
9491
public boolean isIgnored(final String p) {
9592
return this.ignores.contains(p);
9693
}
97-
94+
9895
public List<String> getIgnoreList() {
9996
return this.ignores;
10097
}

src/main/java/com/gmail/fyrvelm/ChatCo/CCSpoilers.java renamed to src/main/java/com/gmail/fyrvelm/chatco/CCSpoilers.java

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,62 @@
1-
package com.gmail.fyrvelm.ChatCo;
1+
package com.gmail.fyrvelm.chatco;
22

3-
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
4-
import org.bukkit.event.EventHandler;
5-
import org.bukkit.entity.Player;
63
import org.bukkit.ChatColor;
7-
import org.bukkit.event.player.AsyncPlayerChatEvent;
4+
import org.bukkit.entity.Player;
5+
import org.bukkit.event.EventHandler;
86
import org.bukkit.event.Listener;
7+
import org.bukkit.event.player.AsyncPlayerChatEvent;
8+
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
99

10-
public class CCSpoilers implements Listener
11-
{
12-
ChatCo plugin;
13-
String[] Spoiler;
14-
15-
public CCSpoilers(final ChatCo plugin) {
10+
public class CCSpoilers implements Listener {
11+
final String[] Spoiler;
12+
13+
public CCSpoilers() {
1614
this.Spoiler = new String[5];
17-
this.plugin = plugin;
1815
}
19-
16+
2017
@EventHandler
2118
public void onPlayerChat(final AsyncPlayerChatEvent event) {
2219
if (event.isCancelled()) {
2320
return;
2421
}
22+
2523
final String check = event.getMessage();
24+
2625
if (check.startsWith("[SPOILER]") && check.endsWith("[/SPOILER]")) {
2726
for (int i = 4; i > 0; --i) {
2827
this.Spoiler[i] = this.Spoiler[i - 1];
2928
}
29+
3030
final int Length = event.getMessage().length();
3131
final Player name = event.getPlayer();
3232
this.Spoiler[0] = "[ " + event.getMessage().substring(9, Length - 10) + " ] by R%)[".replace("R%)", ChatColor.RED.toString()) + name.getDisplayName() + "]";
3333
event.setMessage(ChatColor.BLACK + "SPOILER");
34-
}
35-
else {
34+
} else {
3635
event.setMessage(check);
3736
}
3837
}
39-
38+
4039
@EventHandler
4140
public void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event) {
4241
final Player player = event.getPlayer();
4342
final String inputText = event.getMessage();
43+
4444
if (inputText.startsWith("/show spoiler")) {
4545
final int length = inputText.length();
4646
event.setCancelled(true);
47+
4748
if (length > 14) {
4849
final char parser = inputText.charAt(14);
4950
final int numberOfPrints = Character.digit(parser, 15);
51+
5052
if (numberOfPrints > 5 || numberOfPrints < 1) {
5153
player.sendMessage("The server only stores the last 5 spoilers to have been made.");
52-
}
53-
else if (numberOfPrints < 5 && numberOfPrints > 1) {
54+
} else if (numberOfPrints < 5 && numberOfPrints > 1) {
5455
for (int i = 0; i < numberOfPrints; ++i) {
5556
player.sendMessage("Spoiler [" + (i + 1) + "]: " + this.Spoiler[i]);
5657
}
5758
}
58-
}
59-
else {
59+
} else {
6060
player.sendMessage(this.Spoiler[0]);
6161
}
6262
}

0 commit comments

Comments
 (0)