added /last and /unignoreall commands

Author: bierdosenhalter

.github/workflows/release.yml

@@ -35,7 +35,7 @@ jobs:
         with:
           java-version: 1.8
 
-      - name: Prepare depdendency cache
+      - name: Prepare dependency cache
         uses: actions/cache@v2
         with:
           path: ~/.m2

README.md

@@ -3,14 +3,14 @@
 **ChatCo is a simple chat plugin which has the following features:**
 
 - Players can customize their chat message using various prefixes. As an example putting an '>' before a chat message
-  will turn the text green (greentext). (Note: Does not change the color of player names).
+  will turn the text green (green-text). (Note: Does not change the color of player names).
 - Players can whisper other players (defaults to a purple color).
 - Players can ignore another player (works for both world and whisper chat). Ignore lists are persistent between logins.
-  Players can also unignore a previously ignored player.
+  Players can also un-ignore a previously ignored player.
 - Allows for a customizable spoiler text system (who wants to ruin the walking dead for everyone?).
 - Players can toggle chat on/off.
 - Full permission support so that you can limit who has access to what colors / features.
-- Allows the administrator to log whispers between players.
+- Allows the administrator to log whispers between players. (Could be against EU law.)
 
 **Popular servers known or thought to be running this plugin:**
 
@@ -21,47 +21,30 @@
 
 **ADMINISTRATIVE COMMANDS (only console input is accepted):**
 
-Every single command goes by the format "chatco component e/d" where 'e' enables and 'd' disables, e.g. typing "chatco
-whisperlog e" in the console will enable whisperlogging. You will have to reload the plugin in order to make most of the
+Every single admin command goes by the format "/chatco {component} {e|d}" where 'e' enables and 'd' disables, e.g. typing "/chatco
+whisperlog e" in the console will enable whisper logging. You will have to reload the plugin in order to make most of the
 changes take effect.
 
 **Components:**
 
-- spoilers
-- whispers
-- newcommands
-- whisperlog
+- **spoilers** - enables or disables spoilers, is **disabled** by default.
+- **whispers** - enables or disables whisper changes, is **enabled** by default.
+- **newcommands** - enables or disables new whisper commands, is **enabled** by default.
+- **whisperlog** - enables or disables whisper logging (whisper logs are saved in /ChatCo/whisperlog.txt), is **disabled**
+  by default.)
 
 **Player Commands:**
 
-- /ignore
-- /ignorelist
-- /togglechat
-- /toggletells
+- **/ignore {player}** - ignores or un-ignores the player.
+- **/ignorelist** - prints all ignored players.
+- **/unignoreall** - clears ignore list
+- **/togglechat** - disables regular chatting for the player - NOT PERSISTENT.
+- **/toggletells** - disables tells for the player - NOT PERSISTENT,
 
 **Whisper Related Player Commands:**
 
-- /tell
-- /pm
-- /w
-- /msg
-- /t
-- /whisper
-- /r
-- /reply
-
-**Legend:**
-
-- spoilers - enables or disables spoilers, is **disabled** by default.
-- whispers - enables or disables whisper changes, is** enabled** by default.
-- newcommands - enables or disables new whisper commands, is **enabled** by default.
-- whisperlog - enables or disables whisper logging (whisper logs are saved in /ChatCo/whisperlog.txt), is **disabled**
-  by default.
-- /ignore <player> - ignores or un-ignores the player.
-- /ignorelist - prints all ignored players.
-- /togglechat - disables regular chatting for the player - NOT PERSISTENT.
-- /toggletells - disables tells for the player - NOT PERSISTENT,
-- /r and /reply - replies to the last person who sent you a whisper this session.
+- **/r** and **/reply** - replies to the last person who sent you a whisper this session.
+- **/l** and **/last** - replies to the last person you sent a whisper to
 
 **Config**\
 Color codes and prefixes can be disabled by replacing the contents of "" with "!#" e.g. Green: "!#".\
@@ -71,12 +54,14 @@ You can customize the appearance of whispers.
 **Examples:**
 
 - Turn chat off/on with /togglechat.
