Skip to content

Commit

Permalink
Re-add am_trusted placeholder!
Browse files Browse the repository at this point in the history
  • Loading branch information
cjburkey01 committed Jun 3, 2024
1 parent 4a04c1b commit 06452bc
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 7 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
![ClaimChunk Logo](imgs/icon64.png)
![ClaimChunk Title](imgs/logo_carrier.png)

[![Plugin Version](https://img.shields.io/static/v1?label=Version&message=0.0.25-FIX1&color=blueviolet&style=for-the-badge)](https://github.com/cjburkey01/ClaimChunk/releases)
[![Plugin Version](https://img.shields.io/static/v1?label=Version&message=0.0.25-FIX2&color=blueviolet&style=for-the-badge)](https://github.com/cjburkey01/ClaimChunk/releases)
[![Maven Central Version](https://img.shields.io/maven-central/v/com.cjburkey.claimchunk/claimchunk?label=Maven%20Central&color=blueviolet&style=for-the-badge)](https://central.sonatype.com/artifact/com.cjburkey.claimchunk/claimchunk)
[![Minecraft Version](https://img.shields.io/static/v1?label=Spigot&message=1.20.6&color=blueviolet&style=for-the-badge)](https://www.spigotmc.org/resources/claimchunk.44458/)
![Java Version](https://img.shields.io/static/v1?label=Java&message=17&color=blueviolet&style=for-the-badge)
Expand Down Expand Up @@ -85,26 +85,26 @@ Maven:
<dependency>
<groupId>com.cjburkey.claimchunk</groupId>
<artifactId>claimchunk</artifactId>
<version>0.0.25-FIX1</version>
<version>0.0.25-FIX2</version>
</dependency>
```

Gradle (Groovy):

```groovy
implementation 'com.cjburkey.claimchunk:claimchunk:0.0.25-FIX1'
implementation 'com.cjburkey.claimchunk:claimchunk:0.0.25-FIX2'
```

Gradle (Kotlin):

```kotlin
implementation("com.cjburkey.claimchunk:claimchunk:0.0.25-FIX1")
implementation("com.cjburkey.claimchunk:claimchunk:0.0.25-FIX2")
```

Building
--------
[![Automatic Build](https://img.shields.io/github/actions/workflow/status/cjburkey01/ClaimChunk/gradle.yml?branch=main&style=for-the-badge)](https://claimchunk.cjburkey.com/server/Downloads.html#snapshot-downloads)
[![Version Info](https://img.shields.io/static/v1?label=Repository%20Version&message=0.0.25-FIX1&color=ff5555&style=for-the-badge)](https://github.com/cjburkey01/ClaimChunk/archive/main.zip)
[![Version Info](https://img.shields.io/static/v1?label=Repository%20Version&message=0.0.25-FIX2&color=ff5555&style=for-the-badge)](https://github.com/cjburkey01/ClaimChunk/archive/main.zip)

If you want to obtain a version of the plugin that isn't available yet (like a snapshot), you can do so by asking on the
Discord or building it yourself. Here's how to build it yourself:
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ plugins {
object DepData {
const val JAVA_VERSION = 17

const val LIVE_VERSION = "0.0.25-FIX1"
const val THIS_VERSION = "0.0.25-FIX1"
const val LIVE_VERSION = "0.0.25-FIX2"
const val THIS_VERSION = "0.0.25-FIX2"
const val PLUGIN_NAME = "ClaimChunk"
const val ARCHIVES_BASE_NAME = "claimchunk"
const val MAIN_CLASS = "com.cjburkey.claimchunk.ClaimChunk"
Expand Down
4 changes: 4 additions & 0 deletions changelogs/0.0.25-FIX1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# ClaimChunk 0.0.25-FIX1

Fixes:
* Crash on first launch! Kinda a problem :)
8 changes: 8 additions & 0 deletions changelogs/0.0.25-FIX2.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# ClaimChunk 0.0.25-FIX1

Fixes:
* Re-add the `claimchunk_am_trusted` placeholder
* The placeholder works the same way, returning that the player is trusted if
said player has *any* permissions granted by the owner for the chunk they're
standing in (the chunk must be owned; the placeholder shows not trusted in
unclaimed chunks to match pre-0.0.24 behavior).
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.cjburkey.claimchunk.placeholder;

import com.cjburkey.claimchunk.api.IClaimChunkPlugin;
import com.cjburkey.claimchunk.chunk.ChunkPos;

import me.clip.placeholderapi.PlaceholderAPI;
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
Expand Down Expand Up @@ -64,6 +65,17 @@ public ClaimChunkPlaceholders(IClaimChunkPlugin claimChunk) {

/* Online player with chunk owner UUID placeholders */

// Whether this player has ANY permissions in the chunk they're inside
playerOwnerPlaceholders.put(
"am_trusted",
(ply, ignoredOwner) -> {
ChunkPos pos = new ChunkPos(ply.getLocation().getChunk());
Map<String, Boolean> permissions =
claimChunk.getPlayerHandler().getPermissions(pos, ply.getUniqueId());
return permissions == null
|| permissions.values().stream().anyMatch(Boolean::booleanValue);
});

// Get the username of the owner for this chunk
playerOwnerPlaceholders.put(
"current_owner",
Expand Down

0 comments on commit 06452bc

Please sign in to comment.