From 2d2681b9bc784906b0daa4adebdae41e8c149266 Mon Sep 17 00:00:00 2001
From: len <40720638+destro174@users.noreply.github.com>
Date: Sat, 1 May 2021 13:01:46 +0200
Subject: [PATCH] Add messages to config and permissions to plugin.yml

---
 src/main/java/com/alttd/afkdectector/AFKCheckTimer.java   | 4 +++-
 src/main/java/com/alttd/afkdectector/AFKDetector.java     | 4 ----
 src/main/java/com/alttd/afkdectector/Lang.java            | 2 ++
 src/main/java/com/alttd/afkdectector/MessageTimer.java    | 4 +---
 .../java/com/alttd/afkdectector/afkplayer/AFKPlayer.java  | 4 +++-
 src/main/resources/plugin.yml                             | 8 ++++++++
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/alttd/afkdectector/AFKCheckTimer.java b/src/main/java/com/alttd/afkdectector/AFKCheckTimer.java
index e484457..f84414b 100755
--- a/src/main/java/com/alttd/afkdectector/AFKCheckTimer.java
+++ b/src/main/java/com/alttd/afkdectector/AFKCheckTimer.java
@@ -4,6 +4,7 @@ import java.util.UUID;
 
 import com.alttd.afkdectector.afkplayer.AFKPlayer;
 import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
@@ -55,7 +56,8 @@ public class AFKCheckTimer extends BukkitRunnable{
 				player.setSleepingIgnored(true);
 				//player.setCanPickupItems(false);
 				plugin.AFKPlayers.addEntry(player.getName());
-				Bukkit.broadcast(player.getName() + " is now afk.", "afkdetector.notify");
+				Bukkit.broadcast(
+						ChatColor.translateAlternateColorCodes('&', Lang.AFKTOGGLEON.toString().replace("%player%", player.getName())), "afkdetector.notify");
 			}
 			if(System.currentTimeMillis() - standingTime > afkplayer.getafkTime() * 60 * 1000) {
 				MessageTimer currentTimer = plugin.messageTimers.get(uuid);	
diff --git a/src/main/java/com/alttd/afkdectector/AFKDetector.java b/src/main/java/com/alttd/afkdectector/AFKDetector.java
index 2f0eb49..0bf3fbe 100755
--- a/src/main/java/com/alttd/afkdectector/AFKDetector.java
+++ b/src/main/java/com/alttd/afkdectector/AFKDetector.java
@@ -269,10 +269,6 @@ public class AFKDetector extends JavaPlugin implements Listener{
         }
 	}
 
-	public Audience getAudience() {
-		return audience;
-	}
-
 	/* @EventHandler
     public void onPlayerMove(PlayerMoveEvent event) {
 		Player player = event.getPlayer();
diff --git a/src/main/java/com/alttd/afkdectector/Lang.java b/src/main/java/com/alttd/afkdectector/Lang.java
index c19891a..bf29621 100755
--- a/src/main/java/com/alttd/afkdectector/Lang.java
+++ b/src/main/java/com/alttd/afkdectector/Lang.java
@@ -17,6 +17,8 @@ public enum Lang {
 	AFK_LIST("afk-list", "There are %afkplayers% afk."),
 	AFK_PREFIX("afk-prefix", "[AFK]"),
 	AFKCHECKTITLE("afkcheck-title", "AFK CHECK"),
+	AFKTOGGLEON("afk-toggle-on", "&b%player% is not afk."),
+	AFKTOGGLEOFF("afk-toggle-off", "&b%player% is no longer afk."),
 	AFKCHECKSUBTITLE("afkcheck-subtitle", "Please respond to the dm from staff!"),
 	AFKCHECKCMESSAGE("afkcheck-message", "Hey, since you're near a farm and not moving. I'm making sure you aren't afk. Please respond to me if you're not AFK.");
 
diff --git a/src/main/java/com/alttd/afkdectector/MessageTimer.java b/src/main/java/com/alttd/afkdectector/MessageTimer.java
index 3c539d8..ddbc64b 100755
--- a/src/main/java/com/alttd/afkdectector/MessageTimer.java
+++ b/src/main/java/com/alttd/afkdectector/MessageTimer.java
@@ -59,9 +59,7 @@ public class MessageTimer extends BukkitRunnable {
     	} else {
     		if(player != null) {
 	    		if(!plugin.messageTimers.isEmpty()) {
-		    		if(plugin.messageTimers.containsKey(player.getUniqueId())) {
-		    			plugin.messageTimers.remove(player.getUniqueId());
-		    		}
+					plugin.messageTimers.remove(player.getUniqueId());
 	    		}
 	    		cancel();
     		}
diff --git a/src/main/java/com/alttd/afkdectector/afkplayer/AFKPlayer.java b/src/main/java/com/alttd/afkdectector/afkplayer/AFKPlayer.java
index 1d8a492..eb26682 100755
--- a/src/main/java/com/alttd/afkdectector/afkplayer/AFKPlayer.java
+++ b/src/main/java/com/alttd/afkdectector/afkplayer/AFKPlayer.java
@@ -2,7 +2,9 @@ package com.alttd.afkdectector.afkplayer;
 
 import java.util.UUID;
 
+import com.alttd.afkdectector.Lang;
 import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
@@ -67,7 +69,7 @@ public class AFKPlayer {
 
     public void ResetAFK() {
 		if(isafk) {
-			Bukkit.broadcast(playerName + " is no longer afk.", "afkdetector.notify");
+			Bukkit.broadcast(ChatColor.translateAlternateColorCodes('&', Lang.AFKTOGGLEOFF.toString().replace("%player%", playerName)), "afkdetector.notify");
 		}
     	standingTime = System.currentTimeMillis();
     	playerToSphereCenter = Bukkit.getPlayer(getPlayerUuid()).getLocation();
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 70c2399..fc5d0ee 100755
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -25,6 +25,8 @@ permissions:
         children:
             afkdetector.bypass: true
             afkdetector.afklist: true
+            afkdetector.afkcheck: true
+            afkdetector.notify: true
     afkdetector.bypass:
         description: Bypass the AFKplugin.
         default: op
@@ -36,7 +38,13 @@ permissions:
     afkdetector.afktime:
         description: Master permission for custom times.
         default: false
+    afkdetector.afkcheck:
+        description: Allows the usage of /afkcheck command.
+        default: false
     afkdetector.afklist:
         description: Allows the usage of /afklist command.
         default: false
+    afkdetector.notify:
+        description: Get output when a player goes afk.
+        default: false