Skip to content

Commit c9b6211

Browse files
committed
Remove debug override, add my_remaining_claims placeholder, and release RC5
1 parent ff47945 commit c9b6211

File tree

7 files changed

+23
-12
lines changed

7 files changed

+23
-12
lines changed

.github/workflows/gradle.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,9 @@ jobs:
3636
3737
- name: Grant execute permission for gradlew
3838
run: chmod +x gradlew
39-
40-
- name: Initialize CodeQL
41-
uses: github/codeql-action/init@v1
42-
with:
43-
languages: java
4439

4540
- name: Build with Gradle
4641
run: ./gradlew build
47-
48-
- name: Perform CodeQL Analysis
49-
uses: github/codeql-action/analyze@v1
5042

5143
- name: Upload artifact
5244
uses: actions/upload-artifact@v2

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
![ClaimChunk Logo](imgs/icon64.png)
22
![ClaimChunk Title](imgs/logo_carrier.png)
33

4-
[![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)
4+
[![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)
55
[![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/)
66
[![Servers Using Claimchunk](https://img.shields.io/bstats/servers/5179?label=Servers&color=cornflowerblue&style=for-the-badge)](https://bstats.org/plugin/bukkit/ClaimChunk)
77
[![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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ plugins {
1414
}
1515

1616
object DepData {
17-
const val LIVE_VERSION = "0.0.23-RC4";
17+
const val LIVE_VERSION = "0.0.23-RC5";
1818
const val THIS_VERSION = "0.0.23-RC5";
1919
const val PLUGIN_NAME = "ClaimChunk";
2020
const val ARCHIVES_BASE_NAME = "claimchunk";

changelogs/0.0.23-RC5.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# ClaimChunk 0.0.23-RC5
2+
3+
Changes:
4+
* Downgrade to Java 16 (Java 17 becomes too restrictive for older version support)
5+
* 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.
6+
* Make some internal structural changes (Most APIs should be safe, but be sure to double-check that things still function as intended.
7+
* Disable debug spam being overridden in versions with an extra marker (such as snapshot or RC).
8+
* Add `my_remaining_claims` placeholder that displays the number of claims a player can make
9+
* (Provides the value of `my_max_claims - my_claims`)
10+
11+
Main remaining changes that need to be made before 0.0.23 is fully released:
12+
* Proper PvP support (the current support doesn't leave much to customizability).
13+
14+
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ public void onLoad() {
150150
// Get the current plugin version
151151
version = SemVer.fromString(getDescription().getVersion());
152152
if (version.marker != null) {
153-
Utils.overrideDebugEnable();
154153
Utils.debug("Plugin version is nonstandard release %s", version);
155154
}
156155

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.cjburkey.claimchunk.config.access.EntityAccess;
77
import com.google.gson.Gson;
88
import com.google.gson.GsonBuilder;
9-
import com.google.gson.JsonSyntaxException;
109

1110
import net.md_5.bungee.api.chat.BaseComponent;
1211
import net.md_5.bungee.api.chat.ComponentBuilder;

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,13 @@ public ClaimChunkPlaceholders(IClaimChunkPlugin claimChunk) {
5252
playerPlaceholders.put(
5353
"my_max_claims", ply -> claimChunk.getRankHandler().getMaxClaimsForPlayer(ply));
5454

55+
// This player's remaining number of claims as calculated by the rank handler
56+
playerPlaceholders.put(
57+
"my_remaining_claims",
58+
ply ->
59+
claimChunk.getRankHandler().getMaxClaimsForPlayer(ply)
60+
- claimChunk.getChunkHandler().getClaimed(ply.getUniqueId()));
61+
5562
/* Online player with chunk owner UUID placeholders */
5663

5764
// Whether this player has permission to edit in this chunk

0 commit comments

Comments
 (0)