fix spaces

Co-authored-by: Ardakaz <ardakaz@duck.com>
Reviewed-on: #11
Reviewed-by: Ardakaz <ardakaz@duck.com>
Co-authored-by: ThePindabaas <thepindabaas@noreply.localhost>
Co-committed-by: ThePindabaas <thepindabaas@noreply.localhost>

.gitea/workflows/build.yml

@@ -0,0 +1,16 @@
+name: Build
+run-name: ${{ gitea.ref }} - ${{ gitea.sha }}
+on: [push, workflow_dispatch]
+
+jobs:
+  Explore-Gitea-Actions:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: '25'
+      - run: ./gradlew assemble
+      - run: ./gradlew test
+      - run: ./gradlew jar

.gitea/workflows/demo.yml

@@ -0,0 +1,19 @@
+name: Gitea Actions Demo
+run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
+on: [workflow_dispatch]
+
+jobs:
+  Explore-Gitea-Actions:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event."
+      - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!"
+      - run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - run: echo "💡 The ${{ gitea.repository }} repository has been cloned to the runner."
+      - run: echo "🖥️ The workflow is now ready to test your code on the runner."
+      - name: List files in the repository
+        run: |
+          ls ${{ gitea.workspace }}
+      - run: echo "🍏 This job's status is ${{ job.status }}."

build.gradle

@@ -16,16 +16,11 @@ repositories{
         name = "core-protect"
         url = "https://maven.playpro.com/"
     }
