Compare commits

..

7 Commits

Author SHA1 Message Date
bc35324842 fix/ci: update publish plugin 2025-07-22 00:11:39 +02:00
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
53771a3ece fix: test case for adventure update (#4703)
and bump adventure
2025-07-20 21:23:47 +00:00
f020a6c6da feat: Added missing music_discs from 1.21.6 & 1.21.7 (#4694)
Added missing music_discs from 1.21.6 & 1.21.7
2025-07-14 21:50:08 +02:00
d7e158747e Fixes #4693
Signed-off-by: Alexander Brandes <mc.cache@web.de>
2025-07-11 16:08:25 +02:00
4d64ea83ec Update dependency com.diffplug.spotless to v7.1.0 (#4692)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-07-08 03:47:44 +00:00
7ab334562c Back to snapshot for development
Signed-off-by: Alexander Brandes <mc.cache@web.de>
2025-07-06 17:53:36 +02:00
5 changed files with 13 additions and 22 deletions

View File

@ -2,7 +2,8 @@
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended",
":semanticCommitsDisabled"
":semanticCommitsDisabled",
"schedule:earlyMondays"
],
"automerge": true,
"labels": [

View File

@ -57,7 +57,7 @@ public class Music extends SubCommand {
"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_pigstep", "music_disc_5", "music_disc_relic", "music_disc_creator",
"music_disc_creator_music_box", "music_disc_precipice"
"music_disc_creator_music_box", "music_disc_precipice", "music_disc_tears", "music_disc_lava_chicken"
);
// make sure all discs and the bedrock ("cancel") fit into the inventory

View File

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

View File

@ -1,9 +1,7 @@
import com.diffplug.gradle.spotless.SpotlessPlugin
import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
import com.vanniktech.maven.publish.SonatypeHost
import groovy.json.JsonSlurper
import xyz.jpenilla.runpaper.task.RunServer
import java.net.URI
plugins {
java
@ -22,7 +20,7 @@ plugins {
}
group = "com.intellectualsites.plotsquared"
version = "7.5.4"
version = "7.5.5-SNAPSHOT"
if (!File("$rootDir/.git").exists()) {
logger.lifecycle("""
@ -172,7 +170,7 @@ subprojects {
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"
guava = "31.1-jre"
snakeyaml = "2.0"
adventure = "4.21.0"
adventure = "4.23.0"
adventure-bukkit = "4.4.0"
log4j = "2.19.0"
@ -35,8 +35,8 @@ serverlib = "2.3.7"
# Gradle plugins
shadow = "8.3.8"
grgit = "4.1.1"
spotless = "7.0.4"
publish = "0.33.0"
spotless = "7.2.0"
publish = "0.34.0"
runPaper = "2.3.1"
[libraries]