mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-25 08:35:26 +02:00
Compare commits
1 Commits
main
...
renovate/w
Author | SHA1 | Date | |
---|---|---|---|
![]() |
091ef20e82 |
@@ -101,10 +101,6 @@ 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 {
|
||||||
|
@@ -57,7 +57,7 @@ public class Music extends SubCommand {
|
|||||||
"music_disc_far", "music_disc_mall", "music_disc_mellohi", "music_disc_stal",
|
"music_disc_far", "music_disc_mall", "music_disc_mellohi", "music_disc_stal",
|
||||||
"music_disc_strad", "music_disc_ward", "music_disc_11", "music_disc_wait", "music_disc_otherside",
|
"music_disc_strad", "music_disc_ward", "music_disc_11", "music_disc_wait", "music_disc_otherside",
|
||||||
"music_disc_pigstep", "music_disc_5", "music_disc_relic", "music_disc_creator",
|
"music_disc_pigstep", "music_disc_5", "music_disc_relic", "music_disc_creator",
|
||||||
"music_disc_creator_music_box", "music_disc_precipice", "music_disc_tears", "music_disc_lava_chicken"
|
"music_disc_creator_music_box", "music_disc_precipice"
|
||||||
);
|
);
|
||||||
|
|
||||||
// make sure all discs and the bedrock ("cancel") fit into the inventory
|
// make sure all discs and the bedrock ("cancel") fit into the inventory
|
||||||
|
@@ -63,18 +63,4 @@ public class PlotTitle {
|
|||||||
return subtitle;
|
return subtitle;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Provides a string representation of this plot title value (used in placeholders).
|
|
||||||
*
|
|
||||||
* @return the plot title representation in the format {@code "<title>" "<subtitle>"}
|
|
||||||
* @since TODO
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "\"%s\" \"%s\"".formatted(
|
|
||||||
this.title != null ? this.title : "",
|
|
||||||
this.subtitle != null ? this.subtitle : ""
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -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>1</gold> <gray>grant has been added. (<grants> total grants)</gray>",
|
"grants.added": "<prefix><gold><grants></gold> <gray>grant(s) have been added.</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>",
|
||||||
|
@@ -37,7 +37,12 @@ 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").clickEvent(ClickEvent.openFile("World"));
|
var component = Component.text("Hello")
|
||||||
|
.clickEvent(ClickEvent.clickEvent(
|
||||||
|
commonAction,
|
||||||
|
"World"
|
||||||
|
)
|
||||||
|
);
|
||||||
var transformedComponent = transform.transform(component);
|
var transformedComponent = transform.transform(component);
|
||||||
Assertions.assertNull(transformedComponent.clickEvent());
|
Assertions.assertNull(transformedComponent.clickEvent());
|
||||||
}
|
}
|
||||||
@@ -47,7 +52,10 @@ 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.changePage(1337);
|
var originalClickEvent = ClickEvent.clickEvent(
|
||||||
|
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);
|
||||||
@@ -68,12 +76,12 @@ class ClickStripTransformTest {
|
|||||||
.insertion("DEF");
|
.insertion("DEF");
|
||||||
var component = Component.text("Hello ")
|
var component = Component.text("Hello ")
|
||||||
.append(
|
.append(
|
||||||
inner.clickEvent(ClickEvent.openUrl("https://example.org"))
|
inner.clickEvent(ClickEvent.clickEvent(ClickEvent.Action.OPEN_URL, "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().getFirst()); // only the click event has changed
|
Assertions.assertEquals(inner, transformedComponent.children().get(0)); // only the click event has changed
|
||||||
Assertions.assertNull(transformedComponent.children().getFirst().clickEvent());
|
Assertions.assertNull(transformedComponent.children().get(0).clickEvent());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -1,7 +1,9 @@
|
|||||||
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
|
||||||
@@ -170,7 +172,7 @@ subprojects {
|
|||||||
url.set("https://github.com/IntellectualSites/PlotSquared/issues")
|
url.set("https://github.com/IntellectualSites/PlotSquared/issues")
|
||||||
}
|
}
|
||||||
|
|
||||||
publishToMavenCentral()
|
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -7,12 +7,12 @@ 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.23.0"
|
adventure = "4.21.0"
|
||||||
adventure-bukkit = "4.4.0"
|
adventure-bukkit = "4.4.0"
|
||||||
log4j = "2.19.0"
|
log4j = "2.19.0"
|
||||||
|
|
||||||
# Plugins
|
# Plugins
|
||||||
worldedit = "7.2.20"
|
worldedit = "7.3.15"
|
||||||
fawe = "2.13.0"
|
fawe = "2.13.0"
|
||||||
placeholderapi = "2.11.6"
|
placeholderapi = "2.11.6"
|
||||||
luckperms = "5.5"
|
luckperms = "5.5"
|
||||||
@@ -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.2.0"
|
spotless = "7.1.0"
|
||||||
publish = "0.34.0"
|
publish = "0.33.0"
|
||||||
runPaper = "2.3.1"
|
runPaper = "2.3.1"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
|
Reference in New Issue
Block a user