Release 2.4.3 (#248)

.github/workflows/publish_to_nexus.yml

@@ -22,14 +22,11 @@ jobs:
         with:
           distribution: adopt
           java-version: 17
-      - name: Check licence
-        run: ./gradlew licenseCheck
-      - name: Build with Gradle
-        run: ./gradlew --build-cache build
       - name: Test with Gradle
-        run: ./gradlew test
+        run: ./gradlew test build
       - name: Publish to eldonexus
         run: ./gradlew publishMavenPublicationToEldoNexusRepository
         env:
+          PUBLIC: TRUE
           NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
           NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}

.github/workflows/verify.yml

@@ -16,9 +16,7 @@ jobs:
         with:
           distribution: adopt
           java-version: 17
-      - name: Check licence
-        run: ./gradlew licenseCheck
-      - name: Build with Gradle
-        run: ./gradlew --build-cache build
       - name: Test with Gradle
         run: ./gradlew test
+      - name: Build with Gradle
+        run: ./gradlew --build-cache build

HEADER.txt

@@ -1,3 +1,6 @@
-    SPDX-License-Identifier: AGPL-3.0-only
+/*
+ *     SPDX-License-Identifier: AGPL-3.0-only
+ *
+ *     Copyright (C) EldoriaRPG Team and Contributor
+ */
 
-    Copyright (C) 2021 EldoriaRPG Team and Contributor

build.gradle.kts

@@ -1,18 +1,18 @@
+import com.diffplug.gradle.spotless.SpotlessPlugin
 import de.chojo.PublishData
-import org.cadixdev.gradle.licenser.Licenser
 
 plugins {
     java
-    id("org.cadixdev.licenser") version "0.6.1"
-    id("de.chojo.publishdata") version "1.0.9"
+    id("com.diffplug.spotless") version "6.16.0"
+    id("de.chojo.publishdata") version "1.2.0"
 }
 
 group = "de.eldoria"
-version = "2.4.2"
+version = "2.4.3"
 
 subprojects {
     apply {
-        plugin<Licenser>()
+        plugin<SpotlessPlugin>()
         plugin<JavaPlugin>()
         plugin<PublishData>()
     }
@@ -25,9 +25,11 @@ allprojects {
         maven("https://eldonexus.de/repository/maven-proxies/")
     }
 
-    license {
-        header(rootProject.file("HEADER.txt"))
-        include("**/*.java")
+    spotless{
+        java{
+            licenseHeaderFile(rootProject.file("HEADER.txt"))
+            target("**/*.java")
+        }
     }
 
     java {
@@ -38,7 +40,7 @@ allprojects {
 
     dependencies{
         compileOnly("org.spigotmc", "spigot-api", "1.16.5-R0.1-SNAPSHOT")
-        compileOnly("org.jetbrains", "annotations", "24.0.0")
+        compileOnly("org.jetbrains", "annotations", "24.0.1")
         // Due to incompatibility by the yaml versions defined by world edit, fawe and bukkit we need to exclude it everywhere and add our own version...
         compileOnly("org.yaml", "snakeyaml", "1.33")
         compileOnly("com.sk89q.worldedit", "worldedit-bukkit", "7.2.13") {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -144,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

schematicbrushreborn-api/build.gradle.kts

@@ -54,7 +54,7 @@ publishing {
 
 tasks {
     test {
-        dependsOn(licenseCheck)
+        dependsOn(spotlessCheck)
         useJUnitPlatform()
         testLogging {
             events("passed", "skipped", "failed")

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/SchematicBrushReborn.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush;

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/BrushPaste.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush;

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/PasteMutation.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush;

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/SchematicBrush.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush;
@@ -20,6 +20,7 @@
 import de.eldoria.schematicbrush.rendering.BlockChangeCollector;
 import de.eldoria.schematicbrush.schematics.SchematicRegistry;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Optional;
 
@@ -70,6 +71,7 @@ public interface SchematicBrush extends Brush {
      *
      * @return next paste
      */
+    @Nullable
     BrushPaste nextPaste();
 
     /**

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/config/BrushSettings.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush.config;

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/config/BrushSettingsRegistry.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush.config;

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/config/PlacementModifierRegistration.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush.config;

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/config/Registration.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush.config;

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/config/SchematicModifierRegistration.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush.config;

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/config/SchematicSet.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush.config;

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/config/builder/BrushBuilder.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush.config.builder;

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/config/builder/BrushBuilderSnapshot.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush.config.builder;

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/config/builder/BuildUtil.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush.config.builder;

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/config/builder/SchematicSetBuilder.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush.config.builder;

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/config/flip/Flip.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush.config.flip;

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/config/modifier/BaseModifier.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush.config.modifier;

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/config/modifier/PlacementModifier.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush.config.modifier;

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/config/modifier/SchematicModifier.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush.config.modifier;

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/config/provider/ModifierProvider.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush.config.provider;

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/config/provider/Mutator.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush.config.provider;

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/config/provider/SchematicSelectionProvider.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush.config.provider;

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/config/provider/SelectorProvider.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush.config.provider;

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/config/provider/SettingProvider.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush.config.provider;

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/config/rotation/Rotation.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush.config.rotation;

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/config/schematics/SchematicSelection.java

@@ -1,13 +1,14 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush.config.schematics;
 
 import de.eldoria.eldoutilities.container.Pair;
 import de.eldoria.schematicbrush.brush.SchematicBrush;
+import de.eldoria.schematicbrush.brush.config.BrushSettings;
 import de.eldoria.schematicbrush.brush.config.SchematicSet;
 import de.eldoria.schematicbrush.brush.config.util.Randomable;
 import de.eldoria.schematicbrush.schematics.Schematic;
@@ -17,4 +18,9 @@
 
 public interface SchematicSelection extends Randomable, ConfigurationSerializable {
     Optional<Pair<SchematicSet, Schematic>> nextSchematic(SchematicBrush brush, boolean force);
+
+    default Optional<Pair<SchematicSet, Schematic>> getDefaultSchem(SchematicBrush brush) {
+        BrushSettings settings = brush.settings();
+        return Optional.of(Pair.of(settings.schematicSets().get(0), settings.schematicSets().get(0).schematics().get(0)));
+    }
 }

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/config/selector/Selector.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush.config.selector;

schematicbrushreborn-api/src/main/java/de/eldoria/schematicbrush/brush/config/util/ComponentProvider.java

@@ -1,7 +1,7 @@
 /*
  *     SPDX-License-Identifier: AGPL-3.0-only
  *
- *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ *     Copyright (C) EldoriaRPG Team and Contributor
  */
 
 package de.eldoria.schematicbrush.brush.config.util;