Remove debug override, add my_remaining_claims placeholder, and relea…

…se RC5

.github/workflows/gradle.yml

@@ -36,17 +36,9 @@ jobs:
 
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: java
 
     - name: Build with Gradle
       run: ./gradlew build
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
 
     - name: Upload artifact
       uses: actions/upload-artifact@v2

README.md

@@ -1,7 +1,7 @@
 ![ClaimChunk Logo](imgs/icon64.png)
 ![ClaimChunk Title](imgs/logo_carrier.png)
 
-[![Version Info](https://img.shields.io/static/v1?label=Version&message=0.0.23-RC4&color=blueviolet&style=for-the-badge)](https://github.com/cjburkey01/ClaimChunk/releases)
+[![Version Info](https://img.shields.io/static/v1?label=Version&message=0.0.23-RC5&color=blueviolet&style=for-the-badge)](https://github.com/cjburkey01/ClaimChunk/releases)
 [![Download Info](https://img.shields.io/static/v1?label=Spigot&message=1.18.1&color=blueviolet&style=for-the-badge)](https://www.spigotmc.org/resources/claimchunk.44458/)
 [![Servers Using Claimchunk](https://img.shields.io/bstats/servers/5179?label=Servers&color=cornflowerblue&style=for-the-badge)](https://bstats.org/plugin/bukkit/ClaimChunk)
 [![Players Using Claimchunk](https://img.shields.io/bstats/players/5179?label=Players&color=cornflowerblue&style=for-the-badge)](https://bstats.org/plugin/bukkit/ClaimChunk)

build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 }
 
 object DepData {
-    const val LIVE_VERSION = "0.0.23-RC4";
+    const val LIVE_VERSION = "0.0.23-RC5";
     const val THIS_VERSION = "0.0.23-RC5";
     const val PLUGIN_NAME = "ClaimChunk";
     const val ARCHIVES_BASE_NAME = "claimchunk";

changelogs/0.0.23-RC5.md

@@ -0,0 +1,14 @@
+# ClaimChunk 0.0.23-RC5
+
+Changes:
+* Downgrade to Java 16 (Java 17 becomes too restrictive for older version support)
+  * It should be noted that ClaimChunk will always try to be up-to-date with Spigot or Minecraft API changes. Generally, new versions should support the previous release or two, but unless major issues arise, there aren't likely to be updates for older versions of the game.
+* Make some internal structural changes (Most APIs should be safe, but be sure to double-check that things still function as intended.
+* Disable debug spam being overridden in versions with an extra marker (such as snapshot or RC).
+* Add `my_remaining_claims` placeholder that displays the number of claims a player can make
+  * (Provides the value of `my_max_claims - my_claims`)
+
+Main remaining changes that need to be made before 0.0.23 is fully released:
+* Proper PvP support (the current support doesn't leave much to customizability). 
+
+As always please report any bugs (or minor changes that may still need to be made) you find to the [GitHub issue tracker](https://github.com/cjburkey01/ClaimChunk/issues) or our [Discord server](https://discord.gg/swW8xX665Z).

src/main/java/com/cjburkey/claimchunk/ClaimChunk.java

@@ -150,7 +150,6 @@ public void onLoad() {
         // Get the current plugin version
         version = SemVer.fromString(getDescription().getVersion());
         if (version.marker != null) {
-            Utils.overrideDebugEnable();
             Utils.debug("Plugin version is nonstandard release %s", version);
         }
 

src/main/java/com/cjburkey/claimchunk/i18n/V2JsonMessages.java

@@ -6,7 +6,6 @@
 import com.cjburkey.claimchunk.config.access.EntityAccess;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonSyntaxException;
 
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.ComponentBuilder;

src/main/java/com/cjburkey/claimchunk/placeholder/ClaimChunkPlaceholders.java

@@ -52,6 +52,13 @@ public ClaimChunkPlaceholders(IClaimChunkPlugin claimChunk) {
         playerPlaceholders.put(
                 "my_max_claims", ply -> claimChunk.getRankHandler().getMaxClaimsForPlayer(ply));
 
+        // This player's remaining number of claims as calculated by the rank handler
+        playerPlaceholders.put(
+                "my_remaining_claims",
+                ply ->
+                        claimChunk.getRankHandler().getMaxClaimsForPlayer(ply)
+                                - claimChunk.getChunkHandler().getClaimed(ply.getUniqueId()));
+
         /* Online player with chunk owner UUID placeholders */
 
         // Whether this player has permission to edit in this chunk