Merge branch 'master' of ZeroHD/QoL into master

Fixes #16
Adds documentation for #9

docs/source/changelog/index.rst

@@ -8,4 +8,5 @@ Changelogs
 .. toctree::
    :maxdepth: 1
 
-   v1.3 <v1.3>
+   v1.3 <v1.3>
+   v1.4 <v1.4>

docs/source/changelog/v1.4.rst

@@ -0,0 +1,20 @@
+.. include:: ../common.rst
+
+.. _qol_v1.4:
+
+QoL v1.4
+========
+
+Additions
+---------
+* `Death Mute Command`_ - ``/deathmute <name>`` mutes death messages from a player until a sever restart.
+* `24 Karat Trophy Command`_ ``/karattrophy <name>`` awards the player the 24 Karat Trophy advancement.
+* `Spec-Dynmap Message`_ - A message is now displayed when the user is hidden on Dynmap after using /spec.
+
+.. _Death Mute Command: https://git.etztech.xyz/Etzelia/QoL/issues/9
+.. _24 Karat Trophy Command: https://git.etztech.xyz/Etzelia/QoL/issues/16
+.. _Spec-Dynmap Message`_: https://git.etztech.xyz/ZeroHD/QoL/commit/6c5c20960b782d6b922d31859baca01132c63b9f
+
+Bug Fixes
+---------
+None

docs/source/commands.rst

@@ -36,3 +36,9 @@ Alias ``/names`` and ``/name``
 ``/whitelist <on|off|true|false|>`` - Turns Whitelist mode on or off. When in Whitelist mode, no one can connect unless they have the permission node.
 
 ``/timeout <on|off|true|false|>`` - Turns Timeout mode on or off. When in Timeout mode, no one can chat unless they have the permission node.
+
+``/karattrophy <name>`` awards the player the 24 Karat Trophy Advancement.
+
+``/deathmute <name>`` mutes death messages from a player until a sever restart.
+
+

docs/source/misc.rst

@@ -46,6 +46,5 @@ QoL provides a way to monitor your TPS and send an alert to a Discord webhook wh
 Auto Dynmap Hide
 ----------------
 
-If Dynmap is detected on the server, QoL will hide a user on the dynmap when they spec. When they come out of
+If Dynmap is detected on the server, QoL will hide a user on the dynmap when they spec. When they come out of spec, their previous visibility state will be restored.
-spec, their previous visibility state will be restored.
 

docs/source/permissions.rst

@@ -36,4 +36,8 @@ Permissions
 
 ``qol.timeout.command`` - Ability to use the Timeout command
 
-``qol.timeout.*`` - Wildcard permission for Timeout
+``qol.timeout.*`` - Wildcard permission for Timeout
+
+``qol.karattrophy`` - Ability to use the Karat Trophy Command
+
+``qol.deathmute`` - Ability to use the Death Mute command

pom.xml

@@ -3,7 +3,7 @@
     <groupId>xyz.etztech</groupId>
     <artifactId>QoL</artifactId>
     <!-- Version is used in plugin.yml -->
-    <version>1.3</version>
+    <version>1.4</version>
     <packaging>jar</packaging>
 
     <!-- Plugin Information -->

src/main/java/xyz/etztech/qol/listeners/CommandPreprocessListener.java

@@ -53,19 +53,28 @@ public class CommandPreprocessListener implements Listener {
 
         // Spec dynmap hide
         if (base.equals("spec") && sender.hasPermission("SafeSpectate.spectate") && dynmap != null) {
+            String message;
             boolean visibleStatus;
             if (sender.getGameMode() != GameMode.SPECTATOR){
                 dynmapVisibleStatusMap.put(sender.getUniqueId(), dynmap.getPlayerVisbility(sender.getName()));
                 visibleStatus = false;
+
+                message = "You are now being hidden Dynmap.";
+
             }
             else if (dynmapVisibleStatusMap.containsKey(sender.getUniqueId())){
                 visibleStatus = dynmapVisibleStatusMap.remove(sender.getUniqueId());
+
+                String status = ((visibleStatus) ? "shown" : "hidden");
+                message = "Your " + status + " status has been restored on Dynmap.";
             }
             else {
+                message = "You are now visible on the Dynmap.";
                 visibleStatus = true;
             }
 
-            dynmap.setPlayerVisiblity(sender.getDisplayName(), visibleStatus);
+            sender.spigot().sendMessage(new TextComponent(ChatColor.GREEN + message));
+            dynmap.setPlayerVisiblity(sender.getName(), visibleStatus);
         }
 
         // Spec TP confirmation

src/main/resources/plugin.yml

@@ -75,7 +75,7 @@ permissions:
     description: Ability to use the Death Mute command
     default: op
   qol.karattrophy:
-    description:  to use the Karat Trophy Command
+    description: Ability to use the Karat Trophy Command
     default: op
   qol.auditable:
     description: Audits command usage