uuids for ignorelists (names still inside for speedup)

Author: bierdosenhalter

.github/dependabot.yml

@@ -1,5 +1,6 @@
 version: 2
 updates:
+
   - package-ecosystem: "maven"
     directory: "/"
     schedule:
@@ -13,3 +14,17 @@ updates:
     commit-message:
       prefix: "maven"
       include: "scope"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "12:00"
+      timezone: "Europe/Berlin"
+    assignees:
+      - "bierdosenhalter"
+    reviewers:
+      - "bierdosenhalter"
+    commit-message:
+      prefix: "github-actions"
+      include: "scope"

.github/workflows/release.yml

@@ -10,44 +10,40 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      - name: Checkout changes
-        uses: actions/checkout@v2
+      - name: Git
+        uses: actions/checkout@v3
 
-      - name: Get commit info
-        run: echo "SHA=$GITHUB_SHA" >> $GITHUB_ENV
+      - name: Java
+        uses: actions/[email protected]
+        with:
+          distribution: 'adopt'
+          java-version: '8'
 
-      - name: Prepare release
+      - name: Cache
+        uses: actions/[email protected]
+        with:
+          path: ~/.m2
+          key: '${{ runner.os }}-m2-${{ hashFiles(''**/pom.xml'') }}'
+          restore-keys: '${{ runner.os }}-m2'
+
+      - name: Package
+        run: mvn --batch-mode --show-version --errors package --file pom.xml
+
+      - name: Draft
         id: create_release
         uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ github.ref }}
           release_name: ${{ github.ref }}
-          body: |
-            Minecraft 1.12.2
-            Automated release at commit ${{ env.SHA }}
+          body: 'automated release at commit ${{ github.sha }}'
           draft: false
           prerelease: false
 
-      - name: Prepare Java 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-
-      - name: Prepare dependency cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2
-          key: '${{ runner.os }}-m2-${{ hashFiles(''**/pom.xml'') }}'
-          restore-keys: '${{ runner.os }}-m2'
-
-      - name: Maven package
-        run: mvn --batch-mode --show-version --errors package --file pom.xml
-
-      - name: upload release asset
+      - name: Release
         uses: csexton/release-asset-action@v2
         with:
-          pattern: "target/*.jar"
+          pattern: "target/ChatCoPlus-*.jar"
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          release-url: ${{ steps.create_release.outputs.upload_url }}
+          release-url: ${{ steps.create_release.outputs.upload_url }}

README.md

@@ -1,12 +1,14 @@
-# ChatCo
+# ChatCoPlus
 
 [![discord](https://img.shields.io/discord/843551077759844362?logo=discord)](https://discord.gg/7tW8ZAtGr5)
 [![reddit](https://img.shields.io/reddit/subreddit-subscribers/0b0t)](https://old.reddit.com/r/0b0t/)
-[![release](https://github.com/zeroBzeroT/ChatCo/actions/workflows/release.yml/badge.svg)](https://github.com/zeroBzeroT/ChatCo/actions/workflows/release.yml)
+[![release](https://github.com/zeroBzeroT/ChatCoPlus/actions/workflows/release.yml/badge.svg)](https://github.com/zeroBzeroT/ChatCoPlus/actions/workflows/release.yml)
 
 ---
 
-**ChatCo is a simple chat plugin which has the following features:**
+ChatCoPlus is a fork of the famous chat plugin ChatCo created by [jj20051](https://github.com/WiredTombstone), who is the founder and current owner of 9b9t.
+
+**ChatCoPlus 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 (green-text). (Note: Does not change the color of player names).
@@ -16,7 +18,7 @@
 - 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. (Could be against EU law.)
+- Allows the administrator to log whispers between players. (Could be against local law.)
 
 **Popular servers known or thought to be running this plugin:**
 
@@ -69,9 +71,9 @@ You can customize the appearance of whispers.
 - Use UUIDs for ignore lists (and convert old ones)
 - Remove redundant code
 - Fully Async Chat
-- Groups?
+- Groups
 - Customizable Death Messages
-- Last time a player was seen online?
+- Last time a player was seen online
 
 **Minecraft Versions (Confirmed Working):**
 

pom.xml

@@ -1,25 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.gmail.fyrvelm.chatco</groupId>
-    <artifactId>ChatCo</artifactId>
-    <version>0.26</version>
+    <groupId>org.zeroBzeroT.chatCo</groupId>
+    <artifactId>ChatCoPlus</artifactId>
+    <version>0.27.0</version>
     <packaging>jar</packaging>
-
-    <name>ChatCo</name>
+    <name>${project.artifactId}</name>
+    <description>An efficient chat system with green-text, ignore, whispers and chat logging.</description>
 
     <properties>
         <java.version>1.8</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
-    <description>An efficient chat system with green-text, ignore, whispers and chat logging.</description>
-
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.2</version>
+                <configuration>
+                    <archive>
+                        <addMavenDescriptor>false</addMavenDescriptor>
+                        <manifestEntries>
+                            <Built-By>bierdosenhalter</Built-By>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -33,6 +45,15 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>3.3.0</version>
+                <configuration>
+                    <filters>
+                        <filter>
+                            <excludes>
+                                <exclude>META-INF/**</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
+                </configuration>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -70,5 +91,17 @@
             <version>1.12.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <version>2.0.9</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito2</artifactId>
+            <version>2.0.9</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

src/main/java/com/gmail/fyrvelm/chatco/CCPlayer.java renamed to src/main/java/org/zeroBzeroT/chatCo/ChatPlayer.java

@@ -1,25 +1,27 @@
-package com.gmail.fyrvelm.chatco;
+package org.zeroBzeroT.chatCo;
 
 import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
 
 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
-public class CCPlayer {
-    public final Player player;
+public class ChatPlayer {
+    public final org.bukkit.entity.Player player;
     public final String playerName;
+    public final UUID playerUUID;
     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 {
+    public ChatPlayer(final org.bukkit.entity.Player p) throws IOException {
         player = p;
-        playerName = pN;
+        playerName = p.getName();
+        playerUUID = p.getUniqueId();
         chatDisabled = false;
         tellsDisabled = false;
         LastMessenger = null;
@@ -29,7 +31,12 @@ public CCPlayer(final Player p, final String pN) throws IOException {
 
     @SuppressWarnings("ResultOfMethodCallIgnored")
     public void saveIgnoreList(final String p) throws IOException {
-        this.IgnoreList = new File(ChatCo.dataFolder, "/ignorelists/" + this.playerName + ".txt");
+        File oldIgnores = new File(Main.dataFolder, "/ignorelists/" + this.playerName + ".txt");
+        this.IgnoreList = new File(Main.dataFolder, "/ignorelists/" + this.playerUUID + ".txt");
+
+        if (oldIgnores.exists()) {
+            oldIgnores.renameTo(this.IgnoreList);
+        }
 
         if (!this.IgnoreList.exists()) {
             this.IgnoreList.getParentFile().mkdir();
@@ -72,31 +79,30 @@ public void unIgnoreAll() throws IOException {
         this.updateIgnoreList();
     }
 
-    public Player getLastMessenger() {
+    public org.bukkit.entity.Player getLastMessenger() {
         if (this.LastMessenger != null) {
             return Bukkit.getPlayerExact(this.LastMessenger);
         }
 
         return null;
     }
 
-    public void setLastMessenger(final Player sender) {
+    public void setLastMessenger(final org.bukkit.entity.Player sender) {
         this.LastMessenger = sender.getName();
     }
 
-    public Player getLastReceiver() {
+    public org.bukkit.entity.Player getLastReceiver() {
         if (this.LastReceiver != null) {
             return Bukkit.getPlayerExact(this.LastReceiver);
         }
 
         return null;
     }
 
-    public void setLastReceiver(final Player sender) {
+    public void setLastReceiver(final org.bukkit.entity.Player sender) {
         this.LastReceiver = sender.getName();
     }
 
-
     private void updateIgnoreList() throws IOException {
         final FileInputStream file = new FileInputStream(this.IgnoreList);
         final InputStreamReader fileReader = new InputStreamReader(file);