-    maven {
-        name = "essentialsX"
-        url = "https://repo.essentialsx.net/releases/"
-    }
 }
 
 dependencies {
     compileOnly "io.papermc.paper:paper-api:26.1.2.build.72-stable"
     compileOnly "net.coreprotect:coreprotect:23.2"
-    compileOnly "net.essentialsx:EssentialsX:2.21.2"
 
     testImplementation(platform('org.junit:junit-bom:5.10.5'))
     testImplementation('org.junit.jupiter:junit-jupiter')

src/main/java/net/ardakaz/griefalert/GriefAlert.java

@@ -41,7 +41,6 @@ import java.util.stream.Collectors;
 public class GriefAlert extends JavaPlugin implements Listener {
 
     private static CoreProtectAPI coreProtectAPI;
-    private final String DB_FILE = "ignored_locations.db";
     private Integer identicalAlerts = 1;
     private String lastAlert;
     private Set<Material> EXCLUDED_BLOCKS;
@@ -50,6 +49,10 @@ public class GriefAlert extends JavaPlugin implements Listener {
     private Boolean ALLOW_STEALING;
     private Connection connection;
 
+    /*
+    UTILITY FUNCTIONS
+    */
+
     // Block inspector: only the most recent placement counts for ownership.
     private static String inspectBlock(Block block, Player player) {
         List<String[]> lookup = coreProtectAPI.blockLookup(block, 50000000);
@@ -70,7 +73,7 @@ public class GriefAlert extends JavaPlugin implements Listener {
                 }
             }
             // If we see a break before a placement, stop (block is gone)
-            if (parseResult.getActionId() == 0) {
+            if (parseResult.getActionId() == 0 && !parseResult.isRolledBack()) {
                 break;
             }
         }
@@ -90,9 +93,69 @@ public class GriefAlert extends JavaPlugin implements Listener {
         return world;
     }
 
+    // Sends the alert (or cancels it)
+    private void alert(String message, String playerName, String mapLink, String target, int x, int y, int z, String world) {
+        // Exclude trusted people
+        Player griefer = Bukkit.getPlayer(playerName);
+        if (griefer.hasPermission("griefalert.exclude") || griefer.hasPermission("griefalert.exclude." + target)) {
+            return;
+        }
+        // Spam limiter
+        String realAlertMessage = message;
+        String[] alert1 = null;
+        if (lastAlert != null) {
+            alert1 = lastAlert.split(" ");
+        }
+        String[] alert2 = message.split(" ");
+        if (alert1 != null) {
+            if (alert1[2].equals(alert2[2]) && alert1[5].equals(alert2[5]) && alert1[1].equals("broke") && alert2[1].equals("broke")) {
+                identicalAlerts += 1;
+            } else if (Arrays.equals(alert1, alert2)) {
+                identicalAlerts += 1;
+            } else {
+                identicalAlerts = 1;
+            }
+        }
+        if (identicalAlerts == 4) {
+            message = ChatColor.GRAY + "Same behavior continues.";
+            mapLink = null;
+        }
+        if (identicalAlerts > 4) {
+            return;
+        }
+
+        // Use direct location check
+        if (world != null && isLocationIgnored(x, y, z, world)) {
+            return; // Do not alert if location is ignored
+        }
+
+        // Send an event for external hooks
+        GriefAlertEvent griefalert_event;
+        if (MAP_LINK != null && !MAP_LINK.isEmpty() && mapLink != null) {
+            griefalert_event = new GriefAlertEvent(message + " (" + mapLink + ")");
+        } else {
+            griefalert_event = new GriefAlertEvent(message);
+        }
+        getServer().getPluginManager().callEvent(griefalert_event);
+
+        // Notify staff ingame
+        for (Player player : Bukkit.getOnlinePlayers()) {
+            if (player.hasPermission("griefalert.notify")) {
+                player.sendMessage(message);
+            }
+        }
+
+        lastAlert = realAlertMessage;
+    }
+
+    /*
+    INITIALIZATION
+    */
+
     // Init GriefAlert
     @Override
     public void onEnable() {
+
         coreProtectAPI = getCoreProtect();
         if (coreProtectAPI == null) {
             getLogger().severe("CoreProtect not found! Disabling plugin.");
@@ -101,7 +164,6 @@ public class GriefAlert extends JavaPlugin implements Listener {
         }
 
         getServer().getPluginManager().registerEvents(this, this);
-        getServer().getPluginManager().registerEvents(new GriefAlertBan(), this);
 
         // Config
         saveDefaultConfig();
@@ -131,16 +193,26 @@ public class GriefAlert extends JavaPlugin implements Listener {
     }
 
     private void setupDatabase() {
+        String jdbcUrl = getConfig().getString("jdbc-url");
         try {
-            connection = DriverManager.getConnection("jdbc:sqlite:" + getDataFolder().getAbsolutePath() + "/" + DB_FILE);
+            connection = DriverManager.getConnection(jdbcUrl);
             Statement stmt = connection.createStatement();
-            stmt.executeUpdate("CREATE TABLE IF NOT EXISTS ignored_locations (x INTEGER, y INTEGER, z INTEGER, world TEXT, PRIMARY KEY (x, y, z, world))");
+            stmt.executeUpdate(Migrations.CREATE_TABLE_IGNORED_LOCATIONS);
+            stmt.executeUpdate(Migrations.CREATE_TABLE_PLAYERS);
+            stmt.executeUpdate(Migrations.CREATE_TABLE_ACTIONS);
+            stmt.executeUpdate(Migrations.CREATE_TABLE_ALERTS);
+            stmt.executeUpdate(Migrations.CREATE_TABLE_REPORTS);
             stmt.close();
+            getLogger().info("Connected to "+jdbcUrl);
         } catch (SQLException e) {
             getLogger().severe("Could not set up SQLite database: " + e.getMessage());
         }
     }
 
+    /*
+    LOCATION IGNORING
+    */
+
     private boolean isLocationIgnored(int x, int y, int z, String world) {
         try {
             PreparedStatement ps = connection.prepareStatement("SELECT 1 FROM ignored_locations WHERE x=? AND y=? AND z=? AND world=?");
@@ -191,6 +263,10 @@ public class GriefAlert extends JavaPlugin implements Listener {
         }
     }
 
+    /*
+    EVENT LISTENERS
+    */
+
     @EventHandler(ignoreCancelled = true)
     // Block break alerts
     public void onBlockBreak(BlockBreakEvent event) {
@@ -336,7 +412,7 @@ public class GriefAlert extends JavaPlugin implements Listener {
         }
     }
 
-    //event handler for item frames
+    // Placing item to an item frame
     @EventHandler(ignoreCancelled = true)
     public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
         if (!(event.getRightClicked() instanceof ItemFrame frame)) return;
@@ -370,7 +446,7 @@ public class GriefAlert extends JavaPlugin implements Listener {
         }
     }
 
-    // Breaking item frame item (uses a different event then placing an item)
+    // Item frame stealing alerts
     @EventHandler(ignoreCancelled = true)
     public void onItemFrameDamage(EntityDamageByEntityEvent event) {
         if (!(event.getEntity() instanceof ItemFrame frame)) return;
@@ -398,6 +474,7 @@ public class GriefAlert extends JavaPlugin implements Listener {
         alert(message, playerName, "[Map Link](" + MAP_LINK + "/?worldname=" + worldName + "&zoom=7&x=" + x + "&y=" + y + "&z=" + z + ")", target, x, y, z, worldName);
     }
 
+    // Item frame breaking alerts
     @EventHandler(ignoreCancelled = true)
     public void onItemFrameBreak(HangingBreakByEntityEvent event) {
         if (!(event.getEntity() instanceof ItemFrame frame)) return;
@@ -423,6 +500,7 @@ public class GriefAlert extends JavaPlugin implements Listener {
 
     }
 
+    // Command handler
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         if (!command.getName().equalsIgnoreCase("griefalert")) return false;
@@ -584,57 +662,6 @@ public class GriefAlert extends JavaPlugin implements Listener {
         return null;
     }
 
-    // Sends the alert (or cancels it)
-    private void alert(String message, String playerName, String mapLink, String target, int x, int y, int z, String world) {
-        // Exclude trusted people
-        Player griefer = Bukkit.getPlayer(playerName);
-        if (griefer.hasPermission("griefalert.exclude") || griefer.hasPermission("griefalert.exclude." + target)) {
-            return;
-        }
-        // Spam limiter
-        String realAlertMessage = message;
-        String[] alert1 = null;
-        if (lastAlert != null) {
-            alert1 = lastAlert.split(" ");
-        }
-        String[] alert2 = message.split(" ");
-        if (alert1 != null) {
-            if (alert1[2].equals(alert2[2]) && alert1[5].equals(alert2[5]) && alert1[1].equals("broke") && alert2[1].equals("broke")) {
-                identicalAlerts += 1;
-            } else if (Arrays.equals(alert1, alert2)) {
-                identicalAlerts += 1;
-            } else {
-                identicalAlerts = 1;
-            }
-        }
-        if (identicalAlerts == 4) {
-            message = ChatColor.GRAY + "Same behavior continues.";
-            mapLink = null;
-        }
-        if (identicalAlerts > 4) {
-            return;
-        }
-        // Use direct location check
-        if (world != null && isLocationIgnored(x, y, z, world)) {
-            return; // Do not alert if location is ignored
-        }
-        // Send an event for external hooks
-        GriefAlertEvent griefalert_event;
-        if (MAP_LINK != null && !MAP_LINK.isEmpty() && mapLink != null) {
-            griefalert_event = new GriefAlertEvent(message + " (" + mapLink + ")");
-        } else {
-            griefalert_event = new GriefAlertEvent(message);
-        }
-        getServer().getPluginManager().callEvent(griefalert_event);
-        // Notify staff ingame
-        for (Player player : Bukkit.getOnlinePlayers()) {
-            if (player.hasPermission("griefalert.notify")) {
-                player.sendMessage(message);
-            }
-        }
-        lastAlert = realAlertMessage;
-    }
-
     //pet alert(dog and cat only)
     @EventHandler
     public void onPetKill(EntityDeathEvent event) {
@@ -662,7 +689,7 @@ public class GriefAlert extends JavaPlugin implements Listener {
 
     }
 
-    //farm animal handler
+    // Mob killing alerts
     @EventHandler
     public void onFarmAnimalDeath(EntityDeathEvent event) {
         if (!(event.getEntity().getKiller() instanceof Player killer)) return;
@@ -698,6 +725,7 @@ public class GriefAlert extends JavaPlugin implements Listener {
       and its waxed, ill assume ur unwaxing, and therefor sending an alert
       but some of this code was written at 1am so idk how and why im why and howing */
 
+    // Waxing/unwaxing alerts
     @EventHandler
     public void onBlockClick(PlayerInteractEvent event) {
         if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
@@ -754,13 +782,13 @@ public class GriefAlert extends JavaPlugin implements Listener {
                 action = "error 404 check with kleedje30";
             }
 
-            String message = ChatColor.GRAY + player.getName() + action + " Copper " + " at " + x + " " + y + " " + z + getHumanWorldName(world);
+            String message = ChatColor.GRAY + player.getName() + " " + action + " Copper" + " at " + x + " " + y + " " + z + getHumanWorldName(world);
             alert(message, player.getName(), "[Map Link](" + MAP_LINK + "/?worldname=" + world + "&zoom=7&x=" + x + "&y=" + y + "&z=" + z + ")", target, x, y, z, world);
 
         }, 1L);
     }
 
-    //stripping logs
+    // Log stripping alerts
     @EventHandler
     public void onLogStrip(PlayerInteractEvent event) {
         if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
@@ -811,6 +839,10 @@ public class GriefAlert extends JavaPlugin implements Listener {
         }, 1L);
     }
 
+    /*
+    CoreProtect API
+    */
+
     private CoreProtectAPI getCoreProtect() {
         Plugin plugin = getServer().getPluginManager().getPlugin("CoreProtect");
 

src/main/java/net/ardakaz/griefalert/GriefAlertBan.java

@@ -1,76 +0,0 @@
-package net.ardakaz.griefalert;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.*;
-import org.bukkit.event.server.ServerCommandEvent;
-import org.bukkit.plugin.java.*;
-
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-
-
-import java.util.Arrays;
-
-
-public class GriefAlertBan extends JavaPlugin implements Listener {
-    @EventHandler
-        public void onBanCommand(PlayerCommandPreprocessEvent event){
-            String message = event.getMessage();
-            String[] syl = message.split(" ");
-            String Banner = event.getPlayer().getName();
-            if(syl.length >=2 && syl[0].equalsIgnoreCase("/ban")){
-                String BannedPlayer = syl[1];
-                String BanReason = String.join(" ", Arrays.copyOfRange(syl, 2, syl.length));
-
-                System.out.println(Banner + " banned" + BannedPlayer + " for " + BanReason);
-                
-                //player must be online for /ipban to actualy do stuff but whatever
-            } else if(syl.length >= 3 && syl[0].equalsIgnoreCase("/tempban")){
-                 String BannedPlayer = syl[1];
-                 String time = syl[2];
-                 String BanReason = String.join(" ", Arrays.copyOfRange(syl, 3, syl.length));
-                 System.out.println(Banner + " banned " + BannedPlayer + " for " + time + " for " + BanReason);
-            }else if(syl.length >= 2 && syl[0].equalsIgnoreCase("/ipban")){
-                String BannedPlayer = syl[1];
-                Player player = Bukkit.getPlayerExact(BannedPlayer);
-                String BanReason = String.join(" ", Arrays.copyOfRange(syl, 2, syl.length));
-                if(!(player == null)){
-                String ip = player.getAddress().getAddress().getHostAddress();
-
-                System.out.println(Banner + " banned " + ip + " for " + BanReason);
-                
-                } else System.out.println("unexpected error, ip maybe not finded? ");
-
-            }
-                
-            }
-    
-
-    @EventHandler
-    public void onConsoleCommand(ServerCommandEvent event){
-        String message = event.getCommand();
-            String[] syl = message.split(" ");
-            if(syl.length >=2 && syl[0].equalsIgnoreCase("/ban")){
-                String BannedPlayer = syl[1];
-                String BanReason = String.join(" ", Arrays.copyOfRange(syl, 2, syl.length));
-
-                System.out.println("console " + " banned" + BannedPlayer + " for " + BanReason);
-                
-                //player must be online for /ipban to actualy do stuff but whatever
-            } else if(syl.length >= 3 && syl[0].equalsIgnoreCase("/tempban")){
-                 String BannedPlayer = syl[1];
-                 String time = syl[2];
-                 String banReason = String.join(" ", Arrays.copyOfRange(syl, 3, syl.length));
-                 System.out.println("console " + " banned " + BannedPlayer + " for " + time + " for " + banReason);
-            }else if(syl.length >= 2 && syl[0].equalsIgnoreCase("/ipban")){
-                String BannedPlayer = syl[1];
-                Player player = Bukkit.getPlayerExact(BannedPlayer);
-                if(!(player == null)){
-                String ip = player.getAddress().getAddress().getHostAddress();
-                }
-            }
-    }
-        
-    
-}

src/main/java/net/ardakaz/griefalert/JailListener.java

@@ -1,30 +0,0 @@
-package net.ardakaz.griefalert;
-
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-//EssentialsX import
-import net.ess3.api.IUser;
-import net.ess3.api.events.JailStatusChangeEvent;
-
-
-public class JailListener implements Listener{
-
-@EventHandler
-//if someone gets jailed/unjailed this triggers
-    public void onJailToggle(JailStatusChangeEvent event){
-        //getValue = boolean jailed getAffected = gets user
-        boolean jailed = event.getValue();
-        IUser player = event.getAffected();
-
-        //if someone is jailed
-        if(jailed){
-            System.out.println(player + "got Jailed");
-            //else
-        } else{
-            System.out.println(player + "got unjailed");
-        }
-
-        
-
-    }
-}

src/main/java/net/ardakaz/griefalert/Migrations.java

@@ -0,0 +1,68 @@
+package net.ardakaz.griefalert;
+
+public class Migrations {
+
+    public static final String CREATE_TABLE_IGNORED_LOCATIONS =
+            "CREATE TABLE IF NOT EXISTS ignored_locations (" +
+                    "x INTEGER, " +
+                    "y INTEGER, " +
+                    "z INTEGER, " +
+                    "world TEXT, " +
+                    "PRIMARY KEY (x, y, z, world)" +
+                    ")";
+
+    public static final String CREATE_TABLE_PLAYERS =
+            "CREATE TABLE IF NOT EXISTS players (" +
+                    "id TEXT PRIMARY KEY, " +
+                    "names TEXT NOT NULL, " +
+                    "playtime INTEGER NOT NULL DEFAULT 0, " +
+                    "firstseen INTEGER NOT NULL DEFAULT CURRENT_TIMESTAMP, " +
+                    "lastseen INTEGER NOT NULL DEFAULT CURRENT_TIMESTAMP" +
+                    ")";
+
+    public static final String CREATE_TABLE_ACTIONS =
+            "CREATE TABLE IF NOT EXISTS actions (" +
+                    "id INTEGER PRIMARY KEY, " +
+                    "player TEXT NOT NULL, " +
+                    "type TEXT NOT NULL, " +
+                    "moderator TEXT NOT NULL, " +
+                    "reason TEXT, " +
+                    "time TEXT, " +
+                    "timestamp INTEGER NOT NULL DEFAULT CURRENT_TIMESTAMP, " +
+                    "FOREIGN KEY(player) REFERENCES players(id)" +
+                    ")";
+
+    public static final String CREATE_TABLE_ALERTS =
+            "CREATE TABLE IF NOT EXISTS alerts (" +
+                    "id INTEGER PRIMARY KEY, " +
+                    "player TEXT NOT NULL, " +
+                    "action TEXT NOT NULL, " +
+                    "target TEXT NOT NULL, " +
+                    "target_amount INTEGER, " +
+                    "target_player TEXT NOT NULL, " +
+                    "x INTEGER NOT NULL, " +
+                    "y INTEGER NOT NULL, " +
+                    "z INTEGER NOT NULL, " +
+                    "world TEXT NOT NULL, " +
+                    "is_flagged INTEGER, " +
+                    "flag_text TEXT, " +
+                    "resolved_by TEXT, " +
+                    "state TEXT NOT NULL DEFAULT 'UNRESOLVED', " +
+                    "timestamp INTEGER NOT NULL DEFAULT CURRENT_TIMESTAMP, " +
+                    "FOREIGN KEY(player) REFERENCES players(id)" +
+                    ")";
+
+    public static final String CREATE_TABLE_REPORTS =
+            "CREATE TABLE IF NOT EXISTS reports (" +
+                    "id INTEGER PRIMARY KEY, " +
+                    "player TEXT NOT NULL, " +
+                    "x INTEGER NOT NULL, " +
+                    "y INTEGER NOT NULL, " +
+                    "z INTEGER NOT NULL, " +
+                    "world TEXT NOT NULL, " +
+                    "text TEXT NOT NULL, " +
+                    "resolved_by TEXT, " +
+                    "timestamp INTEGER NOT NULL DEFAULT CURRENT_TIMESTAMP, " +
+                    "state TEXT NOT NULL DEFAULT 'UNRESOLVED'" +
+                    ")";
+}

src/main/java/net/ardakaz/griefalert/MuteListener.java

@@ -1,23 +0,0 @@
-package net.ardakaz.griefalert;
-
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import net.ess3.api.IUser;
-import net.ess3.api.events.MuteStatusChangeEvent;
-
-public class MuteListener {
-
-    @EventHandler
-    public void onMuteChange(MuteStatusChangeEvent event){
-
-        boolean muted = event.getValue();
-        IUser player = event.getAffected();
-
-        if(muted){
-            System.out.println("blergh");
-        } else{
-            System.out.println("not blergh");
-        }
-    }
-    
-}

src/main/resources/config.yml

@@ -1,6 +1,8 @@
 # Ignore all stealing?
 allow-stealing: false
 
+jdbc-url: "./plugins/GriefAlert/database.db"
+
 # Breaking these blocks don't cause alerts. (Material)
 excluded-blocks:
     - WHEAT

src/main/resources/plugin.yml

@@ -2,7 +2,7 @@ name: GriefAlert
 main: net.ardakaz.griefalert.GriefAlert
 version: 0.6
 api-version: 1.21
-depends: [CoreProtect] [EssentialsX]
+depends: [CoreProtect]
 softdepend: [DiscordSRV]
 description: A simple grief alert plugin using the CoreProtect API.
 authors: [Ardakaz, kleedje30]
@@ -12,13 +12,3 @@ commands:
     usage: /griefalert <ignore|unignore|check>
     permission: griefalert.staff
     permission-message: You do not have permission to use this command.
-  ban:
-    description: GriefAlert Ban command
-    usage: /ban <user> <reason>
-    permission: griefalert.staff
-    permission-message: you do not have authority to use this command.
-  tempban:
-    description: temporary /ban
-    usage: /tempban <user> <time> <reason>
-    permission: griefalert.staff
-    permission-message: you do not have the authority to use this command.