Adding alternate spelling of color as aliases for color command. (#21)

Added alternate spelling of color as aliases for color command.

- hopefully this is how you're supposed to do this...

Reviewed-on: #21
Co-authored-by: benamaurer <ben.a.maurer@gmail.com>
Co-committed-by: benamaurer <ben.a.maurer@gmail.com>

.drone.yml

@@ -0,0 +1,36 @@
+---
+kind: pipeline
+type: docker
+name: compliance
+
+steps:
+  - name: build
+    image: maven:3-openjdk-16
+    commands:
+      - mvn install
+
+---
+kind: pipeline
+type: docker
+name: release
+
+trigger:
+  branch:
+    - main
+  event:
+    - push
+
+steps:
+  - name: build
+    image: maven:3-openjdk-16
+    commands:
+      - mvn install
+  - name: gitea-release
+    pull: always
+    image: jolheiser/drone-gitea-main:latest
+    settings:
+      token:
+        from_secret: gitea_token
+      base: https://git.canopymc.net
+      files:
+        - "target/QoL-*.jar"

pom.xml

@@ -3,7 +3,7 @@
     <groupId>xyz.etztech</groupId>
     <artifactId>QoL</artifactId>
     <!-- Version is used in plugin.yml -->
-    <version>1.9</version>
+    <version>1.16</version>
     <packaging>jar</packaging>
 
     <!-- Plugin Information -->
@@ -29,50 +29,63 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.destroystokyo.paper</groupId>
-            <artifactId>paper-api</artifactId>
-            <version>1.15.2-R0.1-SNAPSHOT</version>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.16.3-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>xyz.etztech</groupId>
-            <artifactId>EtzCore</artifactId>
-            <version>1.0.5</version>
-        </dependency>
-        <dependency>
-            <groupId>net.ess3</groupId>
-            <artifactId>EssentialsX</artifactId>
-            <version>2.17.2</version>
+            <artifactId>plugin-api</artifactId>
+            <version>1.0.7</version>
         </dependency>
         <dependency>
             <groupId>us.dynmap</groupId>
             <artifactId>dynmap-api</artifactId>
             <version>1.9.4</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
             <version>2.6</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.discordsrv</groupId>
+            <artifactId>discordsrv</artifactId>
+            <version>1.23.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>me.lucko</groupId>
+            <artifactId>spark-api</artifactId>
+            <version>0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.nisovin.shopkeepers</groupId>
+            <artifactId>ShopkeepersAPI</artifactId>
+            <version>2.13.3</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <repositories>
         <repository>
-            <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
+            <id>spigotmc-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
         </repository>
         <repository>
-            <id>etztech-repo</id>
-            <url>http://repo.etztech.xyz</url>
+            <id>Scarsz-Nexus</id>
+            <url>https://nexus.scarsz.me/content/groups/public/</url>
+        </repository>
+        <repository>
+            <id>birbmc-repo</id>
+            <url>https://mvn.birbmc.com</url>
         </repository>
         <repository>
             <id>dynmap-repo</id>
-            <url>http://repo.mikeprimm.com/</url>
-        </repository>
-         <repository>
-        <id>ess-repo</id>
-            <url>https://ci.ender.zone/plugin/repository/everything/</url>
+            <url>https://repo.mikeprimm.com/</url>
         </repository>
         <repository>
             <id>mvn-repo</id>
@@ -80,12 +93,20 @@
         </repository>
         <repository> <!-- This repo fixes issues with transitive dependencies -->
             <id>jcenter</id>
-            <url>http://jcenter.bintray.com</url>
+            <url>https://jcenter.bintray.com</url>
         </repository>
         <repository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
         </repository>
+        <repository>
+            <id>sonatype-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </repository>
+        <repository>
+            <id>shopkeepers-repo</id>
+            <url>https://nexus.lichtspiele.org/repository/releases/</url>
+        </repository>
     </repositories>
 
     <build>
@@ -150,4 +171,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

src/main/java/xyz/etztech/qol/QoL.java

@@ -1,12 +1,13 @@
 package xyz.etztech.qol;
 
-import net.ess3.api.IEssentials;
+import com.nisovin.shopkeepers.api.ShopkeepersPlugin;
+import github.scarsz.discordsrv.DiscordSRV;
+import net.md_5.bungee.api.chat.BaseComponent;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.Location;
-import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.dynmap.DynmapAPI;
 import org.dynmap.markers.Marker;
@@ -15,11 +16,14 @@ import org.dynmap.markers.MarkerIcon;
 import org.dynmap.markers.MarkerSet;
 import xyz.etztech.qol.commands.*;
 import xyz.etztech.qol.listeners.*;
-import xyz.etztech.qol.other.GriefAlert;
 import xyz.etztech.qol.other.LinkCommand;
+import xyz.etztech.qol.other.Reminder;
 import xyz.etztech.qol.other.TPSRunnable;
+import me.lucko.spark.api.Spark;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
 import java.util.logging.Logger;
 
 public class QoL extends JavaPlugin {
@@ -28,7 +32,7 @@ public class QoL extends JavaPlugin {
     private String qolMarkerIcon = null;
 
     private static QoL instance;
-    private IEssentials essentials = null;
+    private Spark spark = null;
     private DynmapAPI dynmap = null;
     private MarkerAPI markerAPI = null;
     private MarkerSet playerMarkerSet = null;
@@ -45,8 +49,7 @@ public class QoL extends JavaPlugin {
     private static List<String> audits = new ArrayList<>();
     private static List<LinkCommand> links = new ArrayList<>();
 
-    private static Map<String, Integer> viewDistances = new HashMap<>();
-    private GriefAlert griefAlert;
+    private Reminder reminder = null;
 
     public void onEnable() {
         instance = this;
@@ -54,10 +57,11 @@ public class QoL extends JavaPlugin {
         reloadConfig();
         saveResource("qol.png", true);
 
-        //Essentials hook
-        if (Bukkit.getPluginManager().isPluginEnabled("Essentials")) {
-            log("Hooked into Essentials for TPS alert.");
-            essentials = (IEssentials) Bukkit.getPluginManager().getPlugin("Essentials");
+        //Spark hook
+        RegisteredServiceProvider<Spark> sparkProvider = Bukkit.getServicesManager().getRegistration(Spark.class);
+        if (sparkProvider != null) {
+            log("Hooked into Spark for TPS alert.");
+            spark = sparkProvider.getProvider();
         }
 
         //Dynmap hook
@@ -87,76 +91,57 @@ public class QoL extends JavaPlugin {
             }
         }
 
+        // DiscordSRV Hook
+        if (Bukkit.getPluginManager().isPluginEnabled("DiscordSRV")) {
+            new DiscordSRVListener(this);
+        }
+
+        // Shopkeepers Hook
+        if (Bukkit.getPluginManager().isPluginEnabled("Shopkeepers")) {
+            new HeadShopListener(this);
+            log("Hooked in Shopkeepers for the head shop");
+        }
+
         if( isEnabled() ) {
 
             // Add listeners
-            ServerListPingListener serverListPingListener = new ServerListPingListener(this);
-            getServer().getPluginManager().registerEvents(serverListPingListener, this);
-            AsyncPlayerChatListener asyncPlayerChatListener = new AsyncPlayerChatListener(this);
-            getServer().getPluginManager().registerEvents(asyncPlayerChatListener, this);
-            LoginListener loginListener = new LoginListener(this);
-            getServer().getPluginManager().registerEvents(loginListener, this);
-            JoinListener joinListener = new JoinListener(this);
-            getServer().getPluginManager().registerEvents(joinListener, this);
-            BlockIgniteListener blockIgniteListener = new BlockIgniteListener(this);
-            getServer().getPluginManager().registerEvents(blockIgniteListener, this);
-            CommandPreprocessListener commandPreprocessListener = new CommandPreprocessListener(this);
-            getServer().getPluginManager().registerEvents(commandPreprocessListener, this);
-            DeathListener deathListener = new DeathListener(this);
-            getServer().getPluginManager().registerEvents(deathListener, this);
-            PlayerBucketEmptyListener playerBucketEmptyListener = new PlayerBucketEmptyListener(this);
-            getServer().getPluginManager().registerEvents(playerBucketEmptyListener, this);
-            BlockPlaceListener blockPlaceListener = new BlockPlaceListener(this);
-            getServer().getPluginManager().registerEvents(blockPlaceListener, this);
-            PlayerChangedWorldListener playerChangedWorldListener = new PlayerChangedWorldListener(this);
-            getServer().getPluginManager().registerEvents(playerChangedWorldListener, this);
+            new ServerListPingListener(this);
+            new AsyncPlayerChatListener(this);
+            new LoginListener(this);
+            new JoinListener(this);
+            new BlockIgniteListener(this);
+            new CommandPreprocessListener(this);
+            new DeathListener(this);
+            new EntityChangeBlockListener(this);
 
             // Add commands
-            MainCommand mainCommand = new MainCommand(this);
-            this.getCommand("qol").setExecutor(mainCommand);
-            UUIDCommand uuidCommand = new UUIDCommand(this);
-            this.getCommand("uuid").setExecutor(uuidCommand);
-            NameHistoryCommand nameHistoryCommand = new NameHistoryCommand(this);
-            this.getCommand("history").setExecutor(nameHistoryCommand);
-            PortalCommand portalCommand = new PortalCommand(this);
-            this.getCommand("portal").setExecutor(portalCommand);
-            SudoCommand sudoCommand = new SudoCommand(this);
-            this.getCommand("sudo").setExecutor(sudoCommand);
-            MakeMeCommand makeMeCommand = new MakeMeCommand(this);
-            this.getCommand("makeme").setExecutor(makeMeCommand);
-            ShadowMuteCommand shadowMuteCommand = new ShadowMuteCommand(this);
-            this.getCommand("shadowmute").setExecutor(shadowMuteCommand);
-            WhitelistCommand whitelistCommand = new WhitelistCommand(this);
-            this.getCommand("whitelist").setExecutor(whitelistCommand);
-            TimeoutCommand timeoutCommand = new TimeoutCommand(this);
-            this.getCommand("timeout").setExecutor(timeoutCommand);
-            ColorsCommand colorsCommand = new ColorsCommand(this);
-            this.getCommand("colors").setExecutor(colorsCommand);
-            WorldInfoCommand worldInfoCommand = new WorldInfoCommand(this);
-            this.getCommand("worldinfo").setExecutor(worldInfoCommand);
-            DeathMuteCommand deathMuteCommand = new DeathMuteCommand(this);
-            this.getCommand("deathmute").setExecutor(deathMuteCommand);
-            KaratTrophyCommand karatTrophyCommand = new KaratTrophyCommand(this);
-            this.getCommand("karattrophy").setExecutor(karatTrophyCommand);
-            CheckupCommand checkupCommand = new CheckupCommand(this);
-            this.getCommand("checkup").setExecutor(checkupCommand);
-            DynmapLinkCommand dynmapLinkCommand = new DynmapLinkCommand(this);
-            this.getCommand("dynmaplink").setExecutor(dynmapLinkCommand);
+            new MainCommand(this);
+            new UUIDCommand(this);
+            new NameHistoryCommand(this);
+            new PortalCommand(this);
+            new SudoCommand(this);
+            new MakeMeCommand(this);
+            new ShadowMuteCommand(this);
+            new WhitelistCommand(this);
+            new TimeoutCommand(this);
+            new ColorsCommand(this);
+            new WorldInfoCommand(this);
+            new DeathMuteCommand(this);
+            new CheckupCommand(this);
+            new DynmapLinkCommand(this);
+            new WikiCommand(this);
+            new MoonCommand(this);
+
+            if (DiscordSRV.api.isAnyHooked()) {
+                new DiscordIgnoreCommand(this);
+            }
 
             if (dynmap != null) {
-                MarkerCommand markerCommand = new MarkerCommand(this);
-                this.getCommand("marker").setExecutor(markerCommand);
-                this.getCommand("marker").setTabCompleter(markerCommand);
+                new MarkerCommand(this);
             }
 
-
             if (getConfig().getStringList("list").size() > 0) {
-                ListCommand listCommand = new ListCommand(this);
-                this.getCommand("list").setExecutor(listCommand);
-            }
-            if (getConfig().getStringList("plugins").size() > 0) {
-                PluginsCommand pluginsCommand = new PluginsCommand(this);
-                this.getCommand("plugins").setExecutor(pluginsCommand);
+                new ListCommand(this);
             }
 
 
@@ -172,33 +157,21 @@ public class QoL extends JavaPlugin {
                 }, 0, EtzTechUtil.minutesToTicks(schedule));
             }
 
-            // Reminders
-            int frequency = config.getInt("reminders.frequency");
-            if (frequency > 0) {
+            if (reminder != null && reminder.getFrequency() != 0) {
                 Bukkit.getScheduler().scheduleSyncRepeatingTask(QoL.getInstance(), new Runnable() {
-                    int idx = 0;
-
                     @Override
                     public void run() {
-                        List<String> reminders = config.getStringList("reminders.messages");
-                        ChatColor color = ChatColor.getByChar(config.getString("reminders.color").replace("&", ""));
-                        if (idx >= reminders.size()) {
-                            idx = 0;
-                        }
+                        BaseComponent [] msg = reminder.nextReminder();
                         for (Player player : Bukkit.getOnlinePlayers()) {
-                            EtzTechUtil.sms(player, color + reminders.get(idx));
+                            player.spigot().sendMessage(msg);
                         }
-                        idx++;
+                        Bukkit.getConsoleSender().spigot().sendMessage(msg);
                     }
-                }, 0, EtzTechUtil.minutesToTicks(frequency));
+                }, 0, EtzTechUtil.minutesToTicks(reminder.getFrequency()));
             }
 
             // TPS Check
             Bukkit.getScheduler().scheduleSyncRepeatingTask(QoL.getInstance(), new TPSRunnable(this), 0, EtzTechUtil.minutesToTicks(1));
-
-            // Grief Alert
-            griefAlert = new GriefAlert(this);
-            Bukkit.getScheduler().scheduleSyncRepeatingTask(QoL.getInstance(), griefAlert, 0, EtzTechUtil.minutesToTicks(10));
         }
     }
 
@@ -223,20 +196,11 @@ public class QoL extends JavaPlugin {
             links.add(LinkCommand.fromString(raw));
         }
 
-        viewDistances = new HashMap<>();
-
-        ConfigurationSection view_distances = config.getConfigurationSection("view-distances");
-
-        for (String worldName : view_distances.getKeys(false)) {
-
-            int viewDistance = view_distances.getInt(worldName);
-
-            viewDistances.put(worldName, viewDistance);
-        }
-
         qolMarkerIcon = config.getString("dynmap.marker_icon", "blueflag");
         qolMarkerLayerShow = config.getBoolean("dynmap.marker_set_show", false);
         qolMarkerSetLabel = config.getString("dynmap.marker_set_label", "QoL Markers");
+
+        reminder = Reminder.fromConfig(config.getConfigurationSection("reminders"));
     }
 
 
@@ -333,26 +297,12 @@ public class QoL extends JavaPlugin {
         return links;
     }
 
-    public IEssentials getEssentials() { return essentials; }
-
     public DynmapAPI getDynmap() { return  dynmap; }
 
-    public GriefAlert getGriefAlert() {
-        return griefAlert;
-    }
-
-    public static Map<String, Integer> getViewDistances() {
-        return viewDistances;
-    }
-
     public void runTask(final String command) {
         Bukkit.getScheduler().runTask(QoL.instance, () -> Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command));
     }
 
