Compare commits

..

12 Commits
ye ... 7.4.2

Author SHA1 Message Date
e9baa802ec Release 7.4.2
Signed-off-by: Alexander Brandes <mc.cache@web.de>
2025-02-12 21:09:27 +01:00
63e2d325cf Update dependency com.github.spotbugs:spotbugs-annotations to v4.9.1 (#4591)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-02-08 21:50:50 +00:00
94abd69e22 Update dependency org.checkerframework:checker-qual to v3.49.0 (#4587)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-02-03 22:23:37 +00:00
661e4ae8d3 Update dependency com.gradleup.shadow to v8.3.6 (#4585)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-02-02 21:38:30 +00:00
974c639a51 fix: grow music inventory dynamically (#4583) 2025-01-26 12:51:54 +01:00
11b806bd4d Update dependency gradle to v8.12.1 (#4581)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-24 14:14:20 +00:00
0275372051 Update dependency com.github.spotbugs:spotbugs-annotations to v4.9.0 (#4572)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-16 13:14:02 +00:00
c18cf3acfe Update dependency com.diffplug.spotless to v7.0.2 (#4571)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-14 21:41:40 +00:00
fa52149394 Update dependency com.diffplug.spotless to v7.0.1 (#4566)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-07 20:31:41 +00:00
f5108ec253 Update dependency com.diffplug.spotless to v7 (#4565)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-07 09:10:19 +00:00
a7058eeff2 Update eps1lon/actions-label-merge-conflict action to v3.0.3 (#4564)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-07 08:01:24 +00:00
eabae8db44 Update dependency org.checkerframework:checker-qual to v3.48.4 (#4563)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-07 08:01:08 +00:00
6 changed files with 17 additions and 10 deletions

View File

@ -27,7 +27,7 @@ body:
description: Which server version are you using? If your server version is not listed, it is not supported. Update to a supported version first.
multiple: false
options:
- '1.21.4'
- '1.21.3'
- '1.21.1'
- '1.20.6'
- '1.20.4'

View File

@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Label conflicting PRs
uses: eps1lon/actions-label-merge-conflict@v3.0.2
uses: eps1lon/actions-label-merge-conflict@v3.0.3
with:
dirtyLabel: "unresolved-merge-conflict"
repoToken: "${{ secrets.GITHUB_TOKEN }}"

View File

@ -60,6 +60,9 @@ public class Music extends SubCommand {
"music_disc_creator_music_box", "music_disc_precipice"
);
// make sure all discs and the bedrock ("cancel") fit into the inventory
private static final int INVENTORY_ROWS = (int) Math.ceil((DISCS.size() + 1) / 9.0);
private final InventoryUtil inventoryUtil;
private final EventDispatcher eventDispatcher;
@ -94,7 +97,7 @@ public class Music extends SubCommand {
PlotInventory inv = new PlotInventory(
this.inventoryUtil,
player,
2,
INVENTORY_ROWS,
TranslatableCaption.of("plotjukebox.jukebox_header").getComponent(player)
) {
@Override

View File

@ -22,7 +22,7 @@ plugins {
}
group = "com.intellectualsites.plotsquared"
version = "7.4.2-SNAPSHOT"
version = "7.4.2"
if (!File("$rootDir/.git").exists()) {
logger.lifecycle("""
@ -89,6 +89,10 @@ subprojects {
}
}
tasks.compileJava.configure {
options.release.set(17)
}
configurations.all {
attributes.attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 21)
}
@ -226,7 +230,7 @@ tasks.getByName<Jar>("jar") {
enabled = false
}
val supportedVersions = listOf("1.18.2", "1.19.4", "1.20.6", "1.21.1", "1.21.4")
val supportedVersions = listOf("1.18.2", "1.19.4", "1.20.6", "1.21.1", "1.21.3")
tasks {
register("cacheLatestFaweArtifact") {
val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL()

View File

@ -2,8 +2,8 @@
# Platform expectations
paper = "1.20.4-R0.1-SNAPSHOT"
guice = "7.0.0"
spotbugs = "4.8.6"
checkerqual = "3.48.3"
spotbugs = "4.9.1"
checkerqual = "3.49.0"
gson = "2.10"
guava = "31.1-jre"
snakeyaml = "2.0"
@ -33,9 +33,9 @@ vault = "1.7.1"
serverlib = "2.3.6"
# Gradle plugins
shadow = "8.3.5"
shadow = "8.3.6"
grgit = "4.1.1"
spotless = "6.25.0"
spotless = "7.0.2"
nexus = "2.0.0"
runPaper = "2.3.1"

View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME