2.0.0 - Multi-platform support (fabric / spigot probably)

autotreechop-spigot/build.gradle

@@ -0,0 +1,61 @@
+plugins {
+    id 'java-library'
+    id 'com.gradleup.shadow'
+    id 'xyz.jpenilla.run-paper'
+}
+
+dependencies {
+    // Depend on the core module
+    implementation project(':core')
+
+    // Spigot-specific dependencies
+    compileOnly "io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT"
+    compileOnly "org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT"
+    implementation "com.jeff_media:SpigotUpdateChecker:3.0.4"
+    compileOnly 'me.clip:placeholderapi:2.11.5'
+    implementation "de.cubbossa:TinyTranslations-bukkit:4.5.0"
+    compileOnly files("${rootProject.projectDir}/libs/Residence5.1.4.3.jar")
+    compileOnly "com.github.angeschossen:LandsAPI:6.44.0"
+    compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.9'
+    compileOnly "com.github.GriefPrevention:GriefPrevention:16.18.4"
+}
+
+processResources {
+    def props = [version: version]
+    inputs.properties props
+    filteringCharset 'UTF-8'
+    filesMatching('plugin.yml') {
+        expand props
+    }
+}
+
+shadowJar {
+    archiveBaseName.set('AutoTreeChop-Spigot')
+    archiveClassifier.set('')
+    configurations = [project.configurations.runtimeClasspath]
+    minimize()
+
+    relocate 'com.jeff_media.updatechecker', 'org.milkteamc.autotreechop.libs.updatechecker'
+    relocate 'de.cubbossa.tinytranslations', 'org.milkteamc.autotreechop.libs.tinytranslations'
+    relocate 'com.zaxxer.hikari', 'org.milkteamc.autotreechop.libs.hikari'
+
+    // Add the license file to the JAR
+    from("${rootProject.projectDir}/LICENSE") {
+        into 'META-INF'
+    }
+}
+
+jar {
+    archiveBaseName.set('AutoTreeChop-Spigot')
+    archiveClassifier.set('original')
+}
+
+tasks.build {
+    dependsOn("shadowJar")
+}
+
+runPaper {
+    minecraftVersion("1.21.4")
+}
+
+runPaper.folia.registerTask()

src/main/java/org/milkteamc/autotreechop/AutoTreeChop.java → autotreechop-spigot/src/main/java/org/milkteamc/autotreechop/spigot/AutoTreeChop.java

@@ -1,4 +1,4 @@
-package org.milkteamc.autotreechop;
+package org.milkteamc.autotreechop.spigot;
 
 import com.jeff_media.updatechecker.UpdateCheckSource;
 import com.jeff_media.updatechecker.UpdateChecker;
@@ -20,14 +20,16 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.milkteamc.autotreechop.hooks.GriefPreventionHook;
-import org.milkteamc.autotreechop.hooks.LandsHook;
-import org.milkteamc.autotreechop.hooks.ResidenceHook;
-import org.milkteamc.autotreechop.hooks.WorldGuardHook;
-import org.milkteamc.autotreechop.utils.CooldownManager;
-import org.milkteamc.autotreechop.utils.EffectUtils;
-import org.milkteamc.autotreechop.utils.PermissionUtils;
-import org.milkteamc.autotreechop.utils.TreeChopUtils;
+import org.milkteamc.autotreechop.spigot.hooks.GriefPreventionHook;
+import org.milkteamc.autotreechop.spigot.hooks.LandsHook;
+import org.milkteamc.autotreechop.spigot.hooks.ResidenceHook;
+import org.milkteamc.autotreechop.spigot.hooks.WorldGuardHook;
+import org.milkteamc.autotreechop.spigot.command.Command;
+import org.milkteamc.autotreechop.spigot.command.TabCompleter;
+import org.milkteamc.autotreechop.spigot.utils.CooldownManager;
+import org.milkteamc.autotreechop.spigot.utils.EffectUtils;
+import org.milkteamc.autotreechop.spigot.utils.PermissionUtils;
+import org.milkteamc.autotreechop.spigot.utils.TreeChopUtils;
 
 import java.io.File;
 import java.util.*;
