From b88292375c9cd15372cf7a78b215abce20d9f086 Mon Sep 17 00:00:00 2001
From: Jason H <51760372+JasonHorkles@users.noreply.github.com>
Date: Sat, 6 Jul 2024 14:15:04 -0600
Subject: [PATCH] Config & plugin.yml, remove from beta

---
 pom.xml                       |  2 +-
 src/main/resources/config.yml | 55 +++++++++++++++++++----------------
 src/main/resources/plugin.yml | 11 ++++++-
 3 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/pom.xml b/pom.xml
index bf94572..ab35121 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>net.silverstonemc</groupId>
     <artifactId>EntityClearer</artifactId>
-    <version>3.5.0-beta</version>
+    <version>3.5.0</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index da46dd6..7d9248a 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -109,23 +109,23 @@ worlds:
 
 
   # Example 3
-  creative:
-    interval: -1
-    entities:
-      - ARMOR_STAND
-      - ARROW
-      - BOAT
-      - DROPPED_ITEM
-      - MINECART
-      - MINECART_CHEST
-      - MINECART_FURNACE
-      - MINECART_HOPPER
-      - MINECART_TNT
-    spawn-reason:
-      enabled: false
-      reasons:
-        - SPAWNER
-        - SPAWNER_EGG
+  #creative:
+  #  interval: -1
+  #  entities:
+  #    - ARMOR_STAND
+  #    - ARROW
+  #    - BOAT
+  #    - DROPPED_ITEM
+  #    - MINECART
+  #    - MINECART_CHEST
+  #    - MINECART_FURNACE
+  #    - MINECART_HOPPER
+  #    - MINECART_TNT
+  #  spawn-reason:
+  #    enabled: false
+  #    reasons:
+  #      - SPAWNER
+  #      - SPAWNER_EGG
 
 
 
@@ -176,16 +176,21 @@ messages:
   # {TIMELEFT} - the time remaining before the clear task is run
   # {TIME} - will output "minute(s)" or "second(s)" depending on the time left
 
-  actionbar-message: "<#ff9b0f><bold>Common entities will be removed in <yellow>{TIMELEFT} <#ff9b0f>{TIME}!"
-  chat-message: "<red>Common entities will be removed in <gray>{TIMELEFT} <red>{TIME}!"
+  actionbar-message: "<#ff9b0f><bold>Common entities will be removed in <yellow>{TIMELEFT}</yellow> {TIME}!"
+  chat-message: "<red>Common entities will be removed in <gray>{TIMELEFT}</gray> {TIME}!"
+  log-message: "<gold>Common entities will be removed in <yellow>{TIMELEFT}</yellow> {TIME}!"
 
   # Placeholders:
   # {ENTITIES} - the amount of entities removed after the clear task has run
 
-  actionbar-completed-message: "<#ff9b0f><bold>Removed <yellow>{ENTITIES} <#ff9b0f>entities!"
-  actionbar-completed-low-tps-message: "<#ff9b0f><bold>Removed <yellow>{ENTITIES} <#ff9b0f>entities due to low TPS!"
-  chat-completed-message: "<red>Removed <gray>{ENTITIES} <red>entities!"
-  chat-completed-low-tps-message: "<red>Removed <gray>{ENTITIES} <red>entities due to low TPS!"
+  actionbar-completed-message: "<#ff9b0f><bold>Removed <yellow>{ENTITIES}</yellow> entities!"
+  actionbar-completed-low-tps-message: "<#ff9b0f><bold>Removed <yellow>{ENTITIES}</yellow> entities due to low TPS!"
+
+  chat-completed-message: "<red>Removed <gray>{ENTITIES}</gray> entities!"
+  chat-completed-low-tps-message: "<red>Removed <gray>{ENTITIES}</gray> entities due to low TPS!"
+
+  log-completed-message: "<yellow>Removed <gold>{ENTITIES}</gold> entities!"
+  log-completed-low-tps-message: "<red>Removed <gray>{ENTITIES}</gray> entities due to low TPS!"
 
 
 
@@ -201,12 +206,12 @@ low-tps:
   threshold: 17
 
   # Should there be a chat message sent to players with the `entityclearer.lowtps`
-  # permission stating that the TPS is low?
+  # permission stating that the TPS is low? This is run BEFORE the clearing task starts
   chat: true
 
   # Placeholders:
   # {TPS} - the current TPS of the server
-  chat-message: "<red><bold>Warning: TPS low <dark_gray>(<gray>{TPS}<dark_gray>)<red>! Removing entities..."
+  chat-message: "<red><bold>Warning: TPS low <dark_gray>(<gray>{TPS}</gray>)</dark_gray>! Removing entities..."
 
   # Should the list of entities to remove be separate from the one defined above?
   separate-entity-list: false
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 022d9ae..92b1bb2 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -28,13 +28,22 @@ permissions:
     description: Create debug dump
   entityclearer.lowtps:
     default: op
-    description: Notifications when the TPS is low
+    description: Notification when the TPS is low before the clear task runs
   entityclearer.notify:
     default: op
     description: Notifications when there are problems within the plugin
   entityclearer.reload:
     default: op
     description: Reload the plugin
+  entityclearer.removalnotifs.actionbar:
+    default: true
+    description: Actionbar notifications during the entity removal task
+  entityclearer.removalnotifs.chat:
+    default: true
+    description: Chat notifications during the entity removal task
+  entityclearer.removalnotifs.sound:
+    default: true
+    description: Sound during the entity removal task
   entityclearer.updatenotifs:
     default: op
     description: Notifications when there is an update available