Release 7.4.2

Signed-off-by: Alexander Brandes <mc.cache@web.de>

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -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'

.github/workflows/label-merge-conflicts.yaml

@@ -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 }}"

Core/src/main/java/com/plotsquared/core/command/Music.java

@@ -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

build.gradle.kts

@@ -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()

gradle/libs.versions.toml

@@ -2,8 +2,8 @@
 # Platform expectations
 paper = "1.20.4-R0.1-SNAPSHOT"
 guice = "7.0.0"
-spotbugs = "4.8.6"
+spotbugs = "4.9.1"
-checkerqual = "3.48.3"
+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"
 

gradle/wrapper/gradle-wrapper.properties

@@ -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