Split Treasury's code into modules

api-bukkit/pom.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>treasury-parent</artifactId>
+        <groupId>me.lokka30</groupId>
+        <version>dev-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>treasury-api-bukkit</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+
+    <name>Treasury-API-Bukkit</name>
+    <description>Additions to Treasury's API for Bukkit</description>
+
+    <repositories>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>${spigot.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>me.lokka30</groupId>
+            <artifactId>treasury-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

api-bukkit/src/main/java/me/lokka30/treasury/api/economy/BukkitEconomyProvider.java

@@ -0,0 +1,6 @@
+package me.lokka30.treasury.api.economy;
+
+import org.bukkit.plugin.Plugin;
+
+public interface BukkitEconomyProvider extends EconomyProvider<Plugin> {
+}

api/pom.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>treasury-parent</artifactId>
+        <groupId>me.lokka30</groupId>
+        <version>dev-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>treasury-api</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+
+    <name>Treasury-API</name>
+    <description>Base API for Treasury.</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>${jetbrains.annotations.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

src/main/java/me/lokka30/treasury/api/economy/EconomyProvider.java → api/src/main/java/me/lokka30/treasury/api/economy/EconomyProvider.java

@@ -17,33 +17,32 @@
 import me.lokka30.treasury.api.economy.currency.Currency;
 import me.lokka30.treasury.api.economy.misc.EconomyAPIVersion;
 import me.lokka30.treasury.api.economy.response.EconomySubscriber;
-import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
 import java.util.UUID;
 
+// TODO: This javadoc is weirdo. How should we rephrase it?
 /**
- * {@link Plugin Plugins} providing and managing economy data create a class
- * which implements this interface to be registered via the
- * {@link org.bukkit.plugin.ServicesManager ServicesManager} as a
- * {@link org.bukkit.plugin.RegisteredServiceProvider RegisteredServiceProvider<EconomyProvider>}.
+ * Implementors providing and managing economy data create a class
+ * which implements this interface to be registered in
+ * the specific platform.
  *
  * @author lokka30
  * @since v1.0.0
  */
 @SuppressWarnings({"unused", "UnusedReturnValue"})
-public interface EconomyProvider {
+public interface EconomyProvider<T> {
 
     /**
-     * Get the "Economy Provider" - the {@link Plugin} facilitating the economy.
+     * Get the "Economy Provider" - the "Plugin" facilitating the economy.
      *
      * @author lokka30
      * @return the {@code Plugin} facilitating the economy
      * @since v1.0.0
      */
     @NotNull
-    Plugin getProvider();
+    T getProvider();
 
     /**
      * Get the version of the Treasury API the {@code EconomyProvider} is based on.

api/src/main/java/me/lokka30/treasury/api/economy/misc/APIUtils.java

@@ -0,0 +1,19 @@
+package me.lokka30.treasury.api.economy.misc;
+
+// TODO: What shall we call this?
+public class APIUtils {
+
+    /**
+     * @author lokka30
+     * @since v1.0.0
+     * If the specified amount is less than zero
+     * then zero is returned. Otherwise, the amount
+     * is returned. This ensures an amount is at least zero
+     * since negative values are not allowed in the API.
+     * @param amount to check for.
+     * @return the unmodified or modified amount.
+     */
+    public static double ensureAtLeastZero(final double amount) {
+        return Math.max(amount, 0.0d);
+    }
+}

src/main/java/me/lokka30/treasury/api/economy/transaction/Transaction.java → api/src/main/java/me/lokka30/treasury/api/economy/transaction/Transaction.java

@@ -12,7 +12,7 @@
 
 package me.lokka30.treasury.api.economy.transaction;
 
-import me.lokka30.treasury.plugin.misc.Utils;
+import me.lokka30.treasury.api.economy.misc.APIUtils;
 import org.jetbrains.annotations.NotNull;
 
 @SuppressWarnings("unused")
@@ -23,8 +23,8 @@ public class Transaction {
     @NotNull private final TransactionType transactionType;
 
     public Transaction(final double newBalance, final double transactionAmount, @NotNull final TransactionType transactionType) {
-        this.newBalance = Utils.ensureAtLeastZero(newBalance);
-        this.transactionAmount = Utils.ensureAtLeastZero(newBalance);
+        this.newBalance = APIUtils.ensureAtLeastZero(newBalance);
+        this.transactionAmount = APIUtils.ensureAtLeastZero(newBalance);
         this.transactionType = transactionType;
     }
 

bukkit/pom.xml

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>treasury-parent</artifactId>
+        <groupId>me.lokka30</groupId>
+        <version>dev-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>treasury-bukkit</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+
+    <name>Treasury-Bukkit</name>
+    <description>Bukkit implementation of the treasury plugin</description>
+
+    <build>
+        <defaultGoal>clean package</defaultGoal>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <relocations>
+                        <relocation>
+                            <pattern>org.bstats</pattern>
+                            <shadedPattern>me.lokka30.elementaleconomy.bstats</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>me.lokka30.microlib</pattern>
+                            <shadedPattern>me.lokka30.elementaleconomy.microlib</shadedPattern>
+                        </relocation>
+                    </relocations>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+        <repository>
+            <id>CodeMC</id>
+            <url>https://repo.codemc.org/repository/maven-public</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>me.lokka30</groupId>
+            <artifactId>treasury-api-bukkit</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jetbrains</groupId>
+                    <artifactId>annotations</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>me.lokka30</groupId>
+            <artifactId>treasury-core</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>${spigot.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>${jetbrains.annotations.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bukkit</artifactId>
+            <version>2.2.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.lokka30</groupId>
+            <artifactId>MicroLib</artifactId>
+            <version>3.1.0</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+</project>

src/main/java/me/lokka30/treasury/plugin/Treasury.java → bukkit/src/main/java/me/lokka30/treasury/plugin/bukkit/Treasury.java

@@ -10,17 +10,17 @@
  * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package me.lokka30.treasury.plugin;
+package me.lokka30.treasury.plugin.bukkit;
 
 import me.lokka30.microlib.files.YamlConfigFile;
 import me.lokka30.microlib.maths.QuickTimer;
 import me.lokka30.treasury.api.economy.currency.conversion.CurrencyConverter;
 import me.lokka30.treasury.api.economy.misc.EconomyAPIVersion;
-import me.lokka30.treasury.plugin.command.CommandHandler;
-import me.lokka30.treasury.plugin.debug.DebugHandler;
-import me.lokka30.treasury.plugin.file.FileHandler;
-import me.lokka30.treasury.plugin.misc.UpdateCheckerHandler;
-import me.lokka30.treasury.plugin.misc.Utils;
+import me.lokka30.treasury.plugin.bukkit.command.CommandHandler;
+import me.lokka30.treasury.plugin.bukkit.debug.DebugHandler;
+import me.lokka30.treasury.plugin.bukkit.file.FileHandler;
+import me.lokka30.treasury.plugin.bukkit.misc.UpdateCheckerHandler;
+import me.lokka30.treasury.plugin.bukkit.misc.Utils;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;

src/main/java/me/lokka30/treasury/plugin/command/CommandHandler.java → bukkit/src/main/java/me/lokka30/treasury/plugin/bukkit/command/CommandHandler.java

@@ -10,11 +10,11 @@
  * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package me.lokka30.treasury.plugin.command;
+package me.lokka30.treasury.plugin.bukkit.command;
 
-import me.lokka30.treasury.plugin.Treasury;
-import me.lokka30.treasury.plugin.command.treasury.TreasuryCommand;
-import me.lokka30.treasury.plugin.misc.Utils;
+import me.lokka30.treasury.plugin.bukkit.Treasury;
+import me.lokka30.treasury.plugin.bukkit.command.treasury.TreasuryCommand;
+import me.lokka30.treasury.plugin.bukkit.misc.Utils;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.command.TabExecutor;
 import org.jetbrains.annotations.NotNull;

src/main/java/me/lokka30/treasury/plugin/command/Subcommand.java → bukkit/src/main/java/me/lokka30/treasury/plugin/bukkit/command/Subcommand.java

@@ -10,7 +10,7 @@
  * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package me.lokka30.treasury.plugin.command;
+package me.lokka30.treasury.plugin.bukkit.command;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

src/main/java/me/lokka30/treasury/plugin/command/treasury/TreasuryCommand.java → bukkit/src/main/java/me/lokka30/treasury/plugin/bukkit/command/treasury/TreasuryCommand.java

@@ -10,14 +10,14 @@
  * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package me.lokka30.treasury.plugin.command.treasury;
+package me.lokka30.treasury.plugin.bukkit.command.treasury;
 
 import me.lokka30.microlib.messaging.MultiMessage;
-import me.lokka30.treasury.plugin.Treasury;
-import me.lokka30.treasury.plugin.command.treasury.subcommand.HelpSubcommand;
-import me.lokka30.treasury.plugin.command.treasury.subcommand.InfoSubcommand;
-import me.lokka30.treasury.plugin.command.treasury.subcommand.migrate.MigrateSubcommand;
-import me.lokka30.treasury.plugin.command.treasury.subcommand.ReloadSubcommand;
+import me.lokka30.treasury.plugin.bukkit.Treasury;
+import me.lokka30.treasury.plugin.bukkit.command.treasury.subcommand.HelpSubcommand;
+import me.lokka30.treasury.plugin.bukkit.command.treasury.subcommand.InfoSubcommand;
+import me.lokka30.treasury.plugin.bukkit.command.treasury.subcommand.ReloadSubcommand;
+import me.lokka30.treasury.plugin.bukkit.command.treasury.subcommand.migrate.MigrateSubcommand;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;

src/main/java/me/lokka30/treasury/plugin/command/treasury/subcommand/HelpSubcommand.java → bukkit/src/main/java/me/lokka30/treasury/plugin/bukkit/command/treasury/subcommand/HelpSubcommand.java

@@ -10,12 +10,12 @@
  * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package me.lokka30.treasury.plugin.command.treasury.subcommand;
+package me.lokka30.treasury.plugin.bukkit.command.treasury.subcommand;
 
 import me.lokka30.microlib.messaging.MultiMessage;
-import me.lokka30.treasury.plugin.Treasury;
-import me.lokka30.treasury.plugin.command.Subcommand;
-import me.lokka30.treasury.plugin.misc.Utils;
+import me.lokka30.treasury.plugin.bukkit.Treasury;
+import me.lokka30.treasury.plugin.bukkit.command.Subcommand;
+import me.lokka30.treasury.plugin.bukkit.misc.Utils;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/me/lokka30/treasury/plugin/command/treasury/subcommand/InfoSubcommand.java → bukkit/src/main/java/me/lokka30/treasury/plugin/bukkit/command/treasury/subcommand/InfoSubcommand.java

@@ -10,13 +10,13 @@
  * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package me.lokka30.treasury.plugin.command.treasury.subcommand;
+package me.lokka30.treasury.plugin.bukkit.command.treasury.subcommand;
 
 import me.lokka30.microlib.messaging.MultiMessage;
-import me.lokka30.treasury.api.economy.EconomyProvider;
-import me.lokka30.treasury.plugin.Treasury;
-import me.lokka30.treasury.plugin.command.Subcommand;
-import me.lokka30.treasury.plugin.misc.Utils;
+import me.lokka30.treasury.api.economy.BukkitEconomyProvider;
+import me.lokka30.treasury.plugin.bukkit.Treasury;
+import me.lokka30.treasury.plugin.bukkit.command.Subcommand;
+import me.lokka30.treasury.plugin.bukkit.misc.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.RegisteredServiceProvider;
 import org.jetbrains.annotations.NotNull;
@@ -48,7 +48,7 @@ public void run(@NotNull CommandSender sender, @NotNull String label, @NotNull S
             return;
         }
 
-        final RegisteredServiceProvider<EconomyProvider> registeredServiceProvider = main.getServer().getServicesManager().getRegistration(EconomyProvider.class);
+        final RegisteredServiceProvider<BukkitEconomyProvider> registeredServiceProvider = main.getServer().getServicesManager().getRegistration(BukkitEconomyProvider.class);
 
         new MultiMessage(main.messagesCfg.getConfig().getStringList("commands.treasury.subcommands.info.treasury"), Arrays.asList(
                 new MultiMessage.Placeholder("prefix", main.messagesCfg.getConfig().getString("common.prefix"), true),
@@ -66,7 +66,7 @@ public void run(@NotNull CommandSender sender, @NotNull String label, @NotNull S
                     new MultiMessage.Placeholder("prefix", main.messagesCfg.getConfig().getString("common.prefix"), true)
             ));
         } else {
-            final EconomyProvider provider = registeredServiceProvider.getProvider();
+            final BukkitEconomyProvider provider = registeredServiceProvider.getProvider();
 
             new MultiMessage(main.messagesCfg.getConfig().getStringList("commands.treasury.subcommands.info.economy-provider-available"), Arrays.asList(
                     new MultiMessage.Placeholder("prefix", main.messagesCfg.getConfig().getString("common.prefix"), true),