From e2819f22b265151b591b42cfe079628d336f1387 Mon Sep 17 00:00:00 2001
From: Etzelia <etzelia@hotmail.com>
Date: Sat, 17 Jul 2021 03:24:23 +0000
Subject: [PATCH] Check for configurable grief types (#2)

New CI for main

Add Drone

Signed-off-by: Etzelia <etzelia@hotmail.com>

Check for configurable grief types

Signed-off-by: Etzelia <etzelia@hotmail.com>

Reviewed-on: https://git.canopymc.net/Canopy/MineAlert/pulls/2
Reviewed-by: ZeroHD <joey@ahines.net>
Co-Authored-By: Etzelia <etzelia@hotmail.com>
Co-Committed-By: Etzelia <etzelia@hotmail.com>
---
 .drone.yml                                    | 36 +++++++++++++++++++
 pom.xml                                       |  6 ++--
 .../listeners/GriefAlertListener.java         | 21 ++++++++---
 src/main/resources/config.yml                 |  5 +++
 4 files changed, 60 insertions(+), 8 deletions(-)
 create mode 100644 .drone.yml

diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..664a8df
--- /dev/null
+++ b/.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/MineAlert-*.jar"
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 03e5232..94b14e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>xyz.etztech</groupId>
             <artifactId>plugin-api</artifactId>
-            <version>1.0.8</version>
+            <version>1.0.7</version>
         </dependency>
     </dependencies>
 
@@ -57,8 +57,8 @@
             <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
         </repository>
         <repository>
-            <id>etztech-repo</id>
-            <url>https://repo.etztech.xyz/</url>
+            <id>canopy-repo</id>
+            <url>https://mvn.canopymc.net/</url>
         </repository>
         <repository>
             <id>mvn-repo</id>
diff --git a/src/main/java/xyz/etztech/minealert/listeners/GriefAlertListener.java b/src/main/java/xyz/etztech/minealert/listeners/GriefAlertListener.java
index b1826e3..e46099f 100644
--- a/src/main/java/xyz/etztech/minealert/listeners/GriefAlertListener.java
+++ b/src/main/java/xyz/etztech/minealert/listeners/GriefAlertListener.java
@@ -117,23 +117,34 @@ public class GriefAlertListener implements Listener {
 
     @EventHandler
     public void onBlockIgnite(BlockIgniteEvent event) {
-        if (event.getPlayer() != null &&
-                (event.getCause() == BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL ||
-                        event.getCause() == BlockIgniteEvent.IgniteCause.FIREBALL)) {
+        if (
+                event.getPlayer() != null &&
+                this.plugin.getConfig().getStringList("grief.enabled").contains("ignition") &&
+                (
+                        event.getCause() == BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL ||
+                        event.getCause() == BlockIgniteEvent.IgniteCause.FIREBALL
+                )
+        ) {
             addAlert(event.getPlayer(), event.getBlock().getLocation(), Lang.IGNITE_ALERT);
         }
     }
 
     @EventHandler
     public void onBlockPlace(BlockPlaceEvent event) {
-        if(event.getBlockPlaced().getType() == Material.TNT) {
+        if(
+                this.plugin.getConfig().getStringList("grief.enabled").contains("tnt") &&
+                event.getBlockPlaced().getType() == Material.TNT
+        ) {
             addAlert(event.getPlayer(), event.getBlock().getLocation(), Lang.TNT_ALERT);
         }
     }
 
     @EventHandler
     public void onBucketEmpty(PlayerBucketEmptyEvent event) {
-        if(event.getBucket() == Material.LAVA_BUCKET) {
+        if(
+                this.plugin.getConfig().getStringList("grief.enabled").contains("lava") &&
+                event.getBucket() == Material.LAVA_BUCKET
+        ) {
             addAlert(event.getPlayer(), event.getBlock().getLocation(), Lang.LAVA_ALERT);
         }
     }
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 1eb4acb..ca4d724 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -21,6 +21,11 @@ grief:
   below_y: 255
   # y level lower limit
   above_y: 20
+  # enabled alert types (ignition, tnt, or lava)
+  enabled:
+    - ignition
+    - tnt
+    - lava
 
 # OreAlert
 ore: