From c0db95cdeb1676dd9cf6bb5cbe67181025294729 Mon Sep 17 00:00:00 2001 From: Lilly <46890129+RainbowDashLabs@users.noreply.github.com> Date: Sat, 27 Jul 2024 21:41:06 +0200 Subject: [PATCH 1/5] Make paper build compatible --- .envrc | 1 + .gitignore | 1 + build.gradle.kts | 9 +++--- shell.nix | 11 +++++++ .../de/eldoria/gridselector/GridSelector.java | 31 +++++++++++++++++-- .../gridselector/command/grid/Cluster.java | 1 - .../command/grid/cluster/Draw.java | 1 - .../grid/cluster/modify/BorderMaterial.java | 4 +-- .../command/grid/cluster/modify/Columns.java | 4 +-- .../grid/cluster/modify/FloorMaterial.java | 4 +-- .../command/grid/cluster/modify/Offset.java | 4 +-- .../grid/cluster/modify/OffsetMaterial.java | 4 +-- .../command/grid/cluster/modify/Rows.java | 4 +-- .../command/grid/cluster/modify/Size.java | 4 +-- 14 files changed, 60 insertions(+), 23 deletions(-) create mode 100644 .envrc create mode 100644 shell.nix diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..1d953f4 --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use nix diff --git a/.gitignore b/.gitignore index f9b8b4a..c646ee7 100644 --- 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 index 5da40a8..b6d52c9 100644 --- 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 new file mode 100644 index 0000000..e6613cb --- /dev/null +++ b/shell.nix @@ -0,0 +1,11 @@ +{ pkgs ? import {}, ... }: + +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 index 7fce79d..202a8ca 100644 --- 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("[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> 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 index 336d727..985de50 100644 --- 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 index 2a88950..8d8e9ab 100644 --- 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 index eef80fb..d48929f 100644 --- 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 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 index bc98b50..70bd86c 100644 --- 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 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 index 272aea2..2f868e5 100644 --- 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 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 index 10cd901..5fdcf48 100644 --- 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 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 index 6796965..07869ac 100644 --- 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 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 index d982175..e3da7c1 100644 --- 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 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 index b483bce..c49f122 100644 --- 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 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); } } From cb76185586b3cb313bbfe0caa740264bd10528f8 Mon Sep 17 00:00:00 2001 From: Lilly <46890129+RainbowDashLabs@users.noreply.github.com> Date: Thu, 15 Aug 2024 15:44:04 +0200 Subject: [PATCH 2/5] Build legacy and latest build --- build.gradle.kts | 175 +++--------------- core/build.gradle.kts | 73 ++++++++ .../de/eldoria/gridselector/GridSelector.java | 0 .../regionadapter/ClusterWorldAdapter.java | 0 .../regionadapter/PlotWorldAdapter.java | 0 .../adapter/regionadapter/RegionAdapter.java | 0 .../adapter/regionadapter/RegionResult.java | 0 .../adapter/regionadapter/WorldAdapter.java | 0 .../worldguard/IWorldGuardAdapter.java | 0 .../adapter/worldguard/WorldGuardAdapter.java | 0 .../gridselector/brush/MarkerResult.java | 0 .../gridselector/brush/SelectionBrush.java | 0 .../de/eldoria/gridselector/command/Grid.java | 0 .../gridselector/command/grid/Cluster.java | 0 .../gridselector/command/grid/Export.java | 0 .../gridselector/command/grid/Select.java | 0 .../command/grid/cluster/Close.java | 0 .../command/grid/cluster/Create.java | 0 .../command/grid/cluster/Draw.java | 0 .../command/grid/cluster/Modify.java | 0 .../command/grid/cluster/Remove.java | 0 .../command/grid/cluster/Repair.java | 0 .../command/grid/cluster/Sessions.java | 0 .../grid/cluster/modify/BorderMaterial.java | 0 .../command/grid/cluster/modify/Center.java | 0 .../command/grid/cluster/modify/Columns.java | 0 .../grid/cluster/modify/Direction.java | 0 .../grid/cluster/modify/ExpandRight.java | 0 .../grid/cluster/modify/FloorMaterial.java | 0 .../command/grid/cluster/modify/Offset.java | 0 .../grid/cluster/modify/OffsetMaterial.java | 0 .../command/grid/cluster/modify/Rows.java | 0 .../command/grid/cluster/modify/Size.java | 0 .../gridselector/config/ConfigFile.java | 0 .../gridselector/config/Configuration.java | 0 .../config/JacksonConfiguration.java | 0 .../config/LegacyConfiguration.java | 0 .../config/elements/ClusterWorlds.java | 0 .../gridselector/config/elements/General.java | 0 .../config/elements/Highlight.java | 0 .../config/elements/cluster/ClusterWorld.java | 0 .../config/elements/cluster/GridCluster.java | 0 .../config/elements/cluster/Plot.java | 0 .../listener/SelectionListener.java | 0 .../schematics/GridSchematics.java | 0 .../eldoria/gridselector/selector/Grid.java | 0 .../gridselector/selector/GridProvider.java | 0 .../de/eldoria/gridselector/util/Colors.java | 0 .../gridselector/util/Permissions.java | 0 {src => core/src}/main/resources/config.yml | 0 .../src}/main/resources/messages.properties | 0 .../main/resources/messages_en_US.properties | 0 .../elements/cluster/GridClusterTest.java | 0 latest/build.gradle.kts | 58 ++++++ legacy/build.gradle.kts | 56 ++++++ settings.gradle.kts | 20 +- 56 files changed, 232 insertions(+), 150 deletions(-) create mode 100644 core/build.gradle.kts rename {src => core/src}/main/java/de/eldoria/gridselector/GridSelector.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/adapter/regionadapter/ClusterWorldAdapter.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/adapter/regionadapter/PlotWorldAdapter.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/adapter/regionadapter/RegionAdapter.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/adapter/regionadapter/RegionResult.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/adapter/regionadapter/WorldAdapter.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/adapter/worldguard/IWorldGuardAdapter.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/adapter/worldguard/WorldGuardAdapter.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/brush/MarkerResult.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/brush/SelectionBrush.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/command/Grid.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/command/grid/Cluster.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/command/grid/Export.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/command/grid/Select.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/command/grid/cluster/Close.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/command/grid/cluster/Create.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/command/grid/cluster/Draw.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/command/grid/cluster/Modify.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/command/grid/cluster/Remove.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/command/grid/cluster/Repair.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/command/grid/cluster/Sessions.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/command/grid/cluster/modify/BorderMaterial.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Center.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Columns.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Direction.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/command/grid/cluster/modify/ExpandRight.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/command/grid/cluster/modify/FloorMaterial.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Offset.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/command/grid/cluster/modify/OffsetMaterial.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Rows.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Size.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/config/ConfigFile.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/config/Configuration.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/config/JacksonConfiguration.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/config/LegacyConfiguration.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/config/elements/ClusterWorlds.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/config/elements/General.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/config/elements/Highlight.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/config/elements/cluster/ClusterWorld.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/config/elements/cluster/GridCluster.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/config/elements/cluster/Plot.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/listener/SelectionListener.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/schematics/GridSchematics.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/selector/Grid.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/selector/GridProvider.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/util/Colors.java (100%) rename {src => core/src}/main/java/de/eldoria/gridselector/util/Permissions.java (100%) rename {src => core/src}/main/resources/config.yml (100%) rename {src => core/src}/main/resources/messages.properties (100%) rename {src => core/src}/main/resources/messages_en_US.properties (100%) rename {src => core/src}/test/java/de/eldoria/gridselector/config/elements/cluster/GridClusterTest.java (100%) create mode 100644 latest/build.gradle.kts create mode 100644 legacy/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts index b6d52c9..512e4db 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,172 +1,53 @@ -import net.minecrell.pluginyml.bukkit.BukkitPluginDescription.Permission.Default - plugins { id("org.cadixdev.licenser") version "0.6.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 `maven-publish` } -group = "de.eldoria" +group = "de.eldoria.gridselector" version = "1.3.0" -val shadebase = "de.eldoria." + rootProject.name + ".libs." - -repositories { - mavenCentral() - maven("https://eldonexus.de/repository/maven-public/") - maven("https://eldonexus.de/repository/maven-proxies/") -} -dependencies { - 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 - compileOnly("com.plotsquared", "PlotSquared-Core", "6.11.1") { - exclude("com.intellectualsites.paster", "Paster") - exclude("org.apache.logging.log4j", "log4j-api") - exclude("com.intellectualsites.informative-annotations", "informative-annotations") +allprojects { + apply { + plugin() } - compileOnly("com.plotsquared", "PlotSquared-Bukkit", "6.11.1") { isTransitive = false } // PlotSquared Bukkit API - compileOnly("com.sk89q.worldguard", "worldguard-bukkit", "7.0.9") - compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core:2.9.2") { - exclude("com.intellectualsites.paster") - exclude("org.yaml") - } - compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit:2.9.2") { - isTransitive = false - exclude("org.yaml") - } - - testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.11.0") - testImplementation("com.sk89q.worldedit", "worldedit-bukkit", "7.3.0") - testImplementation("org.spigotmc", "spigot-api", "1.16.5-R0.1-SNAPSHOT") - testImplementation("de.eldoria", "eldo-util", "1.14.4") - testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine") -} -license { - header(rootProject.file("HEADER.txt")) - include("**/*.java") -} - -java { - toolchain{ - languageVersion = JavaLanguageVersion.of(21) - } - withSourcesJar() - withJavadocJar() -} - -publishData { - addBuildData() - useEldoNexusRepos() - publishComponent("java") -} - -publishing { - publications.create("maven") { - publishData.configurePublication(this) - } + group = rootProject.group + version = rootProject.version repositories { - maven { - authentication { - credentials(PasswordCredentials::class) { - username = System.getenv("NEXUS_USERNAME") - password = System.getenv("NEXUS_PASSWORD") - } - } - - setUrl(publishData.getRepository()) - name = "EldoNexus" - } - } -} - -tasks { - compileJava { - options.encoding = "UTF-8" - } - - compileTestJava { - options.encoding = "UTF-8" + mavenCentral() + maven("https://eldonexus.de/repository/maven-public/") + maven("https://eldonexus.de/repository/maven-proxies/") } - test { - useJUnitPlatform() - testLogging { - events("passed", "skipped", "failed") + java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) } + withSourcesJar() + withJavadocJar() } - shadowJar { - relocate("de.eldoria.messageblocker", "de.eldoria.schematicbrush.libs.messageblocker") - mergeServiceFiles() - archiveClassifier.set("all") - archiveBaseName.set("GridSelector") - } - - processResources { - from(sourceSets.main.get().resources.srcDirs) { - filesMatching("plugin.yml") { - expand( - "version" to publishData.getVersion(true) - ) - } - duplicatesStrategy = DuplicatesStrategy.INCLUDE + tasks { + compileJava { + options.encoding = "UTF-8" } - } - register("copyToServer") { - val path = project.property("targetDir") ?: ""; - if (path.toString().isEmpty()) { - println("targetDir is not set in gradle properties") - return@register + compileTestJava { + options.encoding = "UTF-8" } - println("Copying jar to $path") - from(shadowJar) - destinationDir = File(path.toString()) - } - - build { - dependsOn(shadowJar) - } -} - -bukkit { - name = "GridSelector" - main = "de.eldoria.gridselector.GridSelector" - apiVersion = "1.16" - version = publishData.getVersion(true) - authors = listOf("RainbowDashLabs") - depend = listOf("SchematicBrushReborn") - softDepend = listOf("PlotSquared", "WorldGuard") - commands { - register("schematicbrushgrid") { - aliases = listOf("sbrg") - permission = "gridselector.use" + test { + useJUnitPlatform() + testLogging { + events("passed", "skipped", "failed") + } } } +} - permissions { - register("gridselector.export") { - default = Default.FALSE - } - register("gridselector.export.global") { - default = Default.FALSE - } - register("gridselector.cluster.create") { - default = Default.FALSE - } - register("gridselector.cluster.remove") { - default = Default.FALSE - } - register("gridselector.cluster.repair") { - default = Default.FALSE - } - } +license { + header(rootProject.file("HEADER.txt")) + include("**/*.java") } diff --git a/core/build.gradle.kts b/core/build.gradle.kts new file mode 100644 index 0000000..c432b0c --- /dev/null +++ b/core/build.gradle.kts @@ -0,0 +1,73 @@ +import net.minecrell.pluginyml.bukkit.BukkitPluginDescription.Permission.Default.FALSE + +plugins { + alias(libs.plugins.pluginyml) + alias(libs.plugins.publishdata) +} + +dependencies { + compileOnly("de.eldoria", "schematicbrushreborn-api", "2.7.1") + compileOnly("org.spigotmc", "spigot-api", "1.16.5-R0.1-SNAPSHOT") + compileOnly("com.sk89q.worldedit", "worldedit-bukkit", "7.3.0") + // PlotSquared Core API + compileOnly("com.plotsquared", "PlotSquared-Core", "6.11.1") { + exclude("com.intellectualsites.paster", "Paster") + exclude("org.apache.logging.log4j", "log4j-api") + exclude("com.intellectualsites.informative-annotations", "informative-annotations") + } + compileOnly("com.plotsquared", "PlotSquared-Bukkit", "6.11.1") { isTransitive = false } // PlotSquared Bukkit API + compileOnly("com.sk89q.worldguard", "worldguard-bukkit", "7.0.9") + compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core:2.9.2") { + exclude("com.intellectualsites.paster") + exclude("org.yaml") + } + compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit:2.9.2") { + isTransitive = false + exclude("org.yaml") + } + + testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.10.2") + testImplementation("com.sk89q.worldedit", "worldedit-bukkit", "7.3.0") + testImplementation("org.spigotmc", "spigot-api", "1.16.5-R0.1-SNAPSHOT") + testImplementation("de.eldoria", "eldo-util", "1.14.4") + testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine") +} + +publishData { + useEldoNexusRepos() +} + +bukkit { + name = "GridSelector" + main = "de.eldoria.gridselector.GridSelector" + apiVersion = "1.16" + version = publishData.getVersion(true) + authors = listOf("RainbowDashLabs") + depend = listOf("SchematicBrushReborn") + softDepend = listOf("PlotSquared", "WorldGuard") + + commands { + register("schematicbrushgrid") { + aliases = listOf("sbrg") + permission = "gridselector.use" + } + } + + permissions { + register("gridselector.export") { + default = FALSE + } + register("gridselector.export.global") { + default = FALSE + } + register("gridselector.cluster.create") { + default = FALSE + } + register("gridselector.cluster.remove") { + default = FALSE + } + register("gridselector.cluster.repair") { + default = FALSE + } + } +} diff --git a/src/main/java/de/eldoria/gridselector/GridSelector.java b/core/src/main/java/de/eldoria/gridselector/GridSelector.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/GridSelector.java rename to core/src/main/java/de/eldoria/gridselector/GridSelector.java diff --git a/src/main/java/de/eldoria/gridselector/adapter/regionadapter/ClusterWorldAdapter.java b/core/src/main/java/de/eldoria/gridselector/adapter/regionadapter/ClusterWorldAdapter.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/adapter/regionadapter/ClusterWorldAdapter.java rename to core/src/main/java/de/eldoria/gridselector/adapter/regionadapter/ClusterWorldAdapter.java diff --git a/src/main/java/de/eldoria/gridselector/adapter/regionadapter/PlotWorldAdapter.java b/core/src/main/java/de/eldoria/gridselector/adapter/regionadapter/PlotWorldAdapter.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/adapter/regionadapter/PlotWorldAdapter.java rename to core/src/main/java/de/eldoria/gridselector/adapter/regionadapter/PlotWorldAdapter.java diff --git a/src/main/java/de/eldoria/gridselector/adapter/regionadapter/RegionAdapter.java b/core/src/main/java/de/eldoria/gridselector/adapter/regionadapter/RegionAdapter.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/adapter/regionadapter/RegionAdapter.java rename to core/src/main/java/de/eldoria/gridselector/adapter/regionadapter/RegionAdapter.java diff --git a/src/main/java/de/eldoria/gridselector/adapter/regionadapter/RegionResult.java b/core/src/main/java/de/eldoria/gridselector/adapter/regionadapter/RegionResult.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/adapter/regionadapter/RegionResult.java rename to core/src/main/java/de/eldoria/gridselector/adapter/regionadapter/RegionResult.java diff --git a/src/main/java/de/eldoria/gridselector/adapter/regionadapter/WorldAdapter.java b/core/src/main/java/de/eldoria/gridselector/adapter/regionadapter/WorldAdapter.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/adapter/regionadapter/WorldAdapter.java rename to core/src/main/java/de/eldoria/gridselector/adapter/regionadapter/WorldAdapter.java diff --git a/src/main/java/de/eldoria/gridselector/adapter/worldguard/IWorldGuardAdapter.java b/core/src/main/java/de/eldoria/gridselector/adapter/worldguard/IWorldGuardAdapter.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/adapter/worldguard/IWorldGuardAdapter.java rename to core/src/main/java/de/eldoria/gridselector/adapter/worldguard/IWorldGuardAdapter.java diff --git a/src/main/java/de/eldoria/gridselector/adapter/worldguard/WorldGuardAdapter.java b/core/src/main/java/de/eldoria/gridselector/adapter/worldguard/WorldGuardAdapter.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/adapter/worldguard/WorldGuardAdapter.java rename to core/src/main/java/de/eldoria/gridselector/adapter/worldguard/WorldGuardAdapter.java diff --git a/src/main/java/de/eldoria/gridselector/brush/MarkerResult.java b/core/src/main/java/de/eldoria/gridselector/brush/MarkerResult.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/brush/MarkerResult.java rename to core/src/main/java/de/eldoria/gridselector/brush/MarkerResult.java diff --git a/src/main/java/de/eldoria/gridselector/brush/SelectionBrush.java b/core/src/main/java/de/eldoria/gridselector/brush/SelectionBrush.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/brush/SelectionBrush.java rename to core/src/main/java/de/eldoria/gridselector/brush/SelectionBrush.java diff --git a/src/main/java/de/eldoria/gridselector/command/Grid.java b/core/src/main/java/de/eldoria/gridselector/command/Grid.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/command/Grid.java rename to core/src/main/java/de/eldoria/gridselector/command/Grid.java diff --git a/src/main/java/de/eldoria/gridselector/command/grid/Cluster.java b/core/src/main/java/de/eldoria/gridselector/command/grid/Cluster.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/command/grid/Cluster.java rename to core/src/main/java/de/eldoria/gridselector/command/grid/Cluster.java diff --git a/src/main/java/de/eldoria/gridselector/command/grid/Export.java b/core/src/main/java/de/eldoria/gridselector/command/grid/Export.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/command/grid/Export.java rename to core/src/main/java/de/eldoria/gridselector/command/grid/Export.java diff --git a/src/main/java/de/eldoria/gridselector/command/grid/Select.java b/core/src/main/java/de/eldoria/gridselector/command/grid/Select.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/command/grid/Select.java rename to core/src/main/java/de/eldoria/gridselector/command/grid/Select.java diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/Close.java b/core/src/main/java/de/eldoria/gridselector/command/grid/cluster/Close.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/command/grid/cluster/Close.java rename to core/src/main/java/de/eldoria/gridselector/command/grid/cluster/Close.java diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/Create.java b/core/src/main/java/de/eldoria/gridselector/command/grid/cluster/Create.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/command/grid/cluster/Create.java rename to core/src/main/java/de/eldoria/gridselector/command/grid/cluster/Create.java diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/Draw.java b/core/src/main/java/de/eldoria/gridselector/command/grid/cluster/Draw.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/command/grid/cluster/Draw.java rename to core/src/main/java/de/eldoria/gridselector/command/grid/cluster/Draw.java diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/Modify.java b/core/src/main/java/de/eldoria/gridselector/command/grid/cluster/Modify.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/command/grid/cluster/Modify.java rename to core/src/main/java/de/eldoria/gridselector/command/grid/cluster/Modify.java diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/Remove.java b/core/src/main/java/de/eldoria/gridselector/command/grid/cluster/Remove.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/command/grid/cluster/Remove.java rename to core/src/main/java/de/eldoria/gridselector/command/grid/cluster/Remove.java diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/Repair.java b/core/src/main/java/de/eldoria/gridselector/command/grid/cluster/Repair.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/command/grid/cluster/Repair.java rename to core/src/main/java/de/eldoria/gridselector/command/grid/cluster/Repair.java diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/Sessions.java b/core/src/main/java/de/eldoria/gridselector/command/grid/cluster/Sessions.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/command/grid/cluster/Sessions.java rename to core/src/main/java/de/eldoria/gridselector/command/grid/cluster/Sessions.java diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/BorderMaterial.java b/core/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/BorderMaterial.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/BorderMaterial.java rename to core/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/BorderMaterial.java diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Center.java b/core/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Center.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Center.java rename to core/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Center.java diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Columns.java b/core/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Columns.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Columns.java rename to core/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Columns.java diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Direction.java b/core/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Direction.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Direction.java rename to core/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Direction.java diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/ExpandRight.java b/core/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/ExpandRight.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/ExpandRight.java rename to core/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/ExpandRight.java diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/FloorMaterial.java b/core/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/FloorMaterial.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/FloorMaterial.java rename to core/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/FloorMaterial.java diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Offset.java b/core/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Offset.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Offset.java rename to core/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Offset.java diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/OffsetMaterial.java b/core/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/OffsetMaterial.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/OffsetMaterial.java rename to core/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/OffsetMaterial.java diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Rows.java b/core/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Rows.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Rows.java rename to core/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Rows.java diff --git a/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Size.java b/core/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Size.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Size.java rename to core/src/main/java/de/eldoria/gridselector/command/grid/cluster/modify/Size.java diff --git a/src/main/java/de/eldoria/gridselector/config/ConfigFile.java b/core/src/main/java/de/eldoria/gridselector/config/ConfigFile.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/config/ConfigFile.java rename to core/src/main/java/de/eldoria/gridselector/config/ConfigFile.java diff --git a/src/main/java/de/eldoria/gridselector/config/Configuration.java b/core/src/main/java/de/eldoria/gridselector/config/Configuration.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/config/Configuration.java rename to core/src/main/java/de/eldoria/gridselector/config/Configuration.java diff --git a/src/main/java/de/eldoria/gridselector/config/JacksonConfiguration.java b/core/src/main/java/de/eldoria/gridselector/config/JacksonConfiguration.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/config/JacksonConfiguration.java rename to core/src/main/java/de/eldoria/gridselector/config/JacksonConfiguration.java diff --git a/src/main/java/de/eldoria/gridselector/config/LegacyConfiguration.java b/core/src/main/java/de/eldoria/gridselector/config/LegacyConfiguration.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/config/LegacyConfiguration.java rename to core/src/main/java/de/eldoria/gridselector/config/LegacyConfiguration.java diff --git a/src/main/java/de/eldoria/gridselector/config/elements/ClusterWorlds.java b/core/src/main/java/de/eldoria/gridselector/config/elements/ClusterWorlds.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/config/elements/ClusterWorlds.java rename to core/src/main/java/de/eldoria/gridselector/config/elements/ClusterWorlds.java diff --git a/src/main/java/de/eldoria/gridselector/config/elements/General.java b/core/src/main/java/de/eldoria/gridselector/config/elements/General.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/config/elements/General.java rename to core/src/main/java/de/eldoria/gridselector/config/elements/General.java diff --git a/src/main/java/de/eldoria/gridselector/config/elements/Highlight.java b/core/src/main/java/de/eldoria/gridselector/config/elements/Highlight.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/config/elements/Highlight.java rename to core/src/main/java/de/eldoria/gridselector/config/elements/Highlight.java diff --git a/src/main/java/de/eldoria/gridselector/config/elements/cluster/ClusterWorld.java b/core/src/main/java/de/eldoria/gridselector/config/elements/cluster/ClusterWorld.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/config/elements/cluster/ClusterWorld.java rename to core/src/main/java/de/eldoria/gridselector/config/elements/cluster/ClusterWorld.java diff --git a/src/main/java/de/eldoria/gridselector/config/elements/cluster/GridCluster.java b/core/src/main/java/de/eldoria/gridselector/config/elements/cluster/GridCluster.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/config/elements/cluster/GridCluster.java rename to core/src/main/java/de/eldoria/gridselector/config/elements/cluster/GridCluster.java diff --git a/src/main/java/de/eldoria/gridselector/config/elements/cluster/Plot.java b/core/src/main/java/de/eldoria/gridselector/config/elements/cluster/Plot.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/config/elements/cluster/Plot.java rename to core/src/main/java/de/eldoria/gridselector/config/elements/cluster/Plot.java diff --git a/src/main/java/de/eldoria/gridselector/listener/SelectionListener.java b/core/src/main/java/de/eldoria/gridselector/listener/SelectionListener.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/listener/SelectionListener.java rename to core/src/main/java/de/eldoria/gridselector/listener/SelectionListener.java diff --git a/src/main/java/de/eldoria/gridselector/schematics/GridSchematics.java b/core/src/main/java/de/eldoria/gridselector/schematics/GridSchematics.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/schematics/GridSchematics.java rename to core/src/main/java/de/eldoria/gridselector/schematics/GridSchematics.java diff --git a/src/main/java/de/eldoria/gridselector/selector/Grid.java b/core/src/main/java/de/eldoria/gridselector/selector/Grid.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/selector/Grid.java rename to core/src/main/java/de/eldoria/gridselector/selector/Grid.java diff --git a/src/main/java/de/eldoria/gridselector/selector/GridProvider.java b/core/src/main/java/de/eldoria/gridselector/selector/GridProvider.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/selector/GridProvider.java rename to core/src/main/java/de/eldoria/gridselector/selector/GridProvider.java diff --git a/src/main/java/de/eldoria/gridselector/util/Colors.java b/core/src/main/java/de/eldoria/gridselector/util/Colors.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/util/Colors.java rename to core/src/main/java/de/eldoria/gridselector/util/Colors.java diff --git a/src/main/java/de/eldoria/gridselector/util/Permissions.java b/core/src/main/java/de/eldoria/gridselector/util/Permissions.java similarity index 100% rename from src/main/java/de/eldoria/gridselector/util/Permissions.java rename to core/src/main/java/de/eldoria/gridselector/util/Permissions.java diff --git a/src/main/resources/config.yml b/core/src/main/resources/config.yml similarity index 100% rename from src/main/resources/config.yml rename to core/src/main/resources/config.yml diff --git a/src/main/resources/messages.properties b/core/src/main/resources/messages.properties similarity index 100% rename from src/main/resources/messages.properties rename to core/src/main/resources/messages.properties diff --git a/src/main/resources/messages_en_US.properties b/core/src/main/resources/messages_en_US.properties similarity index 100% rename from src/main/resources/messages_en_US.properties rename to core/src/main/resources/messages_en_US.properties diff --git a/src/test/java/de/eldoria/gridselector/config/elements/cluster/GridClusterTest.java b/core/src/test/java/de/eldoria/gridselector/config/elements/cluster/GridClusterTest.java similarity index 100% rename from src/test/java/de/eldoria/gridselector/config/elements/cluster/GridClusterTest.java rename to core/src/test/java/de/eldoria/gridselector/config/elements/cluster/GridClusterTest.java diff --git a/latest/build.gradle.kts b/latest/build.gradle.kts new file mode 100644 index 0000000..aa10e28 --- /dev/null +++ b/latest/build.gradle.kts @@ -0,0 +1,58 @@ +plugins { + alias(libs.plugins.publishdata) + alias(libs.plugins.shadow) + `maven-publish` +} + +dependencies { + implementation(project(":core")) +} + +publishData { + addBuildData() + useEldoNexusRepos() + publishComponent("java") + publishTask("shadowJar") +} + +publishing { + publications.create("maven") { + publishData.configurePublication(this) + } + + repositories { + maven { + authentication { + credentials(PasswordCredentials::class) { + username = System.getenv("NEXUS_USERNAME") + password = System.getenv("NEXUS_PASSWORD") + } + } + + setUrl(publishData.getRepository()) + name = "EldoNexus" + } + } +} + +tasks { + shadowJar { + val shadebase = "de.eldoria.schematicbrush.libs." + relocate("de.eldoria.messageblocker", shadebase + "messageblocker") + } + + build { + dependsOn(shadowJar) + } + + register("copyToServer") { + val path = project.property("targetDir") ?: ""; + if (path.toString().isEmpty()) { + println("targetDir is not set in gradle properties") + return@register + } + println("Copying jar to $path") + from(shadowJar) + destinationDir = File(path.toString()) + } +} diff --git a/legacy/build.gradle.kts b/legacy/build.gradle.kts new file mode 100644 index 0000000..901ce19 --- /dev/null +++ b/legacy/build.gradle.kts @@ -0,0 +1,56 @@ +plugins { + alias(libs.plugins.publishdata) + alias(libs.plugins.shadow) + `maven-publish` +} + +dependencies { + implementation(project(":core")) +} + + +publishData { + addBuildData() + useEldoNexusRepos() + publishComponent("java") + publishTask("shadowJar") +} + + publishing { + publications.create("maven") { + publishData.configurePublication(this) + } + + repositories { + maven { + authentication { + credentials(PasswordCredentials::class) { + username = System.getenv("NEXUS_USERNAME") + password = System.getenv("NEXUS_PASSWORD") + } + } + + setUrl(publishData.getRepository()) + name = "EldoNexus" + } + } + } + +tasks { + shadowJar { + val shadebase = "de.eldoria.schematicbrush.libs." + relocate("org.bstats", shadebase + "bstats") + relocate("de.eldoria.eldoutilities", shadebase + "eldoutilities") + relocate("de.eldoria.jacksonbukkit", shadebase + "jacksonbukkit") + relocate("de.eldoria.messageblocker", shadebase + "messageblocker") + relocate("com.fasterxml", shadebase + "fasterxml") + relocate("org.yaml", shadebase + "fasterxml") + relocate("net.kyori", shadebase + "kyori") + mergeServiceFiles() + archiveVersion.set(rootProject.version as String) + } + + build { + dependsOn(shadowJar) + } +} diff --git a/settings.gradle.kts b/settings.gradle.kts index 72b5d2c..a67ccab 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,13 +1,27 @@ rootProject.name = "gridselector" +include("core") +include("legacy") +include("latest") -pluginManagement{ - repositories{ +pluginManagement { + repositories { mavenLocal() gradlePluginPortal() - maven{ + maven { name = "EldoNexus" url = uri("https://eldonexus.de/repository/maven-public/") } } } + +dependencyResolutionManagement { + versionCatalogs { + create("libs") { + plugin("publishdata", "de.chojo.publishdata").version("1.4.0") + plugin("licenser", "org.cadixdev.licenser").version("0.6.1") + plugin("shadow", "io.github.goooler.shadow").version("8.1.8") + plugin("pluginyml", "net.minecrell.plugin-yml.bukkit").version("0.6.0") + } + } +} From f1432adf10eb70fa3b73c858f2a1de59a931a22a Mon Sep 17 00:00:00 2001 From: Lilly <46890129+RainbowDashLabs@users.noreply.github.com> Date: Thu, 15 Aug 2024 15:46:23 +0200 Subject: [PATCH 3/5] Bump version --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 512e4db..b80f941 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } group = "de.eldoria.gridselector" -version = "1.3.0" +version = "1.3.1" allprojects { apply { From 294ea2f816d223787b31af2da89ef32166afd6b5 Mon Sep 17 00:00:00 2001 From: Lilly <46890129+RainbowDashLabs@users.noreply.github.com> Date: Thu, 15 Aug 2024 15:47:02 +0200 Subject: [PATCH 4/5] Update workflows --- .github/workflows/publish_to_nexus.yml | 4 ++-- .github/workflows/verify.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish_to_nexus.yml b/.github/workflows/publish_to_nexus.yml index c6fc07a..63dc8f0 100644 --- a/.github/workflows/publish_to_nexus.yml +++ b/.github/workflows/publish_to_nexus.yml @@ -17,11 +17,11 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK uses: actions/setup-java@v4 with: distribution: adopt - java-version: 17 + java-version: 21 - name: Build with Gradle run: ./gradlew --build-cache build - name: Test with Gradle diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 8372560..b1d9c4e 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -11,11 +11,11 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK uses: actions/setup-java@v4 with: distribution: adopt - java-version: 17 + java-version: 21 - name: Build with Gradle run: ./gradlew --build-cache build - name: Test with Gradle From c7e4a984d5b6044d19d336224c07818b68aeaef7 Mon Sep 17 00:00:00 2001 From: Lilly <46890129+RainbowDashLabs@users.noreply.github.com> Date: Thu, 15 Aug 2024 15:49:13 +0200 Subject: [PATCH 5/5] Adjust publish --- latest/build.gradle.kts | 1 - legacy/build.gradle.kts | 1 - 2 files changed, 2 deletions(-) diff --git a/latest/build.gradle.kts b/latest/build.gradle.kts index aa10e28..3b71dff 100644 --- a/latest/build.gradle.kts +++ b/latest/build.gradle.kts @@ -12,7 +12,6 @@ publishData { addBuildData() useEldoNexusRepos() publishComponent("java") - publishTask("shadowJar") } publishing { diff --git a/legacy/build.gradle.kts b/legacy/build.gradle.kts index 901ce19..33b18d0 100644 --- a/legacy/build.gradle.kts +++ b/legacy/build.gradle.kts @@ -13,7 +13,6 @@ publishData { addBuildData() useEldoNexusRepos() publishComponent("java") - publishTask("shadowJar") } publishing {