Compare commits

..

6 Commits

Author SHA1 Message Date
Pierre Maurice Schwang
1054018e1e fix: formatting of plot-title in placeholder (#4702) 2025-07-24 20:50:23 +02:00
Pierre Maurice Schwang
0508a7f6b6 fix/ci: update publish plugin (#4707) 2025-07-24 20:48:01 +02:00
Lion_King287
da0a57a48c fix: /plot grant add doesn't send success message reliably (#4683)
* fix: move success message to correct execution point in /plot grant add

* fix: send `grants.added` message even if player is offline

---------

Co-authored-by: Alexander Brandes <mc.cache@web.de>
2025-07-24 18:25:40 +00:00
Lion_King287
87859b002b fix: misleading grants.added message to indicate single plot grant (#4682)
* chore: correct 'grants.added' message to reflect single plot grant behavior

* chore: add total grants to `grants.added` message
2025-07-24 18:24:50 +00:00
renovate[bot]
4f4ba07bd2 Update dependency com.diffplug.spotless to v7.2.0 (#4705)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-07-21 02:51:48 +00:00
Pierre Maurice Schwang
53771a3ece fix: test case for adventure update (#4703)
and bump adventure
2025-07-20 21:23:47 +00:00
5 changed files with 14 additions and 20 deletions

View File

@@ -101,6 +101,10 @@ public class Grant extends Command {
); );
} else { } else {
access.set(access.get().orElse(0) + 1); access.set(access.get().orElse(0) + 1);
player.sendMessage(
TranslatableCaption.of("grants.added"),
TagResolver.resolver("grants", Tag.inserting(Component.text(access.get().orElse(0))))
);
} }
} }
} else { } else {

View File

@@ -456,7 +456,7 @@
"category.command_category_debug": "<gray>Debug</gray>", "category.command_category_debug": "<gray>Debug</gray>",
"category.command_category_administration": "<gray>Admin</gray>", "category.command_category_administration": "<gray>Admin</gray>",
"grants.granted_plots": "<prefix><gold>Result: <gray><amount> </gray>grants left.</gold>", "grants.granted_plots": "<prefix><gold>Result: <gray><amount> </gray>grants left.</gold>",
"grants.added": "<prefix><gold><grants></gold> <gray>grant(s) have been added.</gray>", "grants.added": "<prefix><gold>1</gold> <gray>grant has been added. (<grants> total grants)</gray>",
"events.event_denied": "<prefix><gold><value> </gold><gray>Cancelled by external plugin.</gray>", "events.event_denied": "<prefix><gold><value> </gold><gray>Cancelled by external plugin.</gray>",
"backups.backup_impossible": "<prefix><red>Backups are not enabled for this plot: <plot>.</red>", "backups.backup_impossible": "<prefix><red>Backups are not enabled for this plot: <plot>.</red>",
"backups.backup_save_success": "<prefix><gold>The backup was created successfully.</gold>", "backups.backup_save_success": "<prefix><gold>The backup was created successfully.</gold>",

View File

@@ -37,12 +37,7 @@ class ClickStripTransformTest {
void removeClickEvent() { void removeClickEvent() {
var commonAction = ClickEvent.Action.OPEN_FILE; var commonAction = ClickEvent.Action.OPEN_FILE;
var transform = new ClickStripTransform(EnumSet.of(commonAction)); var transform = new ClickStripTransform(EnumSet.of(commonAction));
var component = Component.text("Hello") var component = Component.text("Hello").clickEvent(ClickEvent.openFile("World"));
.clickEvent(ClickEvent.clickEvent(
commonAction,
"World"
)
);
var transformedComponent = transform.transform(component); var transformedComponent = transform.transform(component);
Assertions.assertNull(transformedComponent.clickEvent()); Assertions.assertNull(transformedComponent.clickEvent());
} }
@@ -52,10 +47,7 @@ class ClickStripTransformTest {
void ignoreClickEvent() { void ignoreClickEvent() {
var actionToRemove = ClickEvent.Action.SUGGEST_COMMAND; var actionToRemove = ClickEvent.Action.SUGGEST_COMMAND;
var transform = new ClickStripTransform(EnumSet.of(actionToRemove)); var transform = new ClickStripTransform(EnumSet.of(actionToRemove));
var originalClickEvent = ClickEvent.clickEvent( var originalClickEvent = ClickEvent.changePage(1337);
ClickEvent.Action.CHANGE_PAGE,
"World"
);
var component = Component.text("Hello") var component = Component.text("Hello")
.clickEvent(originalClickEvent); .clickEvent(originalClickEvent);
var transformedComponent = transform.transform(component); var transformedComponent = transform.transform(component);
@@ -76,12 +68,12 @@ class ClickStripTransformTest {
.insertion("DEF"); .insertion("DEF");
var component = Component.text("Hello ") var component = Component.text("Hello ")
.append( .append(
inner.clickEvent(ClickEvent.clickEvent(ClickEvent.Action.OPEN_URL, "https://example.org")) inner.clickEvent(ClickEvent.openUrl("https://example.org"))
); );
var transformedComponent = transform.transform(component); var transformedComponent = transform.transform(component);
Assertions.assertFalse(transformedComponent.children().isEmpty()); // child still exists Assertions.assertFalse(transformedComponent.children().isEmpty()); // child still exists
Assertions.assertEquals(inner, transformedComponent.children().get(0)); // only the click event has changed Assertions.assertEquals(inner, transformedComponent.children().getFirst()); // only the click event has changed
Assertions.assertNull(transformedComponent.children().get(0).clickEvent()); Assertions.assertNull(transformedComponent.children().getFirst().clickEvent());
} }
} }

View File

@@ -1,9 +1,7 @@
import com.diffplug.gradle.spotless.SpotlessPlugin import com.diffplug.gradle.spotless.SpotlessPlugin
import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
import com.vanniktech.maven.publish.SonatypeHost
import groovy.json.JsonSlurper import groovy.json.JsonSlurper
import xyz.jpenilla.runpaper.task.RunServer import xyz.jpenilla.runpaper.task.RunServer
import java.net.URI
plugins { plugins {
java java
@@ -172,7 +170,7 @@ subprojects {
url.set("https://github.com/IntellectualSites/PlotSquared/issues") url.set("https://github.com/IntellectualSites/PlotSquared/issues")
} }
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL) publishToMavenCentral()
} }
} }

View File

@@ -7,7 +7,7 @@ checkerqual = "3.49.5"
gson = "2.10" gson = "2.10"
guava = "31.1-jre" guava = "31.1-jre"
snakeyaml = "2.0" snakeyaml = "2.0"
adventure = "4.21.0" adventure = "4.23.0"
adventure-bukkit = "4.4.0" adventure-bukkit = "4.4.0"
log4j = "2.19.0" log4j = "2.19.0"
@@ -35,8 +35,8 @@ serverlib = "2.3.7"
# Gradle plugins # Gradle plugins
shadow = "8.3.8" shadow = "8.3.8"
grgit = "4.1.1" grgit = "4.1.1"
spotless = "7.1.0" spotless = "7.2.0"
publish = "0.33.0" publish = "0.34.0"
runPaper = "2.3.1" runPaper = "2.3.1"
[libraries] [libraries]