Allow AutoKiller to be disabled

Signed-off-by: applenick <[email protected]>

src/main/java/tc/oc/occ/cheaty/BotConfig.java

@@ -16,6 +16,7 @@ public class BotConfig {
 
   private boolean reportsEnabled;
   private boolean relayCommandEnabled;
+  private boolean autoKillerEnabled;
 
   private String reportFormat;
   private String relayFormat;
@@ -56,6 +57,7 @@ public void reload(Configuration config) {
 
     this.reportsEnabled = config.getBoolean("types.reports");
     this.relayCommandEnabled = config.getBoolean("types.relay-command");
+    this.autoKillerEnabled = config.getBoolean("types.auto-killer");
 
     this.reportFormat = config.getString("report-format");
     this.relayFormat = config.getString("relay-format");
@@ -107,6 +109,10 @@ public boolean isRelayCommandEnabled() {
     return relayCommandEnabled;
   }
 
+  public boolean isAutoKillerEnabled() {
+    return autoKillerEnabled;
+  }
+
   public String getReportFormat() {
     return replaceServerName(reportFormat);
   }

src/main/java/tc/oc/occ/cheaty/BotListener.java

@@ -4,16 +4,13 @@
 import net.climaxmc.autokiller.events.AutoKillCheatEvent;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import tc.oc.occ.cheaty.DiscordBot.RelayType;
 
 public class BotListener implements Listener {
 
   private final DiscordBot bot;
-  private final BotConfig config;
 
-  public BotListener(DiscordBot bot, BotConfig config) {
+  public BotListener(DiscordBot bot) {
     this.bot = bot;
-    this.config = config;
   }
 
   @EventHandler
@@ -23,6 +20,6 @@ public void onPlayerReport(PlayerReportEvent event) {
 
   @EventHandler
   public void onAutoKillerViolation(AutoKillCheatEvent event) {
-    bot.sendRelay(event.getAlert(), RelayType.AUTOKILL);
+    bot.sendAutoKiller(event);
   }
 }

src/main/java/tc/oc/occ/cheaty/Cheaty.java

@@ -39,7 +39,7 @@ public void setupCommands() {
   }
 
   private void registerListeners() {
-    this.getServer().getPluginManager().registerEvents(new BotListener(bot, config), this);
+    this.getServer().getPluginManager().registerEvents(new BotListener(bot), this);
   }
 
   public void reloadBotConfig() {

src/main/java/tc/oc/occ/cheaty/DiscordBot.java

@@ -8,6 +8,7 @@
 import java.util.UUID;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
+import net.climaxmc.autokiller.events.AutoKillCheatEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -89,6 +90,11 @@ private Optional<ServerChannel> getChannel(String id) {
     return Optional.empty();
   }
 
+  private String getUsername(UUID playerId) {
+    Player player = Bukkit.getPlayer(playerId);
+    return player != null ? player.getName() : null;
+  }
+
   private void sendMessage(String message, boolean report) {
     if (api != null) {
       api.getServerById(config.getDiscordServerId())
@@ -129,17 +135,18 @@ public void sendReport(PlayerReportEvent event) {
     }
   }
 
-  private String getUsername(UUID playerId) {
-    Player player = Bukkit.getPlayer(playerId);
-    return player != null ? player.getName() : null;
-  }
-
   public void sendRelay(String message, RelayType type) {
     if (!config.isRelayCommandEnabled()) return;
     String formatted = config.getRelayFormat().replace("%message%", message);
     sendMessage(getPrefix(type) + formatted, false);
   }
 
+  public void sendAutoKiller(AutoKillCheatEvent event) {
+    if (!config.isAutoKillerEnabled()) return;
+    String formatted = config.getRelayFormat().replace("%message%", event.getAlert());
+    sendMessage(getPrefix(RelayType.AUTOKILL) + formatted, false);
+  }
+
   public void sendReportPing(Report report, int numReports) {
     List<String> pingRoles = config.getDiscordPingRoles();
 

src/main/resources/config.yml

@@ -20,6 +20,7 @@ channels:
 types:
   reports: true
   relay-command: true
+  auto-killer: true
 
 # Reports (Sent from PGM)
 #