Dev/feature - Future Feature Release

build.gradle.kts

@@ -46,7 +46,7 @@ dependencies {
     compileOnly("com.github.SkriptLang:Skript:2.15.0")
 
     // SkriptRegistration
-    implementation("com.github.ShaneBeee:SkriptRegistration:1.2.0")
+    implementation("com.github.ShaneBeee:SkriptRegistration:1.4.3")
 
     // commons-io
     compileOnly("commons-io:commons-io:2.14.0")

src/main/java/com/shanebeestudios/skbee/SkBee.java

@@ -2,17 +2,17 @@
 
 import ch.njol.skript.test.runner.TestMode;
 import ch.njol.skript.util.Version;
+import com.github.shanebeee.skr.scheduling.TaskUtils;
 import com.shanebeestudios.skbee.api.bound.Bound;
 import com.shanebeestudios.skbee.api.bound.BoundConfig;
-import com.shanebeestudios.skbee.api.command.SkBeeInfo;
-import com.shanebeestudios.skbee.api.region.TaskUtils;
+import com.shanebeestudios.skbee.api.command.SkBeeCommand;
 import com.shanebeestudios.skbee.api.structure.StructureManager;
 import com.shanebeestudios.skbee.api.util.Util;
 import com.shanebeestudios.skbee.api.util.update.UpdateChecker;
+import com.shanebeestudios.skbee.api.worldgen.BeeWorldConfig;
 import com.shanebeestudios.skbee.api.wrapper.LazyLocation;
 import com.shanebeestudios.skbee.config.Config;
 import com.shanebeestudios.skbee.config.SkBeeMetrics;
-import com.shanebeestudios.skbee.api.worldgen.BeeWorldConfig;
 import com.shanebeestudios.vf.api.VirtualFurnaceAPI;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.serialization.ConfigurationSerialization;
@@ -63,7 +63,7 @@ public void onEnable() {
         // Check if SkriptAddon can actually load
         this.properlyEnabled = this.addonLoader.canLoadPlugin();
 
-        registerCommand("skbee", new SkBeeInfo(this));
+        SkBeeCommand.registerCommand(this);
         SkBeeMetrics.loadMetrics(this, this.properlyEnabled, skBeeVersion);
 
         // Beta check + notice

src/main/java/com/shanebeestudios/skbee/api/bound/BoundConfig.java

@@ -3,8 +3,8 @@
 import ch.njol.skript.Skript;
 import ch.njol.skript.test.runner.TestMode;
 import com.shanebeestudios.skbee.SkBee;
-import com.shanebeestudios.skbee.api.region.TaskUtils;
-import com.shanebeestudios.skbee.api.region.scheduler.Scheduler;
+import com.github.shanebeee.skr.scheduling.TaskUtils;
+import com.github.shanebeee.skr.scheduling.scheduler.Scheduler;
 import org.bukkit.Location;
 import org.bukkit.NamespacedKey;
 import org.bukkit.World;

src/main/java/com/shanebeestudios/skbee/api/command/SkBeeCommand.java

@@ -0,0 +1,97 @@
+package com.shanebeestudios.skbee.api.command;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.SkriptUpdater;
+import com.github.shanebeee.skr.JsonDocGenerator;
+import com.mojang.brigadier.Command;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.shanebeestudios.skbee.SkBee;
+import com.shanebeestudios.skbee.api.util.Util;
+import com.shanebeestudios.skbee.config.Config;
+import io.papermc.paper.command.brigadier.CommandSourceStack;
+import io.papermc.paper.command.brigadier.Commands;
+import io.papermc.paper.plugin.configuration.PluginMeta;
+import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+
+import static com.shanebeestudios.skbee.api.util.Util.sendColMsg;
+
+public class SkBeeCommand {
+
+    public static void registerCommand(SkBee plugin) {
+        Config config = plugin.getPluginConfig();
+
+        LiteralArgumentBuilder<CommandSourceStack> command = Commands.literal("skbee")
+            .requires(context -> context.getSender().hasPermission("skbee.command"))
+            .then(Commands.literal("info")
+                .executes(context -> {
+                    info(context.getSource().getSender(), plugin);
+                    return Command.SINGLE_SUCCESS;
+                }))
+            .then(Commands.literal("debug")
+                .then(Commands.literal("enable")
+                    .executes(context -> {
+                        Util.sendMiniPrefixed(context.getSource().getSender(), "Debug mode is now <green>enabled!");
+                        config.settings_debug = true;
+                        return Command.SINGLE_SUCCESS;
+                    }))
+                .then(Commands.literal("disable")
+                    .executes(context -> {
+                        Util.sendMiniPrefixed(context.getSource().getSender(), "Debug mode is now <red>disabled!");
+                        config.settings_debug = false;
+                        return Command.SINGLE_SUCCESS;
+                    }))
+                .executes(context -> {
+                    String enabled = config.settings_debug ? "<green>enabled" : "<red>disabled";
+                    Util.sendMiniPrefixed(context.getSource().getSender(), "Debug mode is currently %s", enabled);
+                    return Command.SINGLE_SUCCESS;
+                }))
+            .then(Commands.literal("docs")
+                .executes(context -> {
+                    JsonDocGenerator docs = new JsonDocGenerator(plugin, plugin.getAddonLoader().getRegistration());
+                    docs.generateDocs();
+                    return Command.SINGLE_SUCCESS;
+                }));
+
+        plugin.getLifecycleManager().registerEventHandler(LifecycleEvents.COMMANDS, commands -> {
+            commands.registrar().register(command.build());
+        });
+    }
+
+    private static void info(CommandSender sender, SkBee plugin) {
+        PluginMeta pluginMeta = plugin.getPluginMeta();
+        sendColMsg(sender, "&7--- [&bSkBee Loading Info&7] ---");
+
+        // SkBee element info
+        Util.getDebugs().forEach(debug -> sendColMsg(sender, "- &7" + debug));
+        sendColMsg(sender, "&7--- [&bServer Info&7] ---");
+
+        // Server version
+        sendColMsg(sender, "&7Server Version: &b" + Bukkit.getName() + " " + Bukkit.getVersion());
+
+        // Skript version
+        SkriptUpdater updater = Skript.getInstance().getUpdater();
+        String flavor = "&cunknown-flavor";
+        if (updater != null) {
+            flavor = updater.getCurrentRelease().flavor;
+            if (flavor.equalsIgnoreCase("skriptlang-github")) flavor = "&a" + flavor;
+            else flavor = "&e" + flavor;
+        }
+        sendColMsg(sender, "&7Skript Version: &b%s &7(%s&7)", Skript.getVersion(), flavor);
+
+        // Addon versions
+        sendColMsg(sender, "&7Skript Addons:");
+        Skript.getAddons().forEach(addon -> {
+            String name = addon.getName();
+            if (!name.contains("SkBee")) {
+                sendColMsg(sender, "&7- &b" + name + " v" + addon.plugin.getPluginMeta().getVersion());
+            }
+        });
+
+        // SkBee info
+        sendColMsg(sender, "&7SkBee Version: &b" + pluginMeta.getVersion());
+        sendColMsg(sender, "&7SkBee Website: &b" + pluginMeta.getWebsite());
+    }
+
+}

src/main/java/com/shanebeestudios/skbee/api/fastboard/FastBoardManager.java

@@ -1,7 +1,7 @@
 package com.shanebeestudios.skbee.api.fastboard;
 
 import com.shanebeestudios.skbee.SkBee;
-import com.shanebeestudios.skbee.api.region.TaskUtils;
+import com.github.shanebeee.skr.scheduling.TaskUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

src/main/java/com/shanebeestudios/skbee/api/listener/BoundBorderListener.java

@@ -5,7 +5,7 @@
 import com.shanebeestudios.skbee.api.bound.BoundConfig;
 import com.shanebeestudios.skbee.api.event.bound.BoundEnterEvent;
 import com.shanebeestudios.skbee.api.event.bound.BoundExitEvent;
-import com.shanebeestudios.skbee.api.region.TaskUtils;
+import com.github.shanebeee.skr.scheduling.TaskUtils;
 import com.shanebeestudios.skbee.config.Config;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;