Release of v1.0 (#1)

* Setup basic plugin and command layout

* Basic implementation of plot and grid selection

* Restore blocks on deselect

* Update readme

* Dump studd for other machine

* First functional implementation with sbr 2.0

* Fix test dependencies

* Save session to history

* Add locale for error handling

* Add save schematics command

* Fix missing blocks on unselect

* Small changes, fixes and additions

* Update to latest SBR beta

* Prevent grid function from being used in plot worlds

* Add permissions to commands

* Proper project setup

* Update to latest SBR beta

* Update readme

* Update buildfile

Author: rainbowdashlabs

Diff for: FUNDING.yml

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

Diff for: HEADER.txt

@@ -0,0 +1,25 @@
+[![Wakatime_Badge](https://wakatime.com/badge/github/eldoriarpg/gridselector.svg)][wakatime]
+
+[![Publish](https://img.shields.io/github/workflow/status/eldoriarpg/gridselector/Publish%20to%20Nexus?style=for-the-badge&label=Publish)][publish]
+[![Build](https://img.shields.io/github/workflow/status/eldoriarpg/gridselector/Verify%20state?style=for-the-badge&label=Build)][verify]
+
+[![Releases](https://img.shields.io/nexus/maven-releases/de.eldoria/gridselector?label=Release&logo=Release&server=https%3A%2F%2Feldonexus.de&style=for-the-badge)][release]
+[![Development](https://img.shields.io/nexus/maven-dev/de.eldoria/gridselector?label=DEV&logo=Release&server=https%3A%2F%2Feldonexus.de&style=for-the-badge)][development]
+[![Snapshots](https://img.shields.io/nexus/s/de.eldoria/gridselector?color=orange&label=Snapshot&server=https%3A%2F%2Feldonexus.de&style=for-the-badge)][snapshot]
+
+<!-- [![Text](image_link)][link_anchor] -->
+<!-- [anchor]: link> -->
+
+[wakatime]: https://wakatime.com/badge/github/eldoriarpg/gridselector
+[publish]: https://github.com/eldoriarpg/gridselector/actions/workflows/publish_to_nexus.yml
+[verify]: https://github.com/eldoriarpg/gridselector/actions/workflows/verify.yml
+[release]: https://eldonexus.de/#browse/browse:maven-releases:de%2Feldoria%2Fgridselector
+[development]: https://eldonexus.de/#browse/browse:maven-dev:de%2Feldoria%2Fgridselector
+[snapshot]: https://eldonexus.de/#browse/browse:maven-snapshots:de%2Feldoria%2Fgridselector
+
+# What is GridSelector
+GridSelector is an Add-On for [Schematic Brush 2.0](https://github.com/eldoriarpg/SchematicBrushReborn).
+
+It allows to define grid worlds and select schematics directly from this grid. As an alternative plot squared worlds can be used.
+
+Take a look at the [wiki](https://github.com/eldoriarpg/gridselector/wiki) for more information.

Diff for: Readme.md

@@ -1,42 +1,58 @@
 plugins {
+    id("org.cadixdev.licenser") version "0.6.1"
     id("com.github.johnrengelman.shadow") version "7.0.0"
+    id("de.chojo.publishdata") version "1.0.2"
     java
     `maven-publish`
 }
 
 group = "de.eldoria"
 version = "1.0"
-val publishData = PublishData(project)
-val shadebase = "de.eldoria.gridselector.libs"
+val shadebase = "de.eldoria." + rootProject.name + ".libs."
 
 repositories {
+    mavenCentral()
     maven("https://eldonexus.de/repository/maven-public/")
     maven("https://eldonexus.de/repository/maven-proxies/")
 }
 
 dependencies {
-    implementation("de.eldoria", "eldo-util", "1.10.3")
-    compileOnly("de.eldoria", "schematicbrushreborn", "1.5.0-20210919.131332-5")
+    compileOnly("de.eldoria", "schematicbrushreborn-api", "2.0.0-DEV")
+    compileOnly("de.eldoria", "eldo-util", "1.12.8-DEV")
     compileOnly("org.spigotmc", "spigot-api", "1.16.5-R0.1-SNAPSHOT")
+    compileOnly("com.sk89q.worldedit", "worldedit-bukkit", "7.2.6")
+    compileOnly("com.plotsquared", "PlotSquared-Core", "6.1.2") // PlotSquared Core API
+    compileOnly("com.plotsquared:PlotSquared-Bukkit:6.1.2") { isTransitive = false } // PlotSquared Bukkit API
 
     testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.6.0")
+    testImplementation("org.spigotmc", "spigot-api", "1.16.5-R0.1-SNAPSHOT")
+    testImplementation("de.eldoria", "eldo-util", "1.10.11-DEV")
     testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine")
 }
 
+license {
+    header(rootProject.file("HEADER.txt"))
+    include("**/*.java")
+}
+
 java {
     withSourcesJar()
     withJavadocJar()
-    sourceCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_16
+}
+
+publishData {
+    hashLength = 7
+    useEldoNexusRepos()
+    publishTask("jar")
+    publishTask("shadowJar")
+    publishTask("sourcesJar")
+    publishTask("javadocJar")
 }
 
 publishing {
     publications.create<MavenPublication>("maven") {
-        artifact(tasks["shadowJar"])
-        artifact(tasks["sourcesJar"])
-        artifact(tasks["javadocJar"])
-        groupId = project.group as String?
-        artifactId = project.name.toLowerCase()
-        version = publishData.getVersion()
+        publishData.configurePublication(this)
     }
 
     repositories {
@@ -48,8 +64,8 @@ publishing {
                 }
             }
 
+            setUrl(publishData.getRepository())
             name = "EldoNexus"
-            url = uri(publishData.getRepository())
         }
     }
 }
@@ -62,21 +78,22 @@ tasks {
     compileTestJava{
         options.encoding = "UTF-8"
     }
+
     test {
         useJUnitPlatform()
         testLogging {
             events("passed", "skipped", "failed")
         }
     }
     shadowJar{
-        relocate("de.eldoutilities", shadebase + "eldoutilities")
+        relocate("de.eldoria.eldoutilities",  "de.eldoria.schematicbrush.libs.eldoutilities")
         mergeServiceFiles()
     }
     processResources {
         from(sourceSets.main.get().resources.srcDirs) {
             filesMatching("plugin.yml") {
                 expand(
-                    "version" to project.version
+                    "version" to publishData.getVersion(true)
                 )
             }
             duplicatesStrategy = DuplicatesStrategy.INCLUDE
@@ -92,39 +109,3 @@ tasks {
         destinationDir = File(path.toString())
     }
 }
-
-class PublishData(private val project: Project) {
-    var type: Type = getReleaseType()
-    var hashLength: Int = 7
-
-    private fun getReleaseType(): Type {
-        val branch = getCheckedOutBranch()
-        return when {
-            branch.contentEquals("master") -> Type.RELEASE
-            branch.startsWith("dev") -> Type.DEV
-            else -> Type.SNAPSHOT
-        }
-    }
-
-    private fun getCheckedOutGitCommitHash(): String = System.getenv("GITHUB_SHA")?.substring(0, hashLength) ?: "local"
-
-    private fun getCheckedOutBranch(): String = System.getenv("GITHUB_REF")?.replace("refs/heads/", "") ?: "local"
-
-    fun getVersion(): String = getVersion(false)
-
-    fun getVersion(appendCommit: Boolean): String =
-        type.append(getVersionString(), appendCommit, getCheckedOutGitCommitHash())
-
-    private fun getVersionString(): String = (project.version as String).replace("-SNAPSHOT", "").replace("-DEV", "")
-
-    fun getRepository(): String = type.repo
-
-    enum class Type(private val append: String, val repo: String, private val addCommit: Boolean) {
-        RELEASE("", "https://eldonexus.de/repository/maven-releases/", false),
-        DEV("-DEV", "https://eldonexus.de/repository/maven-dev/", true),
-        SNAPSHOT("-SNAPSHOT", "https://eldonexus.de/repository/maven-snapshots/", true);
-
-        fun append(name: String, appendCommit: Boolean, commitHash: String): String =
-            name.plus(append).plus(if (appendCommit && addCommit) "-".plus(commitHash) else "")
-    }
-}

Diff for: build.gradle.kts

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Diff for: gradle/wrapper/gradle-wrapper.properties

@@ -1,2 +1,13 @@
-rootProject.name = "GridSelector"
+rootProject.name = "gridselector"
 
+pluginManagement{
+    repositories{
+        mavenLocal()
+        gradlePluginPortal()
+        maven{
+            name = "EldoNexus"
+            url = uri("https://eldonexus.de/repository/maven-public/")
+
+        }
+    }
+}

Diff for: settings.gradle.kts

@@ -0,0 +1,86 @@
+/*
+ *     SPDX-License-Identifier: AGPL-3.0-only
+ *
+ *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ */
+
+package de.eldoria.gridselector;
+
+
+import com.plotsquared.core.PlotSquared;
+import de.eldoria.eldoutilities.localization.ILocalizer;
+import de.eldoria.eldoutilities.messages.MessageSender;
+import de.eldoria.eldoutilities.plugin.EldoPlugin;
+import de.eldoria.gridselector.adapter.WorldAdapter;
+import de.eldoria.gridselector.adapter.regionadapter.GridWorldAdapter;
+import de.eldoria.gridselector.adapter.regionadapter.PlotWorldAdapter;
+import de.eldoria.gridselector.adapter.regionadapter.RegionAdapter;
+import de.eldoria.gridselector.adapter.regionadapter.RegionResult;
+import de.eldoria.gridselector.command.Grid;
+import de.eldoria.gridselector.config.Configuration;
+import de.eldoria.gridselector.config.elements.GridWorld;
+import de.eldoria.gridselector.listener.SelectionListener;
+import de.eldoria.gridselector.schematics.GridSchematics;
+import de.eldoria.gridselector.selector.GridProvider;
+import de.eldoria.schematicbrush.SchematicBrushReborn;
+import org.bukkit.Location;
+import org.bukkit.configuration.serialization.ConfigurationSerializable;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+public class GridSelector extends EldoPlugin {
+
+    @Override
+    public void onPluginEnable() throws Throwable {
+        var config = new Configuration(this);
+
+        var sbr = (SchematicBrushReborn) Objects.requireNonNull(getPluginManager().getPlugin("SchematicBrushReborn"));
+
+        var messageSender = MessageSender.create(this, "§3[GS]");
+
+        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);
+
+        List<RegionAdapter> regionAdapters = new ArrayList<>();
+        regionAdapters.add(new GridWorldAdapter(config));
+
+        RegionAdapter plotWorldAdapter;
+        if (getPluginManager().isPluginEnabled("PlotSquared")) {
+            logger().info("Found plot squared. Registering plot squared world adapter");
+            var plotSquared = PlotSquared.get();
+            plotWorldAdapter = new PlotWorldAdapter(plotSquared);
+            regionAdapters.add(plotWorldAdapter);
+        } else {
+            plotWorldAdapter = new RegionAdapter() {
+                @Override
+                public boolean isApplicable(Location location) {
+                    return false;
+                }
+
+                @Override
+                public Optional<RegionResult> getRegion(Location location) {
+                    return Optional.empty();
+                }
+            };
+        }
+
+        var worldAdapter = new WorldAdapter(regionAdapters);
+        var selectionListener = new SelectionListener(worldAdapter, gridSchematics, messageSender);
+
+        registerListener(selectionListener);
+
+        registerCommand(new Grid(this, sbr, selectionListener, config, gridSchematics, plotWorldAdapter));
+    }
+
+    @Override
+    public List<Class<? extends ConfigurationSerializable>> getConfigSerialization() {
+        return List.of(GridWorld.class);
+    }
+}

Diff for: src/main/java/de/eldoria/gridselector/GridSelector.java

@@ -0,0 +1,32 @@
+/*
+ *     SPDX-License-Identifier: AGPL-3.0-only
+ *
+ *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ */
+
+package de.eldoria.gridselector.adapter;
+
+import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldedit.util.Location;
+import de.eldoria.gridselector.adapter.regionadapter.RegionAdapter;
+import de.eldoria.gridselector.adapter.regionadapter.RegionResult;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+public class WorldAdapter {
+    private final List<RegionAdapter> adapters;
+
+    public WorldAdapter(List<RegionAdapter> adapters) {
+        this.adapters = adapters;
+    }
+
+    public Optional<RegionResult> getRegion(Location location) {
+        var loc = BukkitAdapter.adapt(location);
+        return adapters.stream()
+                .filter(a -> a.isApplicable(loc))
+                .findFirst()
+                .flatMap(adaper -> adaper.getRegion(loc));
+    }
+}

Diff for: src/main/java/de/eldoria/gridselector/adapter/WorldAdapter.java

@@ -0,0 +1,31 @@
+/*
+ *     SPDX-License-Identifier: AGPL-3.0-only
+ *
+ *     Copyright (C) 2021 EldoriaRPG Team and Contributor
+ */
+
+package de.eldoria.gridselector.adapter.regionadapter;
+
+import de.eldoria.gridselector.config.Configuration;
+import org.bukkit.Location;
+
+import java.util.Optional;
+
+public class GridWorldAdapter implements RegionAdapter {
+    private final Configuration configuration;
+
+    public GridWorldAdapter(Configuration configuration) {
+        this.configuration = configuration;
+    }
+
+    @Override
+    public boolean isApplicable(Location location) {
+        return configuration.getGridWorld(location).isPresent();
+    }
+
+    @Override
+    public Optional<RegionResult> getRegion(Location location) {
+        return configuration.getGridWorld(location)
+                .map(world -> new RegionResult(world.getGridItentifier(location), world.getGridElement(location)));
+    }
+}