-- Write > at the start of a message for greentext.
+- Write > at the start of a message for green-text.
 - Write [SPOILER]text[/SPOILER] to make a spoiler.
 - Write /show spoiler [1-5] to view spoilers.
 
 **Planned Features:**
 
+- Use UUIDs for ignore lists (and convert old ones)
+- Remove redundant code
 - Fully Async Chat
 - Groups?
 - Customizable Death Messages
@@ -90,3 +75,9 @@ You can customize the appearance of whispers.
 - 1.10
 - 1.9
 - 1.8
+
+**Git Release Creation**
+```sh
+git tag <tag_name>
+git push origin <tag_name>
+```

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.gmail.fyrvelm.chatco</groupId>
     <artifactId>ChatCo</artifactId>
-    <version>0.25</version>
+    <version>0.26</version>
     <packaging>jar</packaging>
 
     <name>ChatCo</name>

src/main/java/com/gmail/fyrvelm/chatco/CCAllChat.java

@@ -14,7 +14,8 @@
 import java.io.IOException;
 
 public class CCAllChat implements Listener {
-    private static final String CANCEL = "14CANCELIMMEDIATELY14712381230412A42088";
+    // TODO: remove that
+    private static final String CANCEL = "44D88612FEA8A8F36DE82E1278ABB02F";
     public final ChatCo plugin;
     private FileConfiguration permissionConfig;
 
@@ -152,7 +153,7 @@ public String ColorCodeManager(String data, final Player player) {
 
     @EventHandler(ignoreCancelled = true)
     public void onPlayerChat(final AsyncPlayerChatEvent event) {
-        File customConfig = ChatCo.Configuration2;
+        File customConfig = ChatCo.PermissionConfig;
         this.permissionConfig = YamlConfiguration.loadConfiguration(customConfig);
         final Player player = event.getPlayer();
         final Player[] recipients = event.getRecipients().toArray(new Player[0]);

src/main/java/com/gmail/fyrvelm/chatco/CCPlayer.java

@@ -13,16 +13,18 @@ public class CCPlayer {
     public boolean chatDisabled;
     public boolean tellsDisabled;
     public String LastMessenger;
+    public String LastReceiver;
     private File IgnoreList;
     private List<String> ignores;
 
     public CCPlayer(final Player p, final String pN) throws IOException {
-        this.player = p;
-        this.playerName = pN;
-        this.chatDisabled = false;
-        this.tellsDisabled = false;
-        this.LastMessenger = null;
-        this.saveIgnoreList("");
+        player = p;
+        playerName = pN;
+        chatDisabled = false;
+        tellsDisabled = false;
+        LastMessenger = null;
+        LastReceiver = null;
+        saveIgnoreList(""); // "" means only create the file
     }
 
     @SuppressWarnings("ResultOfMethodCallIgnored")
@@ -61,6 +63,15 @@ public void saveIgnoreList(final String p) throws IOException {
         this.updateIgnoreList();
     }
 
+    public void unIgnoreAll() throws IOException {
+        final FileWriter fwo = new FileWriter(this.IgnoreList, false);
+        final BufferedWriter bwo = new BufferedWriter(fwo);
+        bwo.flush();
+        bwo.close();
+
+        this.updateIgnoreList();
+    }
+
     public Player getLastMessenger() {
         if (this.LastMessenger != null) {
             return Bukkit.getPlayerExact(this.LastMessenger);
@@ -73,6 +84,19 @@ public void setLastMessenger(final Player sender) {
         this.LastMessenger = sender.getName();
     }
 
+    public Player getLastReceiver() {
+        if (this.LastReceiver != null) {
+            return Bukkit.getPlayerExact(this.LastReceiver);
+        }
+
+        return null;
+    }
+
+    public void setLastReceiver(final Player sender) {
+        this.LastReceiver = sender.getName();
+    }
+
+
     private void updateIgnoreList() throws IOException {
         final FileInputStream file = new FileInputStream(this.IgnoreList);
         final InputStreamReader fileReader = new InputStreamReader(file);