-    public void updatePlayerViewDistance(Player player) {
-        //player.setViewDistance(viewDistances.getOrDefault(player.getWorld().getName().toLowerCase(), getServer().getViewDistance()));
-    }
-
     public MarkerSet getPlayerMarkerSet() {
         return playerMarkerSet;
     }
@@ -384,7 +334,7 @@ public class QoL extends JavaPlugin {
             playerMarker.deleteMarker();
         }
 
-        playerMarkerSet.createMarker(getMarkerName(player, name), name, player.getWorld().getName(), location.getX(), location.getY(), location.getZ(), icon, true);
+        playerMarkerSet.createMarker(getMarkerName(player, name), name, true, player.getWorld().getName(), location.getX(), location.getY(), location.getZ(), icon, true);
     }
 
     public Marker getPlayerMarker(Player player, String name) {
@@ -399,5 +349,9 @@ public class QoL extends JavaPlugin {
             return marker;
         }
     }
+
+    public Spark getSpark() {
+        return spark;
+    }
 }
 

src/main/java/xyz/etztech/qol/commands/CheckupCommand.java

@@ -22,9 +22,9 @@ public class CheckupCommand implements CommandExecutor {
     QoL plugin;
     private static HashMap<UUID, Checkup> checkups = new HashMap<>();
 
-    public CheckupCommand(QoL paramQoL)
-    {
+    public CheckupCommand(QoL paramQoL) {
         this.plugin = paramQoL;
+        plugin.getCommand("checkup").setExecutor(this);
     }
 
     public static void join(Player player) {

src/main/java/xyz/etztech/qol/commands/ColorsCommand.java

@@ -12,6 +12,7 @@ public class ColorsCommand implements CommandExecutor {
 
     public ColorsCommand(QoL plugin) {
         this.plugin = plugin;
+        plugin.getCommand("colors").setExecutor(this);
     }
 
     @Override

src/main/java/xyz/etztech/qol/commands/DeathMuteCommand.java

@@ -14,9 +14,9 @@ public class DeathMuteCommand implements CommandExecutor {
 
     QoL plugin;
 
-    public DeathMuteCommand(QoL paramQoL)
-    {
+    public DeathMuteCommand(QoL paramQoL) {
         this.plugin = paramQoL;
+        plugin.getCommand("deathmute").setExecutor(this);
     }
 
     @Override

src/main/java/xyz/etztech/qol/commands/DiscordIgnoreCommand.java

@@ -0,0 +1,55 @@
+package xyz.etztech.qol.commands;
+
+import github.scarsz.discordsrv.DiscordSRV;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.metadata.FixedMetadataValue;
+import xyz.etztech.qol.EtzTechUtil;
+import xyz.etztech.qol.Lang;
+import xyz.etztech.qol.QoL;
+
+public class DiscordIgnoreCommand implements CommandExecutor {
+    public static final String DISCORD_IGNORE_METADATA = "qol.discord_ignore";
+    QoL plugin;
+
+    public DiscordIgnoreCommand(QoL plugin) {
+        this.plugin = plugin;
+        plugin.getCommand("discordignore").setExecutor(this);
+    }
+
+    @Override
+    public boolean onCommand(CommandSender commandSender, Command command, String s, String[] args) {
+        if (!( commandSender instanceof Player)) {
+            EtzTechUtil.sms(commandSender, Lang.NO_CONSOLE.getDef());
+            return true;
+        }
+
+        if (!commandSender.hasPermission("qol.discordignore")) {
+            EtzTechUtil.sms(commandSender, Lang.NO_PERMISSION.getDef());
+            return true;
+        }
+
+        if (!DiscordSRV.api.isAnyHooked()) {
+            EtzTechUtil.sms(commandSender, "Command not enabled!");
+            return true;
+        }
+
+        Player player = (Player) commandSender;
+
+        boolean ignoreState = player.hasMetadata(DISCORD_IGNORE_METADATA);
+        String msg;
+        if (ignoreState) {
+            player.removeMetadata(DISCORD_IGNORE_METADATA, plugin);
+            msg = "Discord messages will now appear.";
+        }
+        else {
+            player.setMetadata(DISCORD_IGNORE_METADATA, new FixedMetadataValue(plugin, DISCORD_IGNORE_METADATA));
+            msg = "Ignoring Discord messages.";
+        }
+
+        EtzTechUtil.sms(commandSender, org.bukkit.ChatColor.GREEN + msg);
+        return true;
+    }
+}

src/main/java/xyz/etztech/qol/commands/DynmapLinkCommand.java

@@ -18,6 +18,7 @@ public class DynmapLinkCommand implements CommandExecutor {
 
     public DynmapLinkCommand(QoL plugin) {
         this.plugin = plugin;
+        plugin.getCommand("dynmaplink").setExecutor(this);
     }
 
     @Override

src/main/java/xyz/etztech/qol/commands/KaratTrophyCommand.java

@@ -1,50 +0,0 @@
-package xyz.etztech.qol.commands;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.advancement.Advancement;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.NamespacedKey;
-import xyz.etztech.qol.EtzTechUtil;
-import xyz.etztech.qol.Lang;
-import xyz.etztech.qol.QoL;
-
-public class KaratTrophyCommand implements CommandExecutor {
-
-    QoL plugin;
-
-    public KaratTrophyCommand(QoL plugin) {
-        this.plugin = plugin;
-    }
-
-    @Override
-    public boolean onCommand(CommandSender commandSender, Command command, String s, String args[]) {
-        if (!commandSender.hasPermission("qol.karattrophy")) {
-            EtzTechUtil.sms(commandSender, Lang.NO_PERMISSION.getDef());
-            return true;
-        }
-
-        Player argPlayer = Bukkit.getPlayer(args[0]);
-
-        if (argPlayer == null) {
-            EtzTechUtil.sms(commandSender, ChatColor.RED + "No player found.");
-            return true;
-        }
-
-        final Player player = argPlayer;
-
-        Advancement adv = Bukkit.getAdvancement(new NamespacedKey("carrotcraft", "24_karat_trophy"));
-
-        if (!player.getAdvancementProgress(adv).isDone()) {
-            EtzTechUtil.sms(commandSender, ChatColor.GREEN + "Awarding 24 Karat Trophy to " + player.getName());
-            player.getAdvancementProgress(adv).awardCriteria("win");
-        } else {
-            EtzTechUtil.sms(commandSender, ChatColor.RED + player.getName() + " already has the 24 Karat Trophy");
-        }
-
-        return true;
-    }
-}

src/main/java/xyz/etztech/qol/commands/ListCommand.java

@@ -17,6 +17,7 @@ public class ListCommand implements CommandExecutor {
 
     public ListCommand(QoL plugin) {
         this.plugin = plugin;
+        plugin.getCommand("list").setExecutor(this);
     }
 
     @Override

src/main/java/xyz/etztech/qol/commands/MainCommand.java

@@ -15,9 +15,9 @@ public class MainCommand implements CommandExecutor {
 
     QoL plugin;
 
-    public MainCommand(QoL paramQoL)
-    {
+    public MainCommand(QoL paramQoL) {
         this.plugin = paramQoL;
+        plugin.getCommand("qol").setExecutor(this);
     }
 
     @Override

src/main/java/xyz/etztech/qol/commands/MakeMeCommand.java

@@ -15,9 +15,9 @@ public class MakeMeCommand implements CommandExecutor {
 
     QoL plugin;
 
-    public MakeMeCommand(QoL paramQoL)
-    {
+    public MakeMeCommand(QoL paramQoL) {
         this.plugin = paramQoL;
+        plugin.getCommand("makeme").setExecutor(this);
     }
 
     @Override

src/main/java/xyz/etztech/qol/commands/MarkerCommand.java

@@ -12,6 +12,7 @@ import org.dynmap.markers.MarkerSet;
 import xyz.etztech.qol.EtzTechUtil;
 import xyz.etztech.qol.Lang;
 import xyz.etztech.qol.QoL;
+import static org.apache.commons.lang.StringEscapeUtils.escapeHtml;
 
 import java.util.Arrays;
 import java.util.List;
@@ -21,9 +22,10 @@ public class MarkerCommand implements CommandExecutor, TabExecutor{
     QoL plugin;
     List<String> subCommandList = Arrays.asList("set", "remove", "list");
 
-    public MarkerCommand(QoL paramQoL)
-    {
+    public MarkerCommand(QoL paramQoL) {
         this.plugin = paramQoL;
+        plugin.getCommand("marker").setExecutor(this);
+        plugin.getCommand("marker").setTabCompleter(this);
     }
 
     @Override
@@ -57,7 +59,9 @@ public class MarkerCommand implements CommandExecutor, TabExecutor{
                 name = (player).getDisplayName();
             }
 
-            if (name.length() > 25) {
+            name = escapeHtml(name);
+
+            if (name.length() > 50) {
                 EtzTechUtil.sms(player, ChatColor.RED + "Marker name too long, try a shorter name");
                 return true;
             }

src/main/java/xyz/etztech/qol/commands/MoonCommand.java

@@ -0,0 +1,51 @@
+package xyz.etztech.qol.commands;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import xyz.etztech.qol.QoL;
+import xyz.etztech.qol.EtzTechUtil;
+import xyz.etztech.qol.Lang;
+
+import java.util.Map;
+import java.lang.*;
+
+public class MoonCommand implements CommandExecutor {
+    QoL plugin;
+
+    private final Map<Integer, String> moonPhases = Map.of(
+        0, "Full moon",
+        1, "Waning gibbous",
+        2, "Third quarter",
+        3, "Waning crescent",
+        4, "New moon",
+        5, "Waxing crescent",
+        6, "First quarter",
+        7, "Waxing gibbous"
+    );
+
+    public MoonCommand(QoL paramQoL) {
+        this.plugin = paramQoL;
+        plugin.getCommand("moon").setExecutor(this);
+    }
+    
+    @Override
+    public boolean onCommand(CommandSender commandSender, Command command, String s, String[] args) {
+        if (!commandSender.hasPermission("qol.moon")) {
+            EtzTechUtil.sms(commandSender, Lang.NO_PERMISSION.getDef());
+            return true;
+        }
+
+        String playername = commandSender.getName();
+        long time = commandSender.getServer().getPlayer(playername).getWorld().getFullTime();
+        double day = Math.floor(time / 24000);
+        int moonPhase = (int)(day % 8);
+
+        StringBuilder message = new StringBuilder(ChatColor.GOLD + "===== Moon Phase Utility =====");
+        message.append("\n" + ChatColor.GREEN + "Current moon phase: " + moonPhases.get(moonPhase) + ".");
+        message.append("\n" + ChatColor.GREEN + "Full moon is " + (moonPhase == 0 ? "tonight." : "in " + (8 - moonPhase) + ((moonPhase == 7) ? " day." : " days.")));
+        EtzTechUtil.sms(commandSender, message.toString());
+        return true;
+    }
+}

src/main/java/xyz/etztech/qol/commands/NameHistoryCommand.java

@@ -24,9 +24,9 @@ public class NameHistoryCommand implements CommandExecutor {
 
     QoL plugin;
 
-    public NameHistoryCommand(QoL paramQoL)
-    {
+    public NameHistoryCommand(QoL paramQoL) {
         this.plugin = paramQoL;
+        plugin.getCommand("history").setExecutor(this);
     }
 
     @Override

src/main/java/xyz/etztech/qol/commands/PluginsCommand.java

@@ -1,27 +0,0 @@
-package xyz.etztech.qol.commands;
-
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import xyz.etztech.qol.QoL;
-
-public class PluginsCommand implements CommandExecutor {
-
-    QoL plugin;
-
-    public PluginsCommand(QoL plugin) {
-        this.plugin = plugin;
-    }
-
-    @Override
-    public boolean onCommand(CommandSender commandSender, Command command, String s, String[] strings) {
-
-        commandSender.sendMessage(ChatColor.GOLD + "Plugins: " + ChatColor.YELLOW +
-                StringUtils.join(plugin.getConfig().getStringList("plugins"), ", "));
-
-        return true;
-    }
-}
-

src/main/java/xyz/etztech/qol/commands/PortalCommand.java

@@ -18,9 +18,9 @@ public class PortalCommand implements CommandExecutor {
 
     QoL plugin;
 
-    public PortalCommand(QoL paramQoL)
-    {
+    public PortalCommand(QoL paramQoL) {
         this.plugin = paramQoL;
+        plugin.getCommand("portal").setExecutor(this);
     }
 
     @Override
@@ -60,9 +60,9 @@ public class PortalCommand implements CommandExecutor {
         message.append("\n" + ChatColor.GREEN + "Location in the " + worldStr + ": " + newX + ", " + y + ", " + newZ);
         EtzTechUtil.sms(commandSender, message.toString());
 
-      	// Send link to image for setting up nether portal
+      	// Send link to instructions for setting up nether portal
       	TextComponent link = new TextComponent(ChatColor.GREEN + "Click here for directions on how to set up a nether portal.");
-        link.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://i.imgur.com/tQCbI0C.png"));
+        link.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, plugin.getConfig().getString("portal-link", "https://i.imgur.com/tQCbI0C.png")));
         commandSender.spigot().sendMessage(link);
       
         return true;

src/main/java/xyz/etztech/qol/commands/ShadowMuteCommand.java

@@ -9,16 +9,18 @@ import org.bukkit.entity.Player;
 import xyz.etztech.qol.EtzTechUtil;
 import xyz.etztech.qol.Lang;
 import xyz.etztech.qol.QoL;
-import xyz.etztech.qol.other.ShadowMuteTime;
+import xyz.etztech.core.command.TickDuration;
+
+import java.time.Duration;
 
 public class ShadowMuteCommand implements CommandExecutor {
 
 
     QoL plugin;
 
-    public ShadowMuteCommand(QoL paramQoL)
-    {
+    public ShadowMuteCommand(QoL paramQoL) {
         this.plugin = paramQoL;
+        plugin.getCommand("shadowmute").setExecutor(this);
     }
 
     @Override
@@ -43,16 +45,16 @@ public class ShadowMuteCommand implements CommandExecutor {
 
         final Player player = argPlayer;
 
-        ShadowMuteTime smt;
+        TickDuration duration;
         try {
-            smt = ShadowMuteTime.parse(args[1]);
+            duration = TickDuration.parse(args[1]);
         } catch (Exception ex) {
-            smt = new ShadowMuteTime();
+            duration = new TickDuration(Duration.ofMinutes(5));
             commandSender.sendMessage(ChatColor.RED + ex.getMessage());
         }
 
         EtzTechUtil.sms(commandSender, ChatColor.GREEN + "Shadow Muting " + ChatColor.YELLOW +
-                player.getName() + ChatColor.GREEN + " for " + ChatColor.YELLOW + smt.toString());
+                player.getName() + ChatColor.GREEN + " for " + ChatColor.YELLOW + duration.getDuration().toMinutes() + "minutes.");
         QoL.addSM(player);
 
         Bukkit.getScheduler().runTaskLater(plugin, new Runnable() {
@@ -61,7 +63,7 @@ public class ShadowMuteCommand implements CommandExecutor {
                 Bukkit.getConsoleSender().sendMessage(ChatColor.GREEN + "Removing Shadow Mute for " + ChatColor.YELLOW + player.getName());
                 QoL.removeSM(player);
             }
-        }, smt.toTicks());
+        }, duration.toTicks());
 
 
         return true;

src/main/java/xyz/etztech/qol/commands/SudoCommand.java

@@ -16,9 +16,9 @@ public class SudoCommand implements CommandExecutor {
 
     QoL plugin;
 
-    public SudoCommand(QoL paramQoL)
-    {
+    public SudoCommand(QoL paramQoL) {
         this.plugin = paramQoL;
+        plugin.getCommand("sudo").setExecutor(this);
     }
 
     @Override

src/main/java/xyz/etztech/qol/commands/TimeoutCommand.java

@@ -20,9 +20,9 @@ public class TimeoutCommand implements CommandExecutor {
 
     QoL plugin;
 
-    public TimeoutCommand(QoL paramQoL)
-    {
+    public TimeoutCommand(QoL paramQoL) {
         this.plugin = paramQoL;
+        plugin.getCommand("timeout").setExecutor(this);
     }
 
     @Override

src/main/java/xyz/etztech/qol/commands/UUIDCommand.java

@@ -23,9 +23,9 @@ public class UUIDCommand implements CommandExecutor {
 
     QoL plugin;
 
-    public UUIDCommand(QoL paramQoL)
-    {
+    public UUIDCommand(QoL paramQoL) {
         this.plugin = paramQoL;
+        plugin.getCommand("uuid").setExecutor(this);
     }
 
     @Override

src/main/java/xyz/etztech/qol/commands/WhitelistCommand.java

@@ -20,9 +20,9 @@ public class WhitelistCommand implements CommandExecutor {
 
     QoL plugin;
 
-    public WhitelistCommand(QoL paramQoL)
-    {
+    public WhitelistCommand(QoL paramQoL) {
         this.plugin = paramQoL;
+        plugin.getCommand("whitelist").setExecutor(this);
     }
 
     @Override

src/main/java/xyz/etztech/qol/commands/WikiCommand.java

@@ -0,0 +1,60 @@
+package xyz.etztech.qol.commands;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import xyz.etztech.qol.QoL;
+import xyz.etztech.qol.EtzTechUtil;
+import xyz.etztech.qol.Lang;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.Date;
+
+public class WikiCommand implements CommandExecutor {
+    QoL plugin;
+
+    public WikiCommand(QoL paramQoL) {
+        this.plugin = paramQoL;
+        plugin.getCommand("wiki").setExecutor(this);
+    }
+
+    @Override
+    public boolean onCommand(CommandSender commandSender, Command command, String s, String[] args) {
+        if (!commandSender.hasPermission("qol.wiki")) {
+            EtzTechUtil.sms(commandSender, Lang.NO_PERMISSION.getDef());
+            return true;
+        }
+        if (args.length < 1) {
+            EtzTechUtil.sms(commandSender, ChatColor.RED + "Please give a search argument.");
+            return true;
+        }
+
+        try {
+            Date changedToAt;
+            JsonObject obj;
+            InputStream response = new URL(String.format("https://minecraft.gamepedia.com/api.php?action=opensearch&format=json&formatversion=2&search=%s&namespace=0&limit=1", args[0])).openStream();
+            BufferedReader reader = new BufferedReader(new InputStreamReader(response));
+            JsonArray jsonArray = new JsonParser().parse(reader.readLine()).getAsJsonArray();
+            StringBuilder message = new StringBuilder(ChatColor.GREEN + jsonArray.get(1).getAsJsonArray().get(0).getAsString());
+            message.append(": ");
+            message.append(ChatColor.WHITE + jsonArray.get(3).getAsJsonArray().get(0).getAsString());
+
+            EtzTechUtil.sms(commandSender, message.toString());
+        } catch (IOException e) {
+            EtzTechUtil.sms(commandSender, ChatColor.RED + "Minecraft wiki API returned nothing.");
+        } catch (IndexOutOfBoundsException e) {
+            EtzTechUtil.sms(commandSender, ChatColor.RED + String.format("Nothing was found on the wiki using: %s", args[0]));
+        }
+      
+        return true;
+    }
+}

src/main/java/xyz/etztech/qol/commands/WorldInfoCommand.java

@@ -20,6 +20,7 @@ public class WorldInfoCommand implements CommandExecutor {
 
     public WorldInfoCommand(QoL plugin) {
         this.plugin = plugin;
+        plugin.getCommand("worldinfo").setExecutor(this);
     }
 
     @Override

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

@@ -27,6 +27,7 @@ public class AsyncPlayerChatListener implements Listener {
 
     public AsyncPlayerChatListener(QoL plugin) {
         this.plugin = plugin;
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
     }
 
     @EventHandler(priority=EventPriority.HIGH, ignoreCancelled=true)

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

@@ -11,6 +11,7 @@ public class BlockIgniteListener implements Listener {
 
     public BlockIgniteListener(QoL plugin) {
         this.plugin = plugin;
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
     }
 
     @EventHandler
@@ -19,9 +20,5 @@ public class BlockIgniteListener implements Listener {
         if (plugin.getConfig().getBoolean("disable-fire." + cause.name().toLowerCase())) {
             event.setCancelled(true);
         }
-
-        if (event.getPlayer() != null && (cause == BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL || cause == BlockIgniteEvent.IgniteCause.FIREBALL)) {
-            plugin.getGriefAlert().addAlert(event.getPlayer().getName() + " started a fire.");
-        }
     }
 }

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

@@ -1,26 +0,0 @@
-package xyz.etztech.qol.listeners;
-
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.event.player.PlayerBucketEmptyEvent;
-import xyz.etztech.qol.QoL;
-
-public class BlockPlaceListener implements Listener {
-
-    QoL plugin;
-
-    public BlockPlaceListener(QoL plugin) {
-        this.plugin = plugin;
-    }
-
-    @EventHandler
-    public void onBlockPlace(BlockPlaceEvent event) {
-        Player player = event.getPlayer();
-        if( event.getBlockPlaced().getType() == Material.TNT) {
-            plugin.getGriefAlert().addAlert(player.getName() + " placed TnT.");
-        }
-    }
-}

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

@@ -11,7 +11,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.server.ServerCommandEvent;
 import org.dynmap.DynmapAPI;
-import xyz.etztech.core.web.CoreWeb;
+import xyz.etztech.core.web.Http;
 import xyz.etztech.qol.QoL;
 import xyz.etztech.qol.other.LinkCommand;
 
@@ -25,6 +25,7 @@ public class CommandPreprocessListener implements Listener {
 
     public CommandPreprocessListener(QoL plugin) {
         this.plugin = plugin;
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
     }
 
     @EventHandler
@@ -162,7 +163,7 @@ public class CommandPreprocessListener implements Listener {
             Map<String, String> post = new HashMap<>();
             post.put("username", username);
             post.put("content", content);
-            CoreWeb.asyncPost(plugin, webhook, post);
+            Http.asyncPost(plugin, webhook, post);
         }
     }
 

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

@@ -21,6 +21,7 @@ public class DeathListener implements Listener {
 
     public DeathListener(QoL plugin) {
         this.plugin = plugin;
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
     }
 
     @EventHandler

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

@@ -0,0 +1,43 @@
+package xyz.etztech.qol.listeners;
+
+import github.scarsz.discordsrv.DiscordSRV;
+import github.scarsz.discordsrv.api.events.DiscordGuildMessagePreBroadcastEvent;
+import github.scarsz.discordsrv.api.events.GameChatMessagePreProcessEvent;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import xyz.etztech.qol.EtzTechUtil;
+import xyz.etztech.qol.Lang;
+import xyz.etztech.qol.QoL;
+import github.scarsz.discordsrv.api.Subscribe;
+import xyz.etztech.qol.commands.DiscordIgnoreCommand;
+
+public class DiscordSRVListener {
+    private final QoL plugin;
+
+    public DiscordSRVListener(QoL plugin) {
+        this.plugin = plugin;
+        DiscordSRV.api.subscribe(this);
+    }
+
+    @Subscribe
+    public void gameChatMessagePreProcess(GameChatMessagePreProcessEvent event) {
+        if (QoL.hasSM(event.getPlayer())) {
+            event.setCancelled(true);
+        }
+    }
+
+    @Subscribe
+    public void discordGuildMessagePreBroadcastEvent(DiscordGuildMessagePreBroadcastEvent event) {
+        event.getRecipients().removeIf(recipient -> {
+            if (recipient instanceof Player) {
+                Player player = (Player) recipient;
+
+                return player.hasMetadata(DiscordIgnoreCommand.DISCORD_IGNORE_METADATA);
+            }
+            else {
+                return false;
+            }
+        });
+    }
+
+}

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

@@ -0,0 +1,26 @@
+package xyz.etztech.qol.listeners;
+
+import org.bukkit.entity.EntityType;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityChangeBlockEvent;
+import xyz.etztech.qol.QoL;
+
+public class EntityChangeBlockListener implements Listener {
+    QoL plugin;
+
+    public EntityChangeBlockListener(QoL plugin) {
+        this.plugin = plugin;
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
+    }
+
+    @EventHandler
+    public void onEntityChangeBlock(EntityChangeBlockEvent e) {
+        if (e.getEntity().getType() == EntityType.ENDERMAN) {
+            if(plugin.getConfig().getBoolean("disable-mob-grief.enderman", false)){
+                e.setCancelled(true);
+            }
+        }
+
+    }
+}

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

@@ -0,0 +1,68 @@
+package xyz.etztech.qol.listeners;
+
+import com.nisovin.shopkeepers.api.ShopkeepersPlugin;
+import com.nisovin.shopkeepers.api.shopkeeper.ShopkeeperRegistry;
+import com.nisovin.shopkeepers.api.shopkeeper.admin.regular.RegularAdminShopkeeper;
+import com.nisovin.shopkeepers.api.shopkeeper.offers.TradeOffer;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.SkullMeta;
+import xyz.etztech.qol.QoL;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class HeadShopListener implements Listener{
+
+    private final QoL plugin;
+    private final ShopkeepersPlugin shopkeepersAPI;
+
+    public HeadShopListener(QoL plugin) {
+        this.plugin = plugin;
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
+
+        this.shopkeepersAPI = ShopkeepersPlugin.getInstance();
+    }
+
+    @EventHandler
+    public void onJoin(PlayerJoinEvent event) {
+        final Player player = event.getPlayer();
+
+        if (shopkeepersAPI != null && player.hasPermission("qol.head_shop")) {
+            int shopKeeperID = plugin.getConfig().getInt("head_shop.id", -1);
+
+            if (shopKeeperID != -1) {
+                ShopkeeperRegistry shopkeeperRegistry = shopkeepersAPI.getShopkeeperRegistry();
+                RegularAdminShopkeeper donorHeadShop =  (RegularAdminShopkeeper) shopkeeperRegistry.getShopkeeperById(shopKeeperID);
+
+                if (donorHeadShop != null) {
+                    // Remove the head if it already exists. This is done to refresh the skin of the head.
+                    List<? extends TradeOffer> tradeOffers = new ArrayList<>(donorHeadShop.getOffers());
+                    tradeOffers.removeIf(tradeOffer -> {
+                        SkullMeta itemOfferMeta = (SkullMeta)tradeOffer.getResultItem().getItemMeta();
+                        return itemOfferMeta.getOwningPlayer().getUniqueId() == player.getUniqueId();
+                    });
+
+                    donorHeadShop.setOffers(tradeOffers);
+
+                    // Add the head to the shop
+                    int diamondPrice = plugin.getConfig().getInt("head_shop.price", 2);
+                    ItemStack playerHead = new ItemStack(Material.PLAYER_HEAD);
+                    SkullMeta skullMeta = (SkullMeta) playerHead.getItemMeta();
+
+                    skullMeta.setOwningPlayer(player);
+                    skullMeta.setDisplayName(player.getDisplayName());
+                    playerHead.setItemMeta(skullMeta);
+
+                    TradeOffer donorHeadTrade = TradeOffer.create(playerHead, new ItemStack(Material.DIAMOND, diamondPrice), null);
+
+                    donorHeadShop.addOffer(donorHeadTrade);
+                }
+            }
+        }
+    }
+}

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

@@ -2,13 +2,10 @@ package xyz.etztech.qol.listeners;
 
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerLoginEvent;
-import org.dynmap.markers.Marker;
 import xyz.etztech.qol.QoL;
 import xyz.etztech.qol.commands.CheckupCommand;
 
@@ -20,6 +17,7 @@ public class JoinListener implements Listener {
 
     public JoinListener(QoL plugin) {
         this.plugin = plugin;
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
     }
 
     @EventHandler
@@ -57,8 +55,6 @@ public class JoinListener implements Listener {
             }
         }
 
-        plugin.updatePlayerViewDistance(player);
-
         CheckupCommand.join(player);
     }
 

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

@@ -14,6 +14,7 @@ public class LoginListener implements Listener {
 
     public LoginListener(QoL plugin) {
         this.plugin = plugin;
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
     }
 
     @EventHandler

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

@@ -1,26 +0,0 @@
-package xyz.etztech.qol.listeners;
-
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockIgniteEvent;
-import org.bukkit.event.player.PlayerBucketEmptyEvent;
-import xyz.etztech.qol.QoL;
-
-public class PlayerBucketEmptyListener implements Listener {
-
-    QoL plugin;
-
-    public PlayerBucketEmptyListener(QoL plugin) {
-        this.plugin = plugin;
-    }
-
-    @EventHandler
-    public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event) {
-        Player player = event.getPlayer();
-        if( event.getBucket() == Material.LAVA_BUCKET) {
-            plugin.getGriefAlert().addAlert(player.getName() + " poured lava.");
-        }
-    }
-}

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

@@ -1,24 +0,0 @@
-package xyz.etztech.qol.listeners;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerChangedWorldEvent;
-import xyz.etztech.qol.QoL;
-
-import java.util.Map;
-
-public class PlayerChangedWorldListener implements Listener {
-    QoL plugin;
-
-    public PlayerChangedWorldListener(QoL plugin) {
-        this.plugin = plugin;
-    }
-
-    @EventHandler
-    public void onPlayerChangedWorld(PlayerChangedWorldEvent event) {
-        Player player = event.getPlayer();
-
-        plugin.updatePlayerViewDistance(player);
-    }
-}

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

@@ -21,6 +21,7 @@ public class ServerListPingListener implements Listener {
 
     public ServerListPingListener(QoL plugin) {
         this.plugin = plugin;
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
     }
 
     @EventHandler

src/main/java/xyz/etztech/qol/other/GriefAlert.java

@@ -1,58 +0,0 @@
-package xyz.etztech.qol.other;
-
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
-import xyz.etztech.core.web.CoreWeb;
-import xyz.etztech.qol.EtzTechUtil;
-import xyz.etztech.qol.QoL;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class GriefAlert implements Runnable {
-    private Map<String, Integer> alerts;
-
-    private QoL plugin;
-
-    public GriefAlert(QoL plugin) {
-        this.plugin = plugin;
-    }
-
-
-    @Override
-    public void run() {
-        alerts = new HashMap<>();
-    }
-
-    public void addAlert(String alert) {
-        int num = alerts.getOrDefault(alert, 0);
-        alerts.put(alert, ++num);
-        int lines = plugin.getConfig().getInt("grief-alert.lines", 5);
-        if (num < lines) {
-            alert(alert);
-        } else if (num == lines) {
-            String extra = " Suppressing more alerts for a while";
-            String webhook = plugin.getConfig().getString("grief-alert.webhook", "");
-            String message = "@here " + alert;
-            if (StringUtils.isNotEmpty(webhook)) {
-                extra += " and pinging Discord";
-                Map<String, String> data = new HashMap<>();
-                data.put("username", "Grief Alert");
-                data.put("content", message);
-                CoreWeb.asyncPost(plugin, webhook, data);
-            }
-            extra += "...";
-            alert(alert + extra);
-        }
-    }
-
-    private void alert(String alert) {
-        for (Player player : Bukkit.getOnlinePlayers()) {
-            if (player.hasPermission("qol.griefalert")) {
-                EtzTechUtil.sms(player, ChatColor.RED + alert);
-            }
-        }
-    }
-}

src/main/java/xyz/etztech/qol/other/Reminder.java

@@ -0,0 +1,63 @@
+package xyz.etztech.qol.other;
+
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.ComponentBuilder;
+import org.bukkit.configuration.ConfigurationSection;
+import net.md_5.bungee.api.ChatColor;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class Reminder {
+    private final int frequency;
+    private final List<ReminderList> reminderLists;
+
+    public Reminder(int frequency, List<ReminderList> reminderLists) {
+        this.frequency = frequency;
+        this.reminderLists = reminderLists;
+        Collections.sort(reminderLists);
+    }
+
+    public static Reminder fromConfig(ConfigurationSection config) {
+        int frequency = config.getInt("frequency");
+        List<ReminderList> reminderLists = new ArrayList();
+        ConfigurationSection reminderGroups = config.getConfigurationSection("reminder_groups");
+
+        for (String groupName: reminderGroups.getKeys(false)) {
+            ConfigurationSection group = reminderGroups.getConfigurationSection(groupName);
+
+            int period = group.getInt("period", 0);
+            ChatColor color = ChatColor.of(group.getString("color", "#3273DC"));
+            List<String> reminders = group.getStringList("reminders");
+
+            reminderLists.add(new ReminderList(reminders, period, color));
+        }
+
+        return new Reminder(frequency, reminderLists);
+    }
+
+    public BaseComponent[] nextReminder() {
+        BaseComponent[] msg = null;
+        boolean reminderFound = false;
+        for (ReminderList reminderList: reminderLists) {
+            if (!reminderFound && reminderList.isReady()) {
+                msg = new ComponentBuilder().
+                        color(reminderList.getColor())
+                        .append(reminderList.nextReminder())
+                        .create();
+
+                reminderFound = true;
+
+            }
+
+            reminderList.incCount();
+        }
+
+        return msg;
+    }
+
+    public int getFrequency() {
+        return frequency;
+    }
+}

src/main/java/xyz/etztech/qol/other/ReminderList.java

@@ -0,0 +1,46 @@
+package xyz.etztech.qol.other;
+
+import net.md_5.bungee.api.ChatColor;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class ReminderList implements Comparable<ReminderList>{
+    private final List<String> reminders;
+    private final int period;
+    private final ChatColor color;
+    private int ndx;
+    private int count;
+
+    public ReminderList(List<String> reminders, int period, ChatColor color) {
+        this.reminders = reminders;
+        this.period = period;
+        this.color = color;
+        this.ndx = 0;
+        this.count = 0;
+    }
+
+    public void incCount() {
+        count = (count + 1) % (period + 1);
+    }
+
+    public boolean isReady() {
+        return count == period;
+    }
+
+    public String nextReminder() {
+        String nextReminder = reminders.get(ndx);
+        ndx = (ndx + 1) % reminders.size();
+
+        return nextReminder;
+    }
+
+    @Override
+    public int compareTo(@NotNull ReminderList o) {
+        return Integer.compare(o.period, this.period);
+    }
+
+    public ChatColor getColor() {
+        return color;
+    }
+}

src/main/java/xyz/etztech/qol/other/ShadowMuteTime.java

@@ -1,112 +0,0 @@
-package xyz.etztech.qol.other;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class ShadowMuteTime {
-
-    private int hours;
-    private int minutes;
-    private int seconds;
-
-    public ShadowMuteTime() {
-        hours = 1;
-        minutes = 0;
-        seconds = 0;
-    }
-
-    public int getHours() {
-        return hours;
-    }
-
-    public void setHours(int hours) {
-        this.hours = hours;
-    }
-
-    public void addHours(int hours) {
-        this.hours += hours;
-    }
-
-    public int getMinutes() {
-        return minutes;
-    }
-
-    public void setMinutes(int minutes) {
-        this.minutes = minutes;
-    }
-
-    public void addMinutes(int minutes) {
-        this.minutes += minutes;
-    }
-
-    public int getSeconds() {
-        return seconds;
-    }
-
-    public void setSeconds(int seconds) {
-        this.seconds = seconds;
-    }
-
-    public void addSeconds(int seconds) {
-        this.seconds += seconds;
-    }
-
-    public String toString() {
-        return getHours() + " hours, " + getMinutes() + " minutes, and " + getSeconds() + " seconds";
-    }
-
-    public long toTicks() {
-        int seconds = getSeconds();
-        seconds += getMinutes()*60;
-        seconds += getHours()*60*60;
-        return seconds*20;
-    }
-
-    public static ShadowMuteTime parse(String time) throws Exception {
-        ShadowMuteTime smt = new ShadowMuteTime();
-        smt.setHours(0); // Defaults to 1 hour
-        String timePattern = "(?:(?<hours>\\d+)h)?(?:(?<minutes>\\d+)m)?(?:(?<seconds>\\d+)s)?";
-        Pattern pattern = Pattern.compile(timePattern);
-        Matcher match = pattern.matcher(time);
-
-        if (!match.matches()) {
-            throw new Exception("Time format does not match, defaulting to 1 hour.");
-        }
-
-        String hourString = match.group("hours");
-        if (hourString != null) {
-            int hours = Integer.parseInt(hourString);
-            smt.addHours(hours);
-        }
-
-        String minuteString = match.group("minutes");
-        if (minuteString != null) {
-            int minutes = Integer.parseInt(minuteString);
-            if (minutes >= 60) {
-                int toHours = minutes / 60;
-                minutes %= 60;
-                smt.addHours(toHours);
-            }
-            smt.addMinutes(minutes);
-        }
-
-        String secondString = match.group("seconds");
-        if (secondString != null) {
-            int seconds = Integer.parseInt(secondString);
-            if (seconds >= 60) {
-                int toMinutes = seconds / 60;
-                seconds %= 60;
-                int minutes = smt.getMinutes() + toMinutes;
-                if (minutes >= 60) {
-                    int toHours = minutes / 60;
-                    minutes %= 60;
-                    smt.addHours(toHours);
-                }
-                smt.addMinutes(minutes);
-            }
-            smt.addSeconds(seconds);
-        }
-
-        return smt;
-    }
-}

src/main/java/xyz/etztech/qol/other/TPSRunnable.java

@@ -1,9 +1,11 @@
 package xyz.etztech.qol.other;
 
-import net.ess3.api.IEssentials;
+import me.lucko.spark.api.statistic.StatisticWindow;
+import me.lucko.spark.api.statistic.types.DoubleStatistic;
 import org.apache.commons.lang.StringUtils;
-import xyz.etztech.core.web.CoreWeb;
+import xyz.etztech.core.web.Http;
 import xyz.etztech.qol.QoL;
+import me.lucko.spark.api.Spark;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -18,19 +20,19 @@ public class TPSRunnable implements Runnable {
 
     @Override
     public void run() {
-        IEssentials essentials = plugin.getEssentials();
-        if (essentials != null) {
-            double tps = essentials.getTimer().getAverageTPS();
+        Spark spark = plugin.getSpark();
+        if (spark != null) {
+            DoubleStatistic<StatisticWindow.TicksPerSecond> tps = spark.tps();
             int threshold = plugin.getConfig().getInt("tps.threshold", 0);
             String webhook = plugin.getConfig().getString("tps.webhook", "");
             String message = "@here TPS has fallen below " + threshold + "!";
-            if (tps < threshold) {
+            if (tps.poll(StatisticWindow.TicksPerSecond.SECONDS_10) < threshold) {
                 plugin.log(message);
                 if (StringUtils.isNotEmpty(webhook)) {
                     Map<String, String> data = new HashMap<>();
                     data.put("username", "TPS Alert");
                     data.put("content", message);
-                    CoreWeb.asyncPost(plugin, webhook, data);
+                    Http.asyncPost(plugin, webhook, data);
                 }
             }
         }

src/main/resources/config.yml

@@ -19,11 +19,6 @@ list:
 #  - mod
 #  - member
 
-# A list of plugins to show, overriding the Vanilla /pl
-# Leave blank to disable
-plugins:
-#  - QoL
-
 # A list of permissions to check, followed by a list of commands to run on login if a player has the specified permission
 # Special variables are <player> for the player logging in
 queue:
@@ -48,9 +43,8 @@ tps:
   threshold: 12
   webhook: ''
 
-grief-alert:
-  lines: 5
-  webhook: ''
+# The link to open for portal setup instructions
+portal-link: 'https://i.imgur.com/tQCbI0C.png'
 
 # The range after which a player will be marked as "outside the border"
 worldinfo:
@@ -66,10 +60,19 @@ schedule:
 
 # To disable, set minutes to 0
 reminders:
-  frequency: 5 # In minutes
-  color: '&a'
-  messages:
-    - 'Check out the Discord!'
+  frequency: 1 # In minutes
+  reminder_groups:
+    standard:
+      color: '#3273DC'
+      reminders:
+        - '1st Standard Reminder'
+        - '2nd Standard Reminder'
+    event:
+      color: '#3273DC'
+      period: 2
+      reminders:
+        - '1st Event Reminder'
+        - '2nd Event Reminder'
 
 # A list of links for link command aliases, separated by a comma between name and URL
 links:
@@ -90,9 +93,8 @@ disable-fire:
   ender_crystal: false
   explosion: false
 
-# Overrides view distance per world, format is [World Name]: [View Distance]
-view-distances:
-  world: 2
+disable-mob-grief:
+  enderman: false
 
 # A list of commands to confirm before using if the user isn't in spectator mode
 spec-confirm:
@@ -114,3 +116,11 @@ dynmap:
   defaults:
     map: "surface"
     zoom: 5
+
+# Shopkeepers Player Head Shop
+head_shop:
+  # Shopkeeper Shop ID, set to -1 to disable
+  id: -1
+  # Diamond price of a head in the shop, default is 2 diamonds
+  price: 2
+

src/main/resources/plugin.yml

@@ -4,18 +4,17 @@ description: ${description}
 author: ${author}
 website: ${url}
 main: ${mainClass}
+softdepend: [spark, dynmap, DiscordSRV, Shopkeepers]
+api-version: 1.13
 commands:
   qol:
     description: Base command
   colors:
     description: See all color/formatting codes
-    aliases: [color, c]
+    aliases: [color, c, colour, colours]
   list:
     description: See a list of players
     aliases: [players, playerlist]
-  plugins:
-    description: See a list of plugins
-    aliases: [pl]
   history:
     description: Name History utility command
     aliases: [names, name]
@@ -40,9 +39,6 @@ commands:
     description: Whitelist command
   timeout:
     description: Timeout command
-  karattrophy:
-    description: 24 karat trophy command
-    aliases: [trophy]
   checkup:
     description: Checkup command
   dynmaplink:
@@ -51,6 +47,13 @@ commands:
   marker:
     description: Dynmap marker command
     aliases: [mark]
+  wiki:
+    description: Search the Minecraft wiki
+  moon:
+    description: Get information about the current moon phase
+  discordignore:
+    description: Mute chat messages coming from Discord
+    aliases: [dignore]
 permissions:
   qol.admin:
     description: Ability to reload the plugin
@@ -85,9 +88,6 @@ permissions:
   qol.deathmute:
     description: Ability to use the Death Mute command
     default: op
-  qol.karattrophy:
-    description: Ability to use the Karat Trophy Command
-    default: op
   qol.checkup:
     description: Ability to use the Checkup Command
     default: op
@@ -103,9 +103,6 @@ permissions:
   qol.specconfirm:
     description: Makes the user confirm they want to run (configurable) command(s) out of spec
     default: op
-  qol.griefalert:
-    description: Alerts the user when monitored actions are encountered
-    default: op
   qol.whitelist.bypass:
     description: Allows someone into the server when Whitelist is enabled
     default: op
@@ -127,3 +124,15 @@ permissions:
     default: op
     children:
       qol.marker.limit: true
+  qol.wiki:
+    description: Ability to use the wiki command
+    default: op
+  qol.moon:
+    description: Ability to use the moon command
+    default: op
+  qol.discordignore:
+    description: Ability to use the use the discordignore command
+    default: op
+  qol.head_shop:
+    description: Controls if a player's head should be added to the head shop
+    default: op