Clean up!

Crazy-Crew · Apr 8, 2023 · 65661bc · 65661bc
1 parent 3c9a030
commit 65661bc
Show file tree

Hide file tree

Showing 46 changed files with 163 additions and 343 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -63,7 +63,7 @@ webhook {
 
             this.description("""
                 Changes:
-                » N/A
+                » Fixed an issue with message/command cooldowns not working.
                 
                 API:
                  » N/A

diff --git a/paper/src/main/java/com/ryderbelserion/chatmanager/ApiLoader.java b/paper/src/main/java/com/ryderbelserion/chatmanager/ApiLoader.java
@@ -1,6 +1,6 @@
 package com.ryderbelserion.chatmanager;
 
-import com.ryderbelserion.chatmanager.api.AntiBotData;
+import com.ryderbelserion.chatmanager.api.misc.AntiBotData;
 import com.ryderbelserion.chatmanager.api.chat.*;
 import com.ryderbelserion.chatmanager.api.chat.logging.PreviousCmdData;
 import com.ryderbelserion.chatmanager.api.chat.logging.PreviousMsgData;

diff --git a/...nxn1nja/chatmanager/api/CrazyManager.java → ...lserion/chatmanager/api/CrazyManager.java b/...nxn1nja/chatmanager/api/CrazyManager.java → ...lserion/chatmanager/api/CrazyManager.java
@@ -1,4 +1,4 @@
-package me.h1dd3nxn1nja.chatmanager.api;
+package com.ryderbelserion.chatmanager.api;
 
 import me.h1dd3nxn1nja.chatmanager.ChatManager;
 import me.h1dd3nxn1nja.chatmanager.managers.PlaceholderManager;

diff --git a/paper/src/main/java/com/ryderbelserion/chatmanager/api/Universal.java b/paper/src/main/java/com/ryderbelserion/chatmanager/api/Universal.java
@@ -0,0 +1,30 @@
+package com.ryderbelserion.chatmanager.api;
+
+import me.h1dd3nxn1nja.chatmanager.ChatManager;
+import me.h1dd3nxn1nja.chatmanager.SettingsManager;
+import me.h1dd3nxn1nja.chatmanager.managers.PlaceholderManager;
+import me.h1dd3nxn1nja.chatmanager.support.EssentialsSupport;
+import me.h1dd3nxn1nja.chatmanager.support.PluginManager;
+import me.h1dd3nxn1nja.chatmanager.support.misc.VaultSupport;
+import org.bukkit.configuration.file.FileConfiguration;
+
+public interface Universal {
+
+    ChatManager plugin = ChatManager.getPlugin();
+
+    PlaceholderManager placeholderManager = plugin.getCrazyManager().getPlaceholderManager();
+    VaultSupport vaultSupport = plugin.getPluginManager().getVaultSupport();
+
+    PluginManager pluginManager = plugin.getPluginManager();
+
+    EssentialsSupport essentialsSupport = pluginManager.getEssentialsSupport();
+
+    SettingsManager settingsManager = plugin.getSettingsManager();
+
+    FileConfiguration config = settingsManager.getConfig();
+
+    FileConfiguration messages = settingsManager.getMessages();
+    FileConfiguration bannedCommands = settingsManager.getBannedCommands();
+    FileConfiguration bannedWords = settingsManager.getBannedWords();
+
+}
diff --git a/paper/src/main/java/com/ryderbelserion/chatmanager/api/chat/GlobalChatData.java b/paper/src/main/java/com/ryderbelserion/chatmanager/api/chat/GlobalChatData.java
@@ -18,7 +18,7 @@ public void removeUser(UUID uuid) {
     }
 
     public boolean containsUser(UUID uuid) {
-        return getUsers().contains(uuid);
+        return users.contains(uuid);
     }
 
     public Set<UUID> getUsers() {

diff --git a/paper/src/main/java/com/ryderbelserion/chatmanager/api/chat/LocalChatData.java b/paper/src/main/java/com/ryderbelserion/chatmanager/api/chat/LocalChatData.java
@@ -18,7 +18,7 @@ public void removeUser(UUID uuid) {
     }
 
     public boolean containsUser(UUID uuid) {
-        return getUsers().contains(uuid);
+        return users.contains(uuid);
     }
 
     public Set<UUID> getUsers() {

diff --git a/paper/src/main/java/com/ryderbelserion/chatmanager/api/chat/PerWorldChatData.java b/paper/src/main/java/com/ryderbelserion/chatmanager/api/chat/PerWorldChatData.java
@@ -18,7 +18,7 @@ public void removeUser(UUID uuid) {
     }
 
     public boolean containsUser(UUID uuid) {
-        return getUsers().contains(uuid);
+        return users.contains(uuid);
     }
 
     public Set<UUID> getUsers() {

diff --git a/paper/src/main/java/com/ryderbelserion/chatmanager/api/chat/SpyChatData.java b/paper/src/main/java/com/ryderbelserion/chatmanager/api/chat/SpyChatData.java
@@ -18,7 +18,7 @@ public void removeUser(UUID uuid) {
     }
 
     public boolean containsUser(UUID uuid) {
-        return getUsers().contains(uuid);
+        return users.contains(uuid);
     }
 
     public Set<UUID> getUsers() {

diff --git a/paper/src/main/java/com/ryderbelserion/chatmanager/api/chat/StaffChatData.java b/paper/src/main/java/com/ryderbelserion/chatmanager/api/chat/StaffChatData.java
@@ -18,7 +18,7 @@ public void removeUser(UUID uuid) {
     }
 
     public boolean containsUser(UUID uuid) {
-        return getUsers().contains(uuid);
+        return users.contains(uuid);
     }
 
     public Set<UUID> getUsers() {

diff --git a/paper/src/main/java/com/ryderbelserion/chatmanager/api/chat/UserRepliedData.java b/paper/src/main/java/com/ryderbelserion/chatmanager/api/chat/UserRepliedData.java
@@ -4,25 +4,25 @@
 
 public class UserRepliedData {
 
-    private final HashMap<UUID, UUID> userReplied = new HashMap<>();
+    private final HashMap<UUID, UUID> replies = new HashMap<>();
 
     public void addUser(UUID uuid, UUID other) {
-        if (!containsUser(uuid)) userReplied.put(uuid, other);
+        if (!containsUser(uuid)) replies.put(uuid, other);
     }
 
     public void removeUser(UUID uuid) {
-        if (containsUser(uuid)) userReplied.remove(uuid);
+        if (containsUser(uuid)) replies.remove(uuid);
     }
 
     public boolean containsUser(UUID uuid) {
-        return getUsers().containsKey(uuid);
+        return replies.containsKey(uuid);
     }
 
     public UUID getUser(UUID uuid) {
-        return getUsers().get(uuid);
+        return replies.get(uuid);
     }
 
     public Map<UUID, UUID> getUsers() {
-        return Collections.unmodifiableMap(userReplied);
+        return Collections.unmodifiableMap(replies);
     }
 }
diff --git a/paper/src/main/java/com/ryderbelserion/chatmanager/api/chat/WorldChatData.java b/paper/src/main/java/com/ryderbelserion/chatmanager/api/chat/WorldChatData.java
@@ -18,7 +18,7 @@ public void removeUser(UUID uuid) {
     }
 
     public boolean containsUser(UUID uuid) {
-        return getUsers().contains(uuid);
+        return users.contains(uuid);
     }
 
     public Set<UUID> getUsers() {

diff --git a/paper/src/main/java/com/ryderbelserion/chatmanager/api/chat/logging/PreviousCmdData.java b/paper/src/main/java/com/ryderbelserion/chatmanager/api/chat/logging/PreviousCmdData.java
@@ -7,25 +7,25 @@
 
 public class PreviousCmdData {
 
-    private final HashMap<UUID, String> previousMessages = new HashMap<>();
+    private final HashMap<UUID, String> map = new HashMap<>();
 
     public void addUser(UUID uuid, String message) {
-        if (!containsUser(uuid)) previousMessages.put(uuid, message);
+        if (!containsUser(uuid)) map.put(uuid, message);
     }
 
     public void removeUser(UUID uuid) {
-        if (containsUser(uuid)) previousMessages.remove(uuid);
+        if (containsUser(uuid)) map.remove(uuid);
     }
 
     public boolean containsUser(UUID uuid) {
-        return getUsers().containsKey(uuid);
+        return map.containsKey(uuid);
     }
 
     public String getMessage(UUID uuid) {
-        return getUsers().get(uuid);
+        return map.get(uuid);
     }
 
     public Map<UUID, String> getUsers() {
-        return Collections.unmodifiableMap(previousMessages);
+        return Collections.unmodifiableMap(map);
     }
 }
diff --git a/paper/src/main/java/com/ryderbelserion/chatmanager/api/chat/logging/PreviousMsgData.java b/paper/src/main/java/com/ryderbelserion/chatmanager/api/chat/logging/PreviousMsgData.java
@@ -4,25 +4,25 @@
 
 public class PreviousMsgData {
 
-    private final HashMap<UUID, String> previousMessages = new HashMap<>();
+    private final HashMap<UUID, String> map = new HashMap<>();
 
     public void addUser(UUID uuid, String message) {
-        if (!containsUser(uuid)) previousMessages.put(uuid, message);
+        if (!containsUser(uuid)) map.put(uuid, message);
     }
 
     public void removeUser(UUID uuid) {
-        if (containsUser(uuid)) previousMessages.remove(uuid);
+        if (containsUser(uuid)) map.remove(uuid);
     }
 
     public boolean containsUser(UUID uuid) {
-        return getUsers().containsKey(uuid);
+        return map.containsKey(uuid);
     }
 
     public String getMessage(UUID uuid) {
-        return getUsers().get(uuid);
+        return map.get(uuid);
     }
 
     public Map<UUID, String> getUsers() {
-        return Collections.unmodifiableMap(previousMessages);
+        return Collections.unmodifiableMap(map);
     }
 }
diff --git a/paper/src/main/java/com/ryderbelserion/chatmanager/api/cmds/CommandSpyData.java b/paper/src/main/java/com/ryderbelserion/chatmanager/api/cmds/CommandSpyData.java
@@ -18,7 +18,7 @@ public void removeUser(UUID uuid) {
     }
 
     public boolean containsUser(UUID uuid) {
-        return getUsers().contains(uuid);
+        return users.contains(uuid);
     }
 
     public Set<UUID> getUsers() {

diff --git a/paper/src/main/java/com/ryderbelserion/chatmanager/api/cmds/SocialSpyData.java b/paper/src/main/java/com/ryderbelserion/chatmanager/api/cmds/SocialSpyData.java
@@ -18,7 +18,7 @@ public void removeUser(UUID uuid) {
     }
 
     public boolean containsUser(UUID uuid) {
-        return getUsers().contains(uuid);
+        return users.contains(uuid);
     }
 
     public Set<UUID> getUsers() {

diff --git a/paper/src/main/java/com/ryderbelserion/chatmanager/api/cmds/ToggleChatData.java b/paper/src/main/java/com/ryderbelserion/chatmanager/api/cmds/ToggleChatData.java
@@ -18,7 +18,7 @@ public void removeUser(UUID uuid) {
     }
 
     public boolean containsUser(UUID uuid) {
-        return getUsers().contains(uuid);
+        return users.contains(uuid);
     }
 
     public Set<UUID> getUsers() {

diff --git a/paper/src/main/java/com/ryderbelserion/chatmanager/api/cmds/ToggleMentionsData.java b/paper/src/main/java/com/ryderbelserion/chatmanager/api/cmds/ToggleMentionsData.java
@@ -18,7 +18,7 @@ public void removeUser(UUID uuid) {
     }
 
     public boolean containsUser(UUID uuid) {
-        return getUsers().contains(uuid);
+        return users.contains(uuid);
     }
 
     public Set<UUID> getUsers() {

diff --git a/paper/src/main/java/com/ryderbelserion/chatmanager/api/cmds/ToggleMessageData.java b/paper/src/main/java/com/ryderbelserion/chatmanager/api/cmds/ToggleMessageData.java
@@ -18,7 +18,7 @@ public void removeUser(UUID uuid) {
     }
 
     public boolean containsUser(UUID uuid) {
-        return getUsers().contains(uuid);
+        return users.contains(uuid);
     }
 
     public Set<UUID> getUsers() {

diff --git a/paper/src/main/java/com/ryderbelserion/chatmanager/api/cooldowns/CmdCooldowns.java b/paper/src/main/java/com/ryderbelserion/chatmanager/api/cooldowns/CmdCooldowns.java
@@ -7,25 +7,29 @@
 
 public class CmdCooldowns {
 
-    private final HashMap<UUID, Integer> cmdCooldowns = new HashMap<>();
+    private final HashMap<UUID, Integer> map = new HashMap<>();
 
     public void addUser(UUID uuid, Integer time) {
-        if (!containsUser(uuid)) cmdCooldowns.put(uuid, time);
+        if (!containsUser(uuid)) map.put(uuid, time);
     }
 
     public void removeUser(UUID uuid) {
-        if (containsUser(uuid)) cmdCooldowns.remove(uuid);
+        if (containsUser(uuid)) map.remove(uuid);
     }
 
     public boolean containsUser(UUID uuid) {
-        return getUsers().containsKey(uuid);
+        return map.containsKey(uuid);
     }
 
     public int getTime(UUID uuid) {
-        return getUsers().get(uuid);
+        return map.get(uuid);
+    }
+
+    public void subtract(UUID uuid) {
+        map.computeIfPresent(uuid, ((id, integer) -> integer-1));
     }
 
     public Map<UUID, Integer> getUsers() {
-        return Collections.unmodifiableMap(cmdCooldowns);
+        return Collections.unmodifiableMap(map);
     }
 }
diff --git a/...ager/api/interfaces/VanishController.java → ...ager/api/interfaces/VanishController.java b/...ager/api/interfaces/VanishController.java → ...ager/api/interfaces/VanishController.java
@@ -1,4 +1,4 @@
-package me.h1dd3nxn1nja.chatmanager.api.interfaces;
+package com.ryderbelserion.chatmanager.api.interfaces;
 
 import org.bukkit.entity.Player;
 

diff --git a/...elserion/chatmanager/api/AntiBotData.java → ...ion/chatmanager/api/misc/AntiBotData.java b/...elserion/chatmanager/api/AntiBotData.java → ...ion/chatmanager/api/misc/AntiBotData.java
@@ -1,4 +1,4 @@
-package com.ryderbelserion.chatmanager.api;
+package com.ryderbelserion.chatmanager.api.misc;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -18,7 +18,7 @@ public void removeUser(UUID uuid) {
     }
 
     public boolean containsUser(UUID uuid) {
-        return getUsers().contains(uuid);
+        return users.contains(uuid);
     }
 
     public Set<UUID> getUsers() {

diff --git a/...erbelserion/chatmanager/api/ChatData.java → ...serion/chatmanager/api/misc/ChatData.java b/...erbelserion/chatmanager/api/ChatData.java → ...serion/chatmanager/api/misc/ChatData.java
@@ -1,4 +1,4 @@
-package com.ryderbelserion.chatmanager.api;
+package com.ryderbelserion.chatmanager.api.misc;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -18,7 +18,7 @@ public void removeUser(UUID uuid) {
     }
 
     public boolean containsUser(UUID uuid) {
-        return getUsers().contains(uuid);
+        return users.contains(uuid);
     }
 
     public Set<UUID> getUsers() {

diff --git a/...lserion/chatmanager/api/MentionsData.java → ...on/chatmanager/api/misc/MentionsData.java b/...lserion/chatmanager/api/MentionsData.java → ...on/chatmanager/api/misc/MentionsData.java
@@ -1,4 +1,4 @@
-package com.ryderbelserion.chatmanager.api;
+package com.ryderbelserion.chatmanager.api.misc;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -18,7 +18,7 @@ public void removeUser(UUID uuid) {
     }
 
     public boolean containsUser(UUID uuid) {
-        return getUsers().contains(uuid);
+        return users.contains(uuid);
     }
 
     public Set<UUID> getUsers() {

diff --git a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/ChatManager.java b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/ChatManager.java
@@ -1,7 +1,7 @@
 package me.h1dd3nxn1nja.chatmanager;
 
 import com.ryderbelserion.chatmanager.ApiLoader;
-import me.h1dd3nxn1nja.chatmanager.api.CrazyManager;
+import com.ryderbelserion.chatmanager.api.CrazyManager;
 import me.h1dd3nxn1nja.chatmanager.commands.*;
 import me.h1dd3nxn1nja.chatmanager.commands.tabcompleter.*;
 import me.h1dd3nxn1nja.chatmanager.listeners.*;

diff --git a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerAntiAdvertising.java b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerAntiAdvertising.java
@@ -1,8 +1,7 @@
 package me.h1dd3nxn1nja.chatmanager.listeners;
 
-import me.h1dd3nxn1nja.chatmanager.ChatManager;
+import com.ryderbelserion.chatmanager.api.Universal;
 import me.h1dd3nxn1nja.chatmanager.Methods;
-import me.h1dd3nxn1nja.chatmanager.SettingsManager;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -20,17 +19,10 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class ListenerAntiAdvertising implements Listener {
-
-	private final ChatManager plugin = ChatManager.getPlugin();
-
-	private final SettingsManager settingsManager = plugin.getSettingsManager();
+public class ListenerAntiAdvertising implements Listener, Universal {
 
 	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
 	public void onChat(AsyncPlayerChatEvent event) {
-		FileConfiguration config = settingsManager.getConfig();
-		FileConfiguration messages = settingsManager.getMessages();
-
 		Player player = event.getPlayer();
 		String playerName = event.getPlayer().getName();
 		String message = event.getMessage();
@@ -114,9 +106,6 @@ public void run() {
 
 	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
 	public void onCommand(PlayerCommandPreprocessEvent event) {
-		FileConfiguration config = settingsManager.getConfig();
-		FileConfiguration messages = settingsManager.getMessages();
-
 		Player player = event.getPlayer();
 		String playerName = event.getPlayer().getName();
 		String message = event.getMessage();
@@ -204,9 +193,6 @@ public void run() {
 
 	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
 	public void onSign(SignChangeEvent event) {
-		FileConfiguration config = settingsManager.getConfig();
-		FileConfiguration messages = settingsManager.getMessages();
-
 		Player player = event.getPlayer();
 		String playerName = event.getPlayer().getName();
 		Date time = Calendar.getInstance().getTime();