@@ -129,11 +131,11 @@ public void onEnable() {
         getServer().getPluginManager().registerEvents(this, this);
 
         // Register command and tab completer
-        org.milkteamc.autotreechop.command.Command command = new org.milkteamc.autotreechop.command.Command(this);
+        Command command = new Command(this);
         getCommand("autotreechop").setExecutor(command);
         getCommand("atc").setExecutor(command);
-        getCommand("autotreechop").setTabCompleter(new org.milkteamc.autotreechop.command.TabCompleter());
-        getCommand("atc").setTabCompleter(new org.milkteamc.autotreechop.command.TabCompleter());
+        getCommand("autotreechop").setTabCompleter(new TabCompleter());
+        getCommand("atc").setTabCompleter(new TabCompleter());
 
         translations = BukkitTinyTranslations.application(this);
         translations.setMessageStorage(new PropertiesMessageStorage(new File(getDataFolder(), "/lang/")));

src/main/java/org/milkteamc/autotreechop/AutoTreeChopAPI.java → autotreechop-spigot/src/main/java/org/milkteamc/autotreechop/spigot/AutoTreeChopAPI.java

@@ -1,4 +1,4 @@
-package org.milkteamc.autotreechop;
+package org.milkteamc.autotreechop.spigot;
 
 import org.bukkit.entity.Player;
 

src/main/java/org/milkteamc/autotreechop/AutoTreeChopExpansion.java → autotreechop-spigot/src/main/java/org/milkteamc/autotreechop/spigot/AutoTreeChopExpansion.java

@@ -1,4 +1,4 @@
-package org.milkteamc.autotreechop;
+package org.milkteamc.autotreechop.spigot;
 
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import org.bukkit.entity.Player;

src/main/java/org/milkteamc/autotreechop/Config.java → autotreechop-spigot/src/main/java/org/milkteamc/autotreechop/spigot/Config.java

@@ -1,4 +1,4 @@
-package org.milkteamc.autotreechop;
+package org.milkteamc.autotreechop.spigot;
 
 import org.bukkit.Material;
 import org.bukkit.configuration.file.FileConfiguration;

src/main/java/org/milkteamc/autotreechop/Metrics.java → autotreechop-spigot/src/main/java/org/milkteamc/autotreechop/spigot/Metrics.java

@@ -12,7 +12,7 @@
  *
  * Violations will result in a ban of your plugin and account from bStats.
  */
-package org.milkteamc.autotreechop;
+package org.milkteamc.autotreechop.spigot;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;

src/main/java/org/milkteamc/autotreechop/PlayerConfig.java → autotreechop-spigot/src/main/java/org/milkteamc/autotreechop/spigot/PlayerConfig.java

@@ -1,4 +1,4 @@
-package org.milkteamc.autotreechop;
+package org.milkteamc.autotreechop.spigot;
 
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;

src/main/java/org/milkteamc/autotreechop/command/Command.java → autotreechop-spigot/src/main/java/org/milkteamc/autotreechop/spigot/command/Command.java

@@ -1,18 +1,18 @@
-package org.milkteamc.autotreechop.command;
+package org.milkteamc.autotreechop.spigot.command;
 
 import de.cubbossa.tinytranslations.BukkitTinyTranslations;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
-import org.milkteamc.autotreechop.AutoTreeChop;
-import org.milkteamc.autotreechop.Config;
-import org.milkteamc.autotreechop.PlayerConfig;
+import org.milkteamc.autotreechop.spigot.AutoTreeChop;
+import org.milkteamc.autotreechop.spigot.Config;
+import org.milkteamc.autotreechop.spigot.PlayerConfig;
 
 import java.util.UUID;
 
-import static org.milkteamc.autotreechop.AutoTreeChop.*;
+import static org.milkteamc.autotreechop.spigot.AutoTreeChop.*;
 
 public class Command implements CommandExecutor {
 

src/main/java/org/milkteamc/autotreechop/command/TabCompleter.java → autotreechop-spigot/src/main/java/org/milkteamc/autotreechop/spigot/command/TabCompleter.java

@@ -1,5 +1,5 @@
 // TabCompleter Class
-package org.milkteamc.autotreechop.command;
+package org.milkteamc.autotreechop.spigot.command;
 
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;

src/main/java/org/milkteamc/autotreechop/hooks/GriefPreventionHook.java → autotreechop-spigot/src/main/java/org/milkteamc/autotreechop/spigot/hooks/GriefPreventionHook.java

@@ -1,4 +1,4 @@
-package org.milkteamc.autotreechop.hooks;
+package org.milkteamc.autotreechop.spigot.hooks;
 
 import me.ryanhamshire.GriefPrevention.Claim;
 import me.ryanhamshire.GriefPrevention.ClaimPermission;

src/main/java/org/milkteamc/autotreechop/hooks/LandsHook.java → autotreechop-spigot/src/main/java/org/milkteamc/autotreechop/spigot/hooks/LandsHook.java

@@ -1,4 +1,4 @@
-package org.milkteamc.autotreechop.hooks;
+package org.milkteamc.autotreechop.spigot.hooks;
 
 import me.angeschossen.lands.api.LandsIntegration;
 import me.angeschossen.lands.api.land.LandWorld;

src/main/java/org/milkteamc/autotreechop/hooks/ResidenceHook.java → autotreechop-spigot/src/main/java/org/milkteamc/autotreechop/spigot/hooks/ResidenceHook.java

@@ -1,4 +1,4 @@
-package org.milkteamc.autotreechop.hooks;
+package org.milkteamc.autotreechop.spigot.hooks;
 
 import com.bekvon.bukkit.residence.api.ResidenceApi;
 import com.bekvon.bukkit.residence.containers.Flags;

src/main/java/org/milkteamc/autotreechop/hooks/WorldGuardHook.java → autotreechop-spigot/src/main/java/org/milkteamc/autotreechop/spigot/hooks/WorldGuardHook.java

@@ -1,4 +1,4 @@
-package org.milkteamc.autotreechop.hooks;
+package org.milkteamc.autotreechop.spigot.hooks;
 
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldguard.LocalPlayer;

src/main/java/org/milkteamc/autotreechop/utils/CooldownManager.java → autotreechop-spigot/src/main/java/org/milkteamc/autotreechop/spigot/utils/CooldownManager.java

@@ -1,8 +1,8 @@
-package org.milkteamc.autotreechop.utils;
+package org.milkteamc.autotreechop.spigot.utils;
 
 import org.bukkit.entity.Player;
-import org.milkteamc.autotreechop.AutoTreeChop;
-import org.milkteamc.autotreechop.Config;
+import org.milkteamc.autotreechop.spigot.AutoTreeChop;
+import org.milkteamc.autotreechop.spigot.Config;
 
 import java.util.HashMap;
 import java.util.UUID;

src/main/java/org/milkteamc/autotreechop/utils/EffectUtils.java → autotreechop-spigot/src/main/java/org/milkteamc/autotreechop/spigot/utils/EffectUtils.java

@@ -1,12 +1,12 @@
-package org.milkteamc.autotreechop.utils;
+package org.milkteamc.autotreechop.spigot.utils;
 
 import de.cubbossa.tinytranslations.Message;
 import org.bukkit.Color;
 import org.bukkit.Particle;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 
-import static org.milkteamc.autotreechop.AutoTreeChop.sendMessage;
+import static org.milkteamc.autotreechop.spigot.AutoTreeChop.sendMessage;
 
 public class EffectUtils {
 

src/main/java/org/milkteamc/autotreechop/utils/PermissionUtils.java → autotreechop-spigot/src/main/java/org/milkteamc/autotreechop/spigot/utils/PermissionUtils.java

@@ -1,8 +1,8 @@
-package org.milkteamc.autotreechop.utils;
+package org.milkteamc.autotreechop.spigot.utils;
 
 import org.bukkit.entity.Player;
-import org.milkteamc.autotreechop.Config;
-import org.milkteamc.autotreechop.PlayerConfig;
+import org.milkteamc.autotreechop.spigot.Config;
+import org.milkteamc.autotreechop.spigot.PlayerConfig;
 
 public class PermissionUtils {
 

src/main/java/org/milkteamc/autotreechop/utils/TreeChopUtils.java → autotreechop-spigot/src/main/java/org/milkteamc/autotreechop/spigot/utils/TreeChopUtils.java

@@ -1,4 +1,4 @@
-package org.milkteamc.autotreechop.utils;
+package org.milkteamc.autotreechop.spigot.utils;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -9,17 +9,17 @@
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
-import org.milkteamc.autotreechop.AutoTreeChop;
-import org.milkteamc.autotreechop.Config;
-import org.milkteamc.autotreechop.PlayerConfig;
-import org.milkteamc.autotreechop.hooks.GriefPreventionHook;
-import org.milkteamc.autotreechop.hooks.LandsHook;
-import org.milkteamc.autotreechop.hooks.ResidenceHook;
-import org.milkteamc.autotreechop.hooks.WorldGuardHook;
+import org.milkteamc.autotreechop.spigot.AutoTreeChop;
+import org.milkteamc.autotreechop.spigot.Config;
+import org.milkteamc.autotreechop.spigot.PlayerConfig;
+import org.milkteamc.autotreechop.spigot.hooks.GriefPreventionHook;
+import org.milkteamc.autotreechop.spigot.hooks.LandsHook;
+import org.milkteamc.autotreechop.spigot.hooks.ResidenceHook;
+import org.milkteamc.autotreechop.spigot.hooks.WorldGuardHook;
 
 import java.util.Set;
 
-import static org.milkteamc.autotreechop.AutoTreeChop.sendMessage;
+import static org.milkteamc.autotreechop.spigot.AutoTreeChop.sendMessage;
 
 public class TreeChopUtils {
 

src/main/resources/plugin.yml → autotreechop-spigot/src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: AutoTreeChop
 version: '${version}'
-main: org.milkteamc.autotreechop.AutoTreeChop
+main: org.milkteamc.autotreechop.spigot.AutoTreeChop
 api-version: 1.17
 author: Maoyue
 description: A auto tree chopping plugin for milkteamc