moved authlogin to bukkit

leaderos-net · Oct 12, 2023 · 29cee5c · 29cee5c
1 parent 5e37147
commit 29cee5c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 53 deletions.
diff --git a/bukkit/src/main/java/net/leaderos/plugin/Main.java b/bukkit/src/main/java/net/leaderos/plugin/Main.java
@@ -5,7 +5,6 @@
 import dev.triumphteam.cmd.core.message.MessageKey;
 import lombok.Getter;
 import net.leaderos.plugin.api.LeaderOSAPI;
-import net.leaderos.plugin.handlers.ModuleEvents;
 import net.leaderos.plugin.modules.credit.Credit;
 import net.leaderos.plugin.modules.voucher.Voucher;
 import net.leaderos.shared.Shared;
@@ -15,8 +14,7 @@
 import net.leaderos.plugin.modules.webstore.WebStore;
 import net.leaderos.shared.configuration.Data;
 import net.leaderos.shared.helpers.ChatUtil;
-import net.leaderos.shared.module.auth.AuthLogin;
-import org.bukkit.Bukkit;
+import net.leaderos.plugin.modules.auth.AuthLogin;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -67,9 +65,6 @@ public void onEnable() {
         commandManager = BukkitCommandManager.create(this);
         setupCommands();
         (voucherData = new Data("voucher_data.yml")).create();
-
-        // Loads module events
-        Bukkit.getPluginManager().registerEvents(new ModuleEvents(), Main.getInstance());
         // Loads modules
         LeaderOSAPI.getModuleManager().registerModule(new AuthLogin());
         LeaderOSAPI.getModuleManager().registerModule(new Cache());

diff --git a/bukkit/src/main/java/net/leaderos/plugin/handlers/ModuleEvents.java b/bukkit/src/main/java/net/leaderos/plugin/handlers/ModuleEvents.java
diff --git a/...eaderos/shared/module/auth/AuthLogin.java → ...aderos/plugin/modules/auth/AuthLogin.java b/...eaderos/shared/module/auth/AuthLogin.java → ...aderos/plugin/modules/auth/AuthLogin.java
@@ -1,5 +1,7 @@
-package net.leaderos.shared.module.auth;
+package net.leaderos.plugin.modules.auth;
 
+import net.leaderos.plugin.Main;
+import net.leaderos.plugin.modules.auth.commands.Commands;
 import net.leaderos.shared.Shared;
 import net.leaderos.shared.helpers.ChatUtil;
 import net.leaderos.shared.helpers.MDChat.MDChatAPI;
@@ -24,12 +26,16 @@ public class AuthLogin extends LeaderOSModule {
     /**
      * onEnable method of module
      */
-    public void onEnable() {}
+    public void onEnable() {
+        Main.getCommandManager().registerCommand(new Commands());
+    }
 
     /**
      * onDisable method of module
      */
-    public void onDisable() {}
+    public void onDisable() {
+        Main.getCommandManager().unregisterCommand(new Commands());
+    }
 
 
     /**

diff --git a/...red/module/auth/commands/AuthCommand.java → ...lugin/modules/auth/commands/Commands.java b/...red/module/auth/commands/AuthCommand.java → ...lugin/modules/auth/commands/Commands.java
@@ -1,11 +1,11 @@
-package net.leaderos.shared.module.auth.commands;
+package net.leaderos.plugin.modules.auth.commands;
 
 import dev.triumphteam.cmd.bukkit.annotation.Permission;
 import dev.triumphteam.cmd.core.BaseCommand;
 import dev.triumphteam.cmd.core.annotation.Command;
 import dev.triumphteam.cmd.core.annotation.Default;
 import lombok.RequiredArgsConstructor;
-import net.leaderos.shared.module.auth.AuthLogin;
+import net.leaderos.plugin.modules.auth.AuthLogin;
 import org.bukkit.entity.Player;
 
 /**
@@ -15,7 +15,7 @@
  */
 @RequiredArgsConstructor
 @Command(value = "auth", alias = {"authy", "kayit", "site", "web"})
-public class AuthCommand extends BaseCommand {
+public class Commands extends BaseCommand {
 
     /**
      * Default command of auth

diff --git a/bukkit/src/main/java/net/leaderos/plugin/modules/webstore/gui/WebStoreGui.java b/bukkit/src/main/java/net/leaderos/plugin/modules/webstore/gui/WebStoreGui.java
@@ -10,7 +10,7 @@
 import net.leaderos.plugin.modules.webstore.model.Product;
 import net.leaderos.shared.helpers.ChatUtil;
 import net.leaderos.plugin.helpers.GuiHelper;
-import net.leaderos.shared.module.auth.AuthLogin;
+import net.leaderos.plugin.modules.auth.AuthLogin;
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;