Make paper build compatible

eldoriarpg · Jul 27, 2024 · 3ee219d · 3ee219d
1 parent 5fb7144
commit 3ee219d
Show file tree

Hide file tree

Showing 14 changed files with 60 additions and 23 deletions.
diff --git a/.envrc b/.envrc
@@ -0,0 +1 @@
+use nix
diff --git a/.gitignore b/.gitignore
@@ -33,3 +33,4 @@ dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
 .mvn/wrapper/maven-wrapper.jar
+.direnv
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,7 +2,7 @@ import net.minecrell.pluginyml.bukkit.BukkitPluginDescription.Permission.Default
 
 plugins {
     id("org.cadixdev.licenser") version "0.6.1"
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    id("io.github.goooler.shadow") version "8.1.8"
     id("de.chojo.publishdata") version "1.4.0"
     id("net.minecrell.plugin-yml.bukkit") version "0.6.0"
     java
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly("de.eldoria", "schematicbrushreborn-api", "2.6.0")
+    compileOnly("de.eldoria", "schematicbrushreborn-api", "2.7.1-DEV")
     compileOnly("org.spigotmc", "spigot-api", "1.16.5-R0.1-SNAPSHOT")
     compileOnly("com.sk89q.worldedit", "worldedit-bukkit", "7.3.0")
     // PlotSquared Core API
@@ -53,9 +53,11 @@ license {
 }
 
 java {
+    toolchain{
+        languageVersion = JavaLanguageVersion.of(21)
+    }
     withSourcesJar()
     withJavadocJar()
-    sourceCompatibility = JavaVersion.VERSION_17
 }
 
 publishData {
@@ -101,7 +103,6 @@ tasks {
     }
 
     shadowJar {
-        relocate("de.eldoria.eldoutilities", "de.eldoria.schematicbrush.libs.eldoutilities")
         relocate("de.eldoria.messageblocker", "de.eldoria.schematicbrush.libs.messageblocker")
         mergeServiceFiles()
         archiveClassifier.set("all")

diff --git a/shell.nix b/shell.nix
@@ -0,0 +1,11 @@
+{ pkgs ? import <nixpkgs> {}, ... }:
+
+let
+jdk = pkgs.jdk21;
+gradle= pkgs.gradle.override { java = jdk; };
+in
+pkgs.mkShell
+{
+  packages = with pkgs; [jdk gradle];
+}
+
diff --git a/src/main/java/de/eldoria/gridselector/GridSelector.java b/src/main/java/de/eldoria/gridselector/GridSelector.java
@@ -10,6 +10,7 @@
 import com.plotsquared.core.PlotSquared;
 import de.eldoria.eldoutilities.config.template.PluginBaseConfiguration;
 import de.eldoria.eldoutilities.localization.ILocalizer;
+import de.eldoria.eldoutilities.localization.Localizer;
 import de.eldoria.eldoutilities.messages.MessageSender;
 import de.eldoria.eldoutilities.plugin.EldoPlugin;
 import de.eldoria.eldoutilities.updater.lynaupdater.LynaUpdateChecker;
@@ -36,7 +37,11 @@
 import de.eldoria.messageblocker.MessageBlockerAPI;
 import de.eldoria.schematicbrush.SchematicBrushReborn;
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
+import org.bukkit.plugin.PluginDescriptionFile;
+import org.bukkit.plugin.java.JavaPluginLoader;
+import org.jetbrains.annotations.NotNull;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
@@ -45,6 +50,15 @@ public class GridSelector extends EldoPlugin {
 
     private JacksonConfiguration configuration;
 
+    public GridSelector() {
+        this.configuration = new JacksonConfiguration(this);
+    }
+
+    public GridSelector(@NotNull JavaPluginLoader loader, @NotNull PluginDescriptionFile description, @NotNull File dataFolder, @NotNull File file) {
+        super(loader, description, dataFolder, file);
+        this.configuration = new JacksonConfiguration(this);
+    }
+
     @Override
     public void onPluginEnable() throws Throwable {
 
@@ -63,13 +77,19 @@ public void onPluginEnable() throws Throwable {
 
         var sbr = SchematicBrushReborn.instance();
 
-        var messageSender = MessageSender.create(this, "§3[GS]");
+        var iLocalizer = Localizer.builder(this, "en_US")
+                .setIncludedLocales("en_US")
+                .build();
+        ILocalizer.getPluginLocalizer(SchematicBrushReborn.class).registerChild(iLocalizer);
+        var messageSender = MessageSender.builder(this)
+                .prefix("<gold>[GS]")
+                .localizer(iLocalizer)
+                .register();
+
         var messageBlocker = MessageBlockerAPI.builder(this).addWhitelisted("[GS]").build();
 
         var gridSchematics = new GridSchematics(this);
 
-        var iLocalizer = ILocalizer.create(this, "en_US");
-        iLocalizer.setLocale("en_US");
         sbr.brushSettingsRegistry().registerSelector(new GridProvider(sbr.schematics()));
         sbr.schematics().register(GridSchematics.KEY, gridSchematics);
 
@@ -106,6 +126,11 @@ public Configuration configuration() {
         return configuration;
     }
 
+    @Override
+    public Level getLogLevel() {
+        return configuration.secondary(PluginBaseConfiguration.KEY).logLevel();
+    }
+
     @Override
     public List<Class<? extends ConfigurationSerializable>> getConfigSerialization() {
         return List.of(GridCluster.class, Plot.class, ClusterWorld.class, ClusterWorlds.class, Highlight.class, General.class,

diff --git a/src/main/java/de/eldoria/gridselector/command/grid/Cluster.java b/src/main/java/de/eldoria/gridselector/command/grid/Cluster.java
@@ -17,7 +17,6 @@
 import de.eldoria.gridselector.command.grid.cluster.Repair;
 import de.eldoria.gridselector.command.grid.cluster.Sessions;
 import de.eldoria.gridselector.config.Configuration;
-import de.eldoria.gridselector.config.LegacyConfiguration;
 import de.eldoria.gridselector.util.Permissions;
 import de.eldoria.messageblocker.blocker.MessageBlocker;
 import org.bukkit.plugin.Plugin;

diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/Draw.java b/src/main/java/de/eldoria/gridselector/command/grid/cluster/Draw.java
@@ -18,7 +18,6 @@
 import de.eldoria.eldoutilities.commands.executor.IPlayerTabExecutor;
 import de.eldoria.gridselector.adapter.worldguard.IWorldGuardAdapter;
 import de.eldoria.gridselector.config.Configuration;
-import de.eldoria.gridselector.config.LegacyConfiguration;
 import de.eldoria.gridselector.config.elements.cluster.GridCluster;
 import de.eldoria.gridselector.util.Permissions;
 import org.bukkit.entity.Player;

diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/BorderMaterial.java b/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/BorderMaterial.java
@@ -6,12 +6,12 @@
 
 package de.eldoria.gridselector.command.grid.cluster.modify;
 
+import de.eldoria.eldoutilities.commands.Completion;
 import de.eldoria.eldoutilities.commands.command.AdvancedCommand;
 import de.eldoria.eldoutilities.commands.command.CommandMeta;
 import de.eldoria.eldoutilities.commands.command.util.Arguments;
 import de.eldoria.eldoutilities.commands.exceptions.CommandException;
 import de.eldoria.eldoutilities.commands.executor.IPlayerTabExecutor;
-import de.eldoria.eldoutilities.simplecommands.TabCompleteUtil;
 import de.eldoria.gridselector.command.grid.cluster.Sessions;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
@@ -38,6 +38,6 @@ public void onCommand(@NotNull Player player, @NotNull String alias, @NotNull Ar
 
     @Override
     public @Nullable List<String> onTabComplete(@NotNull Player player, @NotNull String alias, @NotNull Arguments args) throws CommandException {
-        return TabCompleteUtil.completeMaterial(args.asString(0), true);
+        return Completion.completeMaterial(args.asString(0), true);
     }
 }
diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Columns.java b/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Columns.java
@@ -6,13 +6,13 @@
 
 package de.eldoria.gridselector.command.grid.cluster.modify;
 
+import de.eldoria.eldoutilities.commands.Completion;
 import de.eldoria.eldoutilities.commands.command.AdvancedCommand;
 import de.eldoria.eldoutilities.commands.command.CommandMeta;
 import de.eldoria.eldoutilities.commands.command.util.Arguments;
 import de.eldoria.eldoutilities.commands.command.util.CommandAssertions;
 import de.eldoria.eldoutilities.commands.exceptions.CommandException;
 import de.eldoria.eldoutilities.commands.executor.IPlayerTabExecutor;
-import de.eldoria.eldoutilities.simplecommands.TabCompleteUtil;
 import de.eldoria.gridselector.command.grid.cluster.Sessions;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
@@ -40,6 +40,6 @@ public void onCommand(@NotNull Player player, @NotNull String alias, @NotNull Ar
 
     @Override
     public @Nullable List<String> onTabComplete(@NotNull Player player, @NotNull String alias, @NotNull Arguments args) throws CommandException {
-        return TabCompleteUtil.completeMinInt(args.asString(0), 1);
+        return Completion.completeMinInt(args.asString(0), 1);
     }
 }
diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/FloorMaterial.java b/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/FloorMaterial.java
@@ -6,12 +6,12 @@
 
 package de.eldoria.gridselector.command.grid.cluster.modify;
 
+import de.eldoria.eldoutilities.commands.Completion;
 import de.eldoria.eldoutilities.commands.command.AdvancedCommand;
 import de.eldoria.eldoutilities.commands.command.CommandMeta;
 import de.eldoria.eldoutilities.commands.command.util.Arguments;
 import de.eldoria.eldoutilities.commands.exceptions.CommandException;
 import de.eldoria.eldoutilities.commands.executor.IPlayerTabExecutor;
-import de.eldoria.eldoutilities.simplecommands.TabCompleteUtil;
 import de.eldoria.gridselector.command.grid.cluster.Sessions;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
@@ -38,6 +38,6 @@ public void onCommand(@NotNull Player player, @NotNull String alias, @NotNull Ar
 
     @Override
     public @Nullable List<String> onTabComplete(@NotNull Player player, @NotNull String alias, @NotNull Arguments args) throws CommandException {
-        return TabCompleteUtil.completeMaterial(args.asString(0), true);
+        return Completion.completeMaterial(args.asString(0), true);
     }
 }
diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Offset.java b/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Offset.java
@@ -6,13 +6,13 @@
 
 package de.eldoria.gridselector.command.grid.cluster.modify;
 
+import de.eldoria.eldoutilities.commands.Completion;
 import de.eldoria.eldoutilities.commands.command.AdvancedCommand;
 import de.eldoria.eldoutilities.commands.command.CommandMeta;
 import de.eldoria.eldoutilities.commands.command.util.Arguments;
 import de.eldoria.eldoutilities.commands.command.util.CommandAssertions;
 import de.eldoria.eldoutilities.commands.exceptions.CommandException;
 import de.eldoria.eldoutilities.commands.executor.IPlayerTabExecutor;
-import de.eldoria.eldoutilities.simplecommands.TabCompleteUtil;
 import de.eldoria.gridselector.command.grid.cluster.Sessions;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
@@ -40,6 +40,6 @@ public void onCommand(@NotNull Player player, @NotNull String alias, @NotNull Ar
 
     @Override
     public @Nullable List<String> onTabComplete(@NotNull Player player, @NotNull String alias, @NotNull Arguments args) throws CommandException {
-        return TabCompleteUtil.completeMinInt(args.asString(0), 0);
+        return Completion.completeMinInt(args.asString(0), 0);
     }
 }
diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/OffsetMaterial.java b/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/OffsetMaterial.java
@@ -6,12 +6,12 @@
 
 package de.eldoria.gridselector.command.grid.cluster.modify;
 
+import de.eldoria.eldoutilities.commands.Completion;
 import de.eldoria.eldoutilities.commands.command.AdvancedCommand;
 import de.eldoria.eldoutilities.commands.command.CommandMeta;
 import de.eldoria.eldoutilities.commands.command.util.Arguments;
 import de.eldoria.eldoutilities.commands.exceptions.CommandException;
 import de.eldoria.eldoutilities.commands.executor.IPlayerTabExecutor;
-import de.eldoria.eldoutilities.simplecommands.TabCompleteUtil;
 import de.eldoria.gridselector.command.grid.cluster.Sessions;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
@@ -38,6 +38,6 @@ public void onCommand(@NotNull Player player, @NotNull String alias, @NotNull Ar
 
     @Override
     public @Nullable List<String> onTabComplete(@NotNull Player player, @NotNull String alias, @NotNull Arguments args) throws CommandException {
-        return TabCompleteUtil.completeMaterial(args.asString(0), true);
+        return Completion.completeMaterial(args.asString(0), true);
     }
 }
diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Rows.java b/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Rows.java
@@ -6,13 +6,13 @@
 
 package de.eldoria.gridselector.command.grid.cluster.modify;
 
+import de.eldoria.eldoutilities.commands.Completion;
 import de.eldoria.eldoutilities.commands.command.AdvancedCommand;
 import de.eldoria.eldoutilities.commands.command.CommandMeta;
 import de.eldoria.eldoutilities.commands.command.util.Arguments;
 import de.eldoria.eldoutilities.commands.command.util.CommandAssertions;
 import de.eldoria.eldoutilities.commands.exceptions.CommandException;
 import de.eldoria.eldoutilities.commands.executor.IPlayerTabExecutor;
-import de.eldoria.eldoutilities.simplecommands.TabCompleteUtil;
 import de.eldoria.gridselector.command.grid.cluster.Sessions;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
@@ -40,6 +40,6 @@ public void onCommand(@NotNull Player player, @NotNull String alias, @NotNull Ar
 
     @Override
     public @Nullable List<String> onTabComplete(@NotNull Player player, @NotNull String alias, @NotNull Arguments args) throws CommandException {
-        return TabCompleteUtil.completeMinInt(args.asString(0), 1);
+        return Completion.completeMinInt(args.asString(0), 1);
     }
 }
diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Size.java b/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Size.java
@@ -6,13 +6,13 @@
 
 package de.eldoria.gridselector.command.grid.cluster.modify;
 
+import de.eldoria.eldoutilities.commands.Completion;
 import de.eldoria.eldoutilities.commands.command.AdvancedCommand;
 import de.eldoria.eldoutilities.commands.command.CommandMeta;
 import de.eldoria.eldoutilities.commands.command.util.Arguments;
 import de.eldoria.eldoutilities.commands.command.util.CommandAssertions;
 import de.eldoria.eldoutilities.commands.exceptions.CommandException;
 import de.eldoria.eldoutilities.commands.executor.IPlayerTabExecutor;
-import de.eldoria.eldoutilities.simplecommands.TabCompleteUtil;
 import de.eldoria.gridselector.command.grid.cluster.Sessions;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
@@ -40,6 +40,6 @@ public void onCommand(@NotNull Player player, @NotNull String alias, @NotNull Ar
 
     @Override
     public @Nullable List<String> onTabComplete(@NotNull Player player, @NotNull String alias, @NotNull Arguments args) throws CommandException {
-        return TabCompleteUtil.completeMinInt(args.asString(0), 0);
+        return Completion.completeMinInt(args.asString(0), 0);
     }
 }