fix: Remove sellclaim alias and GPFlags bloat

Author: castledking

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.griefprevention</groupId>
     <artifactId>GriefPrevention</artifactId>
-    <version>17.0.20</version>
+    <version>17.0.21</version>
 
     <name>GriefPrevention</name>
     <description>The official self-service anti-griefing Bukkit plugin for Minecraft servers since 2011.</description>

src/main/java/com/griefprevention/visualization/impl/FakeBlockVisualization.java

@@ -81,7 +81,7 @@ private boolean isLiquidLike(@NotNull Block block)
                 ((Lightable) fakeData).setLit(true);
                 yield createElementAdder(fakeData, type, false);
             }
-            case CONFLICT_ZONE_3D -> createElementAdder(Material.REDSTONE_BLOCK.createBlockData(), type, true);
+            case CONFLICT_ZONE_3D -> createElementAdder(Material.REDSTONE_ORE.createBlockData(), type, true);
             case RESTORE_NATURE -> {
                 // Special handling - corners need directional facing, handled in draw()
                 // Return a dummy adder that will be overridden

src/main/java/com/griefprevention/visualization/impl/GlowingVisualization.java

@@ -334,7 +334,7 @@ private void createBlockDisplay(Player player, IntVector pos, BlockData blockDat
         // For 3D subdivisions and 2D subdivisions, use exact coordinates without terrain snapping
         Material mat = blockData.getMaterial();
         boolean isExactPlacement = mat == Material.WHITE_WOOL || mat == Material.IRON_BLOCK ||
-                                   mat == Material.REDSTONE_BLOCK || mat == Material.NETHERRACK;
+                                   mat == Material.REDSTONE_ORE || mat == Material.NETHERRACK;
 
         int y;
         if (isExactPlacement) {

src/main/java/me/ryanhamshire/GriefPrevention/DataStore.java

@@ -93,7 +93,7 @@ public abstract class DataStore {
     final static String bannedWordsFilePath = dataLayerFolderPath + File.separator + "bannedWords.txt";
 
     // the latest version of the data schema implemented here
-    protected static final int latestSchemaVersion = 3;
+    protected static final int latestSchemaVersion = 5;
 
     // reading and writing the schema version to the data store
     abstract int getSchemaVersionFromStorage();

src/main/java/me/ryanhamshire/GriefPrevention/DatabaseDataStore.java

@@ -47,9 +47,9 @@ public class DatabaseDataStore extends DataStore
     private static final String SQL_UPDATE_NAME =
             "UPDATE griefprevention_playerdata SET name = ? WHERE name = ?";
     private static final String SQL_UPDATE_CLAIM =
-            "UPDATE griefprevention_claimdata SET owner = ?, lessercorner = ?, greatercorner = ?, builders = ?, containers = ?, accessors = ?, managers = ?, inheritnothing = ?, parentid = ?, expiration = ? WHERE id = ?";
+            "UPDATE griefprevention_claimdata SET owner = ?, lessercorner = ?, greatercorner = ?, builders = ?, containers = ?, accessors = ?, managers = ?, inheritnothing = ?, parentid = ?, expiration = ?, explosivesallowed = ? WHERE id = ?";
     private static final String SQL_INSERT_CLAIM =
-            "INSERT INTO griefprevention_claimdata (id, owner, lessercorner, greatercorner, builders, containers, accessors, managers, inheritnothing, parentid, expiration) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+            "INSERT INTO griefprevention_claimdata (id, owner, lessercorner, greatercorner, builders, containers, accessors, managers, inheritnothing, parentid, expiration, explosivesallowed) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
     private static final String SQL_DELETE_CLAIM =
             "DELETE FROM griefprevention_claimdata WHERE id = ?";
     private static final String SQL_SELECT_PLAYER_DATA =
@@ -74,6 +74,8 @@ public class DatabaseDataStore extends DataStore
             "SELECT * FROM griefprevention_claimdata WHERE id = ?";
     private static final String SQL_UPDATE_SCHEMA_ADD_EXPIRATION =
             "ALTER TABLE griefprevention_claimdata ADD COLUMN IF NOT EXISTS expiration BIGINT DEFAULT 0";
+    private static final String SQL_UPDATE_SCHEMA_ADD_EXPLOSIVES =
+            "ALTER TABLE griefprevention_claimdata ADD COLUMN IF NOT EXISTS explosivesallowed BOOLEAN DEFAULT 0";
 
     private Connection databaseConnection = null;
 
@@ -270,6 +272,12 @@ void initialize() throws Exception
             statement.execute(SQL_UPDATE_SCHEMA_ADD_EXPIRATION);
         }
 
+        if (this.getSchemaVersion() <= 4)
+        {
+            statement = this.databaseConnection.createStatement();
+            statement.execute(SQL_UPDATE_SCHEMA_ADD_EXPLOSIVES);
+        }
+
         //load claims data into memory
 
         results = statement.executeQuery("SELECT * FROM griefprevention_claimdata");
@@ -362,8 +370,11 @@ else if (this.getSchemaVersion() < 1)
                 String managersString = results.getString("managers");
                 List<String> managerNames = Arrays.asList(managersString.split(";"));
                 managerNames = this.convertNameListToUUIDList(managerNames);
+                boolean explosivesAllowed = results.getBoolean("explosivesallowed");
+
                 Claim claim = new Claim(lesserBoundaryCorner, greaterBoundaryCorner, ownerID, builderNames, containerNames, accessorNames, managerNames, inheritNothing, claimID, false);
                 claim.setExpirationDate(expirationDate);
+                claim.areExplosivesAllowed = explosivesAllowed;
 
                 if (removeClaim)
                 {
@@ -463,6 +474,7 @@ synchronized private void writeClaimData(Claim claim) throws SQLException
         boolean inheritNothing = claim.getSubclaimRestrictions();
         long parentId = claim.parent == null ? -1 : claim.parent.id;
         long expirationDate = claim.getExpirationDate();
+        boolean explosivesAllowed = claim.areExplosivesAllowed;
 
         try (PreparedStatement insertStmt = this.databaseConnection.prepareStatement(SQL_INSERT_CLAIM))
         {
@@ -478,6 +490,7 @@ synchronized private void writeClaimData(Claim claim) throws SQLException
             insertStmt.setBoolean(9, inheritNothing);
             insertStmt.setLong(10, parentId);
             insertStmt.setLong(11, expirationDate);
+            insertStmt.setBoolean(12, explosivesAllowed);
             insertStmt.executeUpdate();
         }
         catch (SQLException e)

src/main/java/me/ryanhamshire/GriefPrevention/EntityDamageHandler.java

@@ -323,7 +323,7 @@ private boolean handleEntityDamageByBlockExplosion(@NotNull EntityDamageInstance
         Claim claim = dataStore.getClaimAt(location, false, null);
         if (claim == null)
             return false;
-        // Fall back to claim setting if no GPFlags override
+        // Check claim setting for explosives
         if (claim.areExplosivesAllowed)
             return false;
 

src/main/java/me/ryanhamshire/GriefPrevention/FlatFileDataStore.java

@@ -553,10 +553,14 @@ Claim loadClaim(String input, ArrayList<Long> out_parentID, long lastModifiedDat
         // Add is3D flag
         boolean is3D = yaml.getBoolean("Is3D", false);
 
+        // Load explosives allowed setting (default false = protected)
+        boolean explosivesAllowed = yaml.getBoolean("Explosives Allowed", false);
+
         //instantiate
         claim = new Claim(lesserBoundaryCorner, greaterBoundaryCorner, ownerID, builders, containers, accessors, managers, inheritNothing, claimID, is3D);
         claim.modifiedDate = new Date(lastModifiedDate);
         claim.id = claimID;
+        claim.areExplosivesAllowed = explosivesAllowed;
 
         ConfigurationSection childrenSection = yaml.getConfigurationSection("Children");
         if (childrenSection != null)
@@ -612,6 +616,7 @@ private Claim deserializeChild(ConfigurationSection section, Claim parent, List<
 
         boolean inheritNothing = section.getBoolean("inheritNothing");
         boolean is3D = section.getBoolean("Is3D", false);
+        boolean explosivesAllowed = section.getBoolean("Explosives Allowed", false);
 
         Long childID = null;
         if (section.contains("Claim ID"))
@@ -630,6 +635,7 @@ private Claim deserializeChild(ConfigurationSection section, Claim parent, List<
         Claim child = new Claim(lesserBoundaryCorner, greaterBoundaryCorner, ownerID, builders, containers, accessors, managers, inheritNothing, childID, is3D);
         child.parent = parent;
         child.inDataStore = true;
+        child.areExplosivesAllowed = explosivesAllowed;
 
         if (!child.getSubclaimRestrictions())
         {
@@ -696,6 +702,7 @@ private void populateYamlForClaim(Claim claim, ConfigurationSection section)
         section.set("Parent Claim ID", claim.parent == null ? -1L : claim.parent.id);
         section.set("inheritNothing", claim.getSubclaimRestrictions());
         section.set("Is3D", claim.is3D());
+        section.set("Explosives Allowed", claim.areExplosivesAllowed);
         section.set("Modified Date", claim.modifiedDate != null ? claim.modifiedDate.getTime() : System.currentTimeMillis());
 
         ArrayList<Claim> persistedChildren = new ArrayList<>();

src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java

@@ -2005,6 +2005,9 @@ else if (cmd.getName().equalsIgnoreCase("deleteclaim") && player != null) {
                     claim.areExplosivesAllowed = true;
                     GriefPrevention.sendMessage(player, TextMode.Success, Messages.ExplosivesEnabled);
                 }
+
+                // Save the claim to persist the change
+                this.dataStore.saveClaim(claim);
             }
 
             return true;
@@ -4160,6 +4163,9 @@ public boolean handleClaimExplosionsCommand(CommandSender sender, String[] args)
             GriefPrevention.sendMessage(player, TextMode.Success, Messages.ExplosivesEnabled);
         }
 
+        // Save the claim to persist the change
+        this.dataStore.saveClaim(claim);
+
         return true;
     }
 

src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: GriefPrevention
 main: me.ryanhamshire.GriefPrevention.GriefPrevention
 softdepend:
-  [Multiverse-Core, My_Worlds, MystCraft, Transporter, RoyalCommands, MultiWorld, Denizen, CommandHelper, GPFlags]
+  [Multiverse-Core, My_Worlds, MystCraft, Transporter, RoyalCommands, MultiWorld, Denizen, CommandHelper]
 dev-url: https://dev.bukkit.org/projects/grief-prevention
 version: "${project.version}"
 api-version: "1.21"
@@ -204,7 +204,6 @@ commands:
     description: Sell claim blocks for server currency.
     usage: /<command> [amount]
     permission: griefprevention.buysellclaimblocks
-    aliases: sellclaim
   restorenature:
     description: Switches the shovel tool to restoration mode.
     usage: /<command>