From c2a48b35ad875639c042144bb742e68c2e6f75fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C4=B1rat=20Kaya?= <48600092+benfiratkaya@users.noreply.github.com> Date: Sat, 11 Jan 2025 17:07:25 +0300 Subject: [PATCH] 1.1.7: updated for new api --- .../main/java/net/leaderos/plugin/Bukkit.java | 2 - .../plugin/configuration/Language.java | 34 +----- .../plugin/configuration/Modules.java | 21 ---- .../plugin/configuration/lang/en.java | 34 +----- .../plugin/configuration/lang/tr.java | 36 +----- .../plugin/modules/auth/AuthModule.java | 33 ----- .../modules/auth/commands/AuthCommand.java | 53 -------- .../bazaar/commands/BazaarCommand.java | 9 +- .../modules/discord/commands/SyncCommand.java | 19 ++- .../modules/donations/DonationsModule.java | 7 +- .../donations/managers/DonationManager.java | 2 +- .../modules/donations/model/Donation.java | 5 + .../webstore/helpers/WebStoreHelper.java | 16 +-- bukkit/src/main/resources/plugin.yml | 2 - .../main/java/net/leaderos/bungee/Bungee.java | 2 - .../bungee/configuration/Language.java | 27 ----- .../bungee/configuration/Modules.java | 21 ---- .../bungee/configuration/lang/en.java | 27 ----- .../bungee/configuration/lang/tr.java | 27 ----- .../bungee/modules/auth/AuthModule.java | 86 ------------- .../modules/auth/commands/AuthCommand.java | 41 ------- .../bungee/modules/discord/DiscordModule.java | 17 ++- .../net/leaderos/shared/model/Request.java | 2 +- .../model/request/impl/auth/AuthRequest.java | 17 --- .../impl/bazaar/AddBazaarItemRequest.java | 1 - .../impl/credit/AddCreditsRequest.java | 5 +- .../impl/credit/GetCreditsRequest.java | 2 +- .../impl/credit/RemoveCreditsRequest.java | 5 +- .../impl/credit/SendCreditsRequest.java | 7 +- .../impl/credit/SetCreditsRequest.java | 5 +- .../impl/discord/DiscordSyncRequest.java | 14 --- .../model/request/impl/store/BuyRequest.java | 4 +- .../request/impl/store/ListingRequest.java | 2 +- .../request/impl/user/GetUserRequest.java | 4 +- .../shared/modules/auth/AuthHelper.java | 43 ------- .../shared/modules/discord/DiscordHelper.java | 41 ------- .../java/net/leaderos/velocity/Velocity.java | 2 - .../leaderos/velocity/api/ModuleManager.java | 2 - .../velocity/configuration/Language.java | 32 ----- .../velocity/configuration/Modules.java | 21 ---- .../velocity/configuration/lang/en.java | 32 ----- .../velocity/configuration/lang/tr.java | 32 ----- .../velocity/modules/auth/AuthModule.java | 113 ------------------ .../modules/auth/commands/AuthCommand.java | 33 ----- .../modules/discord/DiscordModule.java | 31 ++--- 45 files changed, 72 insertions(+), 899 deletions(-) delete mode 100644 bukkit/src/main/java/net/leaderos/plugin/modules/auth/AuthModule.java delete mode 100644 bukkit/src/main/java/net/leaderos/plugin/modules/auth/commands/AuthCommand.java delete mode 100644 bungee/src/main/java/net/leaderos/bungee/modules/auth/AuthModule.java delete mode 100644 bungee/src/main/java/net/leaderos/bungee/modules/auth/commands/AuthCommand.java delete mode 100644 shared/src/main/java/net/leaderos/shared/model/request/impl/auth/AuthRequest.java delete mode 100644 shared/src/main/java/net/leaderos/shared/model/request/impl/discord/DiscordSyncRequest.java delete mode 100644 shared/src/main/java/net/leaderos/shared/modules/auth/AuthHelper.java delete mode 100644 shared/src/main/java/net/leaderos/shared/modules/discord/DiscordHelper.java delete mode 100644 velocity/src/main/java/net/leaderos/velocity/modules/auth/AuthModule.java delete mode 100644 velocity/src/main/java/net/leaderos/velocity/modules/auth/commands/AuthCommand.java diff --git a/bukkit/src/main/java/net/leaderos/plugin/Bukkit.java b/bukkit/src/main/java/net/leaderos/plugin/Bukkit.java index 7e34d0aeea..1c302598a2 100644 --- a/bukkit/src/main/java/net/leaderos/plugin/Bukkit.java +++ b/bukkit/src/main/java/net/leaderos/plugin/Bukkit.java @@ -14,7 +14,6 @@ import net.leaderos.plugin.configuration.Modules; import net.leaderos.plugin.helpers.ChatUtil; import net.leaderos.plugin.helpers.DebugBukkit; -import net.leaderos.plugin.modules.auth.AuthModule; import net.leaderos.plugin.modules.bazaar.BazaarModule; import net.leaderos.plugin.modules.cache.CacheModule; import net.leaderos.plugin.modules.connect.ConnectModule; @@ -100,7 +99,6 @@ public void onEnable() { setupCommands(); // Loads modules - LeaderOSAPI.getModuleManager().registerModule(new AuthModule()); LeaderOSAPI.getModuleManager().registerModule(new DiscordModule()); LeaderOSAPI.getModuleManager().registerModule(new CacheModule()); LeaderOSAPI.getModuleManager().registerModule(new CreditModule()); diff --git a/bukkit/src/main/java/net/leaderos/plugin/configuration/Language.java b/bukkit/src/main/java/net/leaderos/plugin/configuration/Language.java index bbf35c715f..d3c1f8b202 100644 --- a/bukkit/src/main/java/net/leaderos/plugin/configuration/Language.java +++ b/bukkit/src/main/java/net/leaderos/plugin/configuration/Language.java @@ -56,6 +56,8 @@ public static class Messages extends OkaeriConfig { private String haveRequestOngoing = "&cPlease wait for your current request to be done!"; + private String registrationRequired = "{prefix} &cYou must register on the website for this action!"; + /** * Help commands message */ @@ -157,33 +159,6 @@ public static class Command extends OkaeriConfig { } - /** - * Auth messages - */ - private Auth auth = new Auth(); - - /** - * Auth messages of plugin - */ - @Getter @Setter - public static class Auth extends OkaeriConfig { - - /** - * Command Message - */ - private String commandMessage = "{prefix} <&aClick here for authentication!{&eClick Me!}(open_url:%link%)>"; - - /** - * Module error message - */ - private String moduleError = "{prefix} <&cThis system require you to login website, click here!{&eClick Me!}(open_url:%link%)>"; - - /** - * error on auth link - */ - private String noLink = "{prefix} &cAn error occurred while connecting web-server. Please visit our website."; - } - /** * Discord messages */ @@ -446,11 +421,6 @@ public static class WebStoreGui extends OkaeriConfig { */ private String buyWebStoreError = "&cAn error occurred during the purchase process!"; - /** - * register website for this action - */ - private String buyWebStoreNoAuthLinkError = "{prefix} &cYou must register on the website for this action!"; - /** * Default Category attributes */ diff --git a/bukkit/src/main/java/net/leaderos/plugin/configuration/Modules.java b/bukkit/src/main/java/net/leaderos/plugin/configuration/Modules.java index 082fedf444..20b21d372b 100644 --- a/bukkit/src/main/java/net/leaderos/plugin/configuration/Modules.java +++ b/bukkit/src/main/java/net/leaderos/plugin/configuration/Modules.java @@ -20,27 +20,6 @@ @Setter @Names(strategy = NameStrategy.IDENTITY) public class Modules extends OkaeriConfig { - - /** - * Auth system - */ - private Auth Auth = new Auth(); - - /** - * Auth module settings - * - * @since 1.0 - * @author poyrazinan - */ - @Getter - @Setter - public static class Auth extends OkaeriConfig { - /** - * Status of Auth mode - */ - private boolean status = false; - } - /** * Discord module */ diff --git a/bukkit/src/main/java/net/leaderos/plugin/configuration/lang/en.java b/bukkit/src/main/java/net/leaderos/plugin/configuration/lang/en.java index 72a6c7932d..abc2ae3b8f 100644 --- a/bukkit/src/main/java/net/leaderos/plugin/configuration/lang/en.java +++ b/bukkit/src/main/java/net/leaderos/plugin/configuration/lang/en.java @@ -56,6 +56,8 @@ public static class Messages extends Language.Messages { private String haveRequestOngoing = "&cPlease wait for your current request to be done!"; + private String registrationRequired = "{prefix} &cYou must register on the website for this action!"; + /** * Help commands message */ @@ -157,33 +159,6 @@ public static class Command extends Language.Messages.Command { } - /** - * Auth messages - */ - private Auth auth = new Auth(); - - /** - * Auth messages of plugin - */ - @Getter @Setter - public static class Auth extends Language.Messages.Auth { - - /** - * Command Message - */ - private String commandMessage = "{prefix} <&aClick here for authentication!{&eClick Me!}(open_url:%link%)>"; - - /** - * Module error message - */ - private String moduleError = "{prefix} <&cThis system require you to login website, click here!{&eClick Me!}(open_url:%link%)>"; - - /** - * error on auth link - */ - private String noLink = "{prefix} &cAn error occurred while connecting web-server. Please visit our website."; - } - /** * Discord messages */ @@ -446,11 +421,6 @@ public static class WebStoreGui extends Language.Gui.WebStoreGui { */ private String buyWebStoreError = "&cAn error occurred during the purchase process!"; - /** - * register website for this action - */ - private String buyWebStoreNoAuthLinkError = "{prefix} &cYou must register on the website for this action!"; - /** * Default Category attributes */ diff --git a/bukkit/src/main/java/net/leaderos/plugin/configuration/lang/tr.java b/bukkit/src/main/java/net/leaderos/plugin/configuration/lang/tr.java index 96cee2f1b2..10353b8c7a 100644 --- a/bukkit/src/main/java/net/leaderos/plugin/configuration/lang/tr.java +++ b/bukkit/src/main/java/net/leaderos/plugin/configuration/lang/tr.java @@ -54,7 +54,9 @@ public static class Messages extends Language.Messages { private String cannotCreateFull = "{prefix} &cEnvanterinde yeterli boşluk bulunmamakta, lütfen envanterini boşalt ve tekrar dene."; - private String haveRequestOngoing = "&cLütfen şu anki işleminin bitmesini bekle!"; + private String haveRequestOngoing = "&cLütfen şu anki işleminin bitmesini bekleyiniz."; + + private String registrationRequired = "{prefix} &cBu işlemi yapabilmek için siteye kayıt olmalısın!"; /** * Help commands message @@ -157,33 +159,6 @@ public static class Command extends Language.Messages.Command { } - /** - * Auth messages - */ - private Auth auth = new Auth(); - - /** - * Auth messages of plugin - */ - @Getter @Setter - public static class Auth extends Language.Messages.Auth { - - /** - * Command Message - */ - private String commandMessage = "{prefix} <&aHesabını eşlemek için tıkla!{&eTıkla!}(open_url:%link%)>"; - - /** - * Module error message - */ - private String moduleError = "{prefix} <&cBu sistem siteye girişi gerektirmektedir. Giriş yapmak için tıkla!{&eTıkla!}(open_url:%link%)>"; - - /** - * error on auth link - */ - private String noLink = "{prefix} &cSunucuya bağlanırken hata oluştu."; - } - /** * Discord messages */ @@ -444,11 +419,6 @@ public static class WebStoreGui extends Language.Gui.WebStoreGui { */ private String buyWebStoreError = "&cSatın alım hatası."; - /** - * register website for this action - */ - private String buyWebStoreNoAuthLinkError = "{prefix} &cBu işlemi yapabilmek için siteye kayıt olmalısın."; - /** * Default Category attributes */ diff --git a/bukkit/src/main/java/net/leaderos/plugin/modules/auth/AuthModule.java b/bukkit/src/main/java/net/leaderos/plugin/modules/auth/AuthModule.java deleted file mode 100644 index 79320326d7..0000000000 --- a/bukkit/src/main/java/net/leaderos/plugin/modules/auth/AuthModule.java +++ /dev/null @@ -1,33 +0,0 @@ -package net.leaderos.plugin.modules.auth; - -import net.leaderos.plugin.Bukkit; -import net.leaderos.plugin.modules.auth.commands.AuthCommand; -import net.leaderos.shared.modules.LeaderOSModule; - -/** - * Auth module of leaderos-plugin - * - * @author poyrazinan - * @since 1.0 - */ -public class AuthModule extends LeaderOSModule { - - /** - * onEnable method of module - */ - public void onEnable() { - Bukkit.getCommandManager().registerCommand(new AuthCommand()); - } - - /** - * onDisable method of module - */ - public void onDisable() { - Bukkit.getCommandManager().unregisterCommand(new AuthCommand()); - } - - /** - * Constructor of Auth - */ - public AuthModule() {} -} diff --git a/bukkit/src/main/java/net/leaderos/plugin/modules/auth/commands/AuthCommand.java b/bukkit/src/main/java/net/leaderos/plugin/modules/auth/commands/AuthCommand.java deleted file mode 100644 index 98a57e5262..0000000000 --- a/bukkit/src/main/java/net/leaderos/plugin/modules/auth/commands/AuthCommand.java +++ /dev/null @@ -1,53 +0,0 @@ -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.plugin.Bukkit; -import net.leaderos.plugin.helpers.ChatUtil; -import net.leaderos.plugin.helpers.MDChat.MDChatAPI; -import net.leaderos.shared.helpers.RequestUtil; -import net.leaderos.shared.modules.auth.AuthHelper; -import org.bukkit.entity.Player; - -/** - * Auth commands - * @author poyrazinan - * @since 1.0 - */ -@RequiredArgsConstructor -@Command(value = "auth") -public class AuthCommand extends BaseCommand { - - /** - * Default command of auth - * @param player executor - */ - @Default - @Permission("leaderos.auth") - public void defaultCommand(Player player) { - if (!RequestUtil.canRequest(player.getUniqueId())) { - ChatUtil.sendMessage(player, Bukkit.getInstance().getLangFile().getMessages().getHaveRequestOngoing()); - return; - } - - RequestUtil.addRequest(player.getUniqueId()); - - org.bukkit.Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getInstance(), () -> { - String link = AuthHelper.getAuthLink(player.getName(), player.getUniqueId()); - if (link != null) - player.spigot().sendMessage( - MDChatAPI.getFormattedMessage(ChatUtil.color(Bukkit.getInstance() - .getLangFile().getMessages() - .getAuth().getCommandMessage() - .replace("%link%", link) - .replace("{prefix}", Bukkit.getInstance().getLangFile().getMessages().getPrefix())))); - else - ChatUtil.sendMessage(player, Bukkit.getInstance().getLangFile().getMessages().getAuth().getNoLink()); - - RequestUtil.invalidate(player.getUniqueId()); - }); - } -} \ No newline at end of file diff --git a/bukkit/src/main/java/net/leaderos/plugin/modules/bazaar/commands/BazaarCommand.java b/bukkit/src/main/java/net/leaderos/plugin/modules/bazaar/commands/BazaarCommand.java index 0c61ff72d7..3e25fd14b7 100644 --- a/bukkit/src/main/java/net/leaderos/plugin/modules/bazaar/commands/BazaarCommand.java +++ b/bukkit/src/main/java/net/leaderos/plugin/modules/bazaar/commands/BazaarCommand.java @@ -5,7 +5,9 @@ import dev.triumphteam.cmd.core.annotation.Command; import dev.triumphteam.cmd.core.annotation.Default; import lombok.RequiredArgsConstructor; +import net.leaderos.plugin.Bukkit; import net.leaderos.plugin.api.managers.ModuleManager; +import net.leaderos.plugin.helpers.ChatUtil; import net.leaderos.plugin.modules.cache.model.User; import net.leaderos.plugin.modules.bazaar.gui.BazaarGui; import org.bukkit.entity.Player; @@ -26,7 +28,10 @@ public class BazaarCommand extends BaseCommand { @Default @Permission("leaderos.bazaar.open") public void defaultCommand(Player player) { - if (ModuleManager.getModule("Bazaar").isEnabled() && User.isPlayerAuthed(player)) - BazaarGui.showGui(player); + if (ModuleManager.getModule("Bazaar").isEnabled()) + if (User.isPlayerAuthed(player)) + BazaarGui.showGui(player); + else + ChatUtil.sendMessage(player, Bukkit.getInstance().getLangFile().getMessages().getRegistrationRequired()); } } diff --git a/bukkit/src/main/java/net/leaderos/plugin/modules/discord/commands/SyncCommand.java b/bukkit/src/main/java/net/leaderos/plugin/modules/discord/commands/SyncCommand.java index 3ff02f3069..36594f7ba8 100644 --- a/bukkit/src/main/java/net/leaderos/plugin/modules/discord/commands/SyncCommand.java +++ b/bukkit/src/main/java/net/leaderos/plugin/modules/discord/commands/SyncCommand.java @@ -8,8 +8,8 @@ import net.leaderos.plugin.Bukkit; import net.leaderos.plugin.helpers.ChatUtil; import net.leaderos.plugin.helpers.MDChat.MDChatAPI; +import net.leaderos.shared.Shared; import net.leaderos.shared.helpers.RequestUtil; -import net.leaderos.shared.modules.discord.DiscordHelper; import org.bukkit.entity.Player; /** @@ -36,16 +36,13 @@ public void defaultCommand(Player player) { RequestUtil.addRequest(player.getUniqueId()); org.bukkit.Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getInstance(), () -> { - String link = DiscordHelper.getSyncLink(player.getName()); - if (link != null) - player.spigot().sendMessage( - MDChatAPI.getFormattedMessage(ChatUtil.color(Bukkit.getInstance() - .getLangFile().getMessages() - .getDiscord().getCommandMessage() - .replace("%link%", link) - .replace("{prefix}", Bukkit.getInstance().getLangFile().getMessages().getPrefix())))); - else - ChatUtil.sendMessage(player, Bukkit.getInstance().getLangFile().getMessages().getDiscord().getNoLink()); + String link = Shared.getLink() + "/discord/link"; + player.spigot().sendMessage( + MDChatAPI.getFormattedMessage(ChatUtil.color(Bukkit.getInstance() + .getLangFile().getMessages() + .getDiscord().getCommandMessage() + .replace("%link%", link) + .replace("{prefix}", Bukkit.getInstance().getLangFile().getMessages().getPrefix())))); RequestUtil.invalidate(player.getUniqueId()); }); diff --git a/bukkit/src/main/java/net/leaderos/plugin/modules/donations/DonationsModule.java b/bukkit/src/main/java/net/leaderos/plugin/modules/donations/DonationsModule.java index 0ef02f4272..ecbb0a5484 100644 --- a/bukkit/src/main/java/net/leaderos/plugin/modules/donations/DonationsModule.java +++ b/bukkit/src/main/java/net/leaderos/plugin/modules/donations/DonationsModule.java @@ -17,7 +17,6 @@ import org.jetbrains.annotations.NotNull; import java.util.Objects; -import java.util.UUID; /** * Donations module main class @@ -61,7 +60,7 @@ public DonationsModule() {} // Player head collector ItemStack item = XMaterial.PLAYER_HEAD.parseItem(); assert item != null; - OfflinePlayer player = org.bukkit.Bukkit.getOfflinePlayer(donation.getUsername()); + OfflinePlayer player = org.bukkit.Bukkit.getOfflinePlayer(donation.getDisplayName()); SkullMeta meta; try { meta = (SkullMeta) XSkull.of(Objects.requireNonNull(item.getItemMeta())).profile(Profileable.of(player)).apply(); @@ -71,14 +70,14 @@ public DonationsModule() {} meta.setDisplayName(ChatUtil.replacePlaceholders( Bukkit.getInstance().getLangFile().getGui().getDonationsGui().getDisplayName(), new Placeholder("%i%", String.valueOf(donation.getRank())), - new Placeholder("%player%", donation.getUsername()), + new Placeholder("%player%", donation.getDisplayName()), new Placeholder("%amount%", String.valueOf(donation.getAmount())), new Placeholder("%symbol%", donation.getSymbol()) )); meta.setLore(ChatUtil.replacePlaceholders( Bukkit.getInstance().getLangFile().getGui().getDonationsGui().getLore(), new Placeholder("%i%", String.valueOf(donation.getRank())), - new Placeholder("%player%", donation.getUsername()), + new Placeholder("%player%", donation.getDisplayName()), new Placeholder("%amount%", String.valueOf(donation.getAmount())), new Placeholder("%symbol%", donation.getSymbol()) )); diff --git a/bukkit/src/main/java/net/leaderos/plugin/modules/donations/managers/DonationManager.java b/bukkit/src/main/java/net/leaderos/plugin/modules/donations/managers/DonationManager.java index f592af2899..4e23576b4b 100644 --- a/bukkit/src/main/java/net/leaderos/plugin/modules/donations/managers/DonationManager.java +++ b/bukkit/src/main/java/net/leaderos/plugin/modules/donations/managers/DonationManager.java @@ -110,7 +110,7 @@ private void loadDonationsData() { JSONArray data = recentDonationResponse.getResponseMessage().getJSONArray("array"); for (int i = 0; i < data.length(); i++) { JSONObject donation = (JSONObject) data.get(i); - donations.add(new Donation(i + 1, donation.getString("username"), donation.getDouble("raw_total"), donation.getString("currency"))); + donations.add(new Donation(i + 1, donation.getString("display_name"), donation.getString("username"), donation.getDouble("raw_total"), donation.getString("currency"))); } } } catch (IOException ignored) {} diff --git a/bukkit/src/main/java/net/leaderos/plugin/modules/donations/model/Donation.java b/bukkit/src/main/java/net/leaderos/plugin/modules/donations/model/Donation.java index 121e7dd8a4..d477760d26 100644 --- a/bukkit/src/main/java/net/leaderos/plugin/modules/donations/model/Donation.java +++ b/bukkit/src/main/java/net/leaderos/plugin/modules/donations/model/Donation.java @@ -18,6 +18,11 @@ public class Donation { */ private int rank; + /** + * Display Name data type of String + */ + private String displayName; + /** * Username data type of String */ diff --git a/bukkit/src/main/java/net/leaderos/plugin/modules/webstore/helpers/WebStoreHelper.java b/bukkit/src/main/java/net/leaderos/plugin/modules/webstore/helpers/WebStoreHelper.java index fe2869147e..26858513bc 100644 --- a/bukkit/src/main/java/net/leaderos/plugin/modules/webstore/helpers/WebStoreHelper.java +++ b/bukkit/src/main/java/net/leaderos/plugin/modules/webstore/helpers/WebStoreHelper.java @@ -8,13 +8,11 @@ import net.leaderos.plugin.modules.cache.model.User; import net.leaderos.shared.Shared; import net.leaderos.shared.error.Error; -import net.leaderos.shared.helpers.DebugAPI; import net.leaderos.shared.helpers.RequestUtil; import net.leaderos.shared.model.Response; import net.leaderos.shared.model.request.GetRequest; import net.leaderos.shared.model.request.impl.store.BuyRequest; import net.leaderos.shared.model.request.impl.store.ListingRequest; -import net.leaderos.shared.modules.auth.AuthHelper; import net.leaderos.shared.modules.credit.enums.UpdateType; import net.leaderos.plugin.modules.webstore.model.Category; import org.bukkit.entity.Player; @@ -77,19 +75,7 @@ else if (buyRequest.getError() == Error.REQUIRED_PRODUCT) } else { org.bukkit.Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getInstance(), () -> { - // If auth login is enabled - if (ModuleManager.getModuleStatus("Auth")) { - String authLink = AuthHelper.getAuthLink(player.getName(), player.getUniqueId()); - if (authLink != null) - player.spigot().sendMessage( - MDChatAPI.getFormattedMessage( - ChatUtil.color(Bukkit.getInstance().getLangFile().getMessages().getAuth().getModuleError() - .replace("%link%", authLink) - .replace("{prefix}", Bukkit.getInstance().getLangFile().getMessages().getPrefix())))); - } - // If cache not found and Auth is disabled situation - else - ChatUtil.sendMessage(player, Bukkit.getInstance().getLangFile().getGui().getWebStoreGui().getBuyWebStoreNoAuthLinkError()); + ChatUtil.sendMessage(player, Bukkit.getInstance().getLangFile().getMessages().getRegistrationRequired()); RequestUtil.invalidate(player.getUniqueId()); }); diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml index eeceef6923..f14acb95d9 100644 --- a/bukkit/src/main/resources/plugin.yml +++ b/bukkit/src/main/resources/plugin.yml @@ -15,8 +15,6 @@ commands: description: Voucher module command bazaar: description: bazaar default command - auth: - description: Connects your ingame account with website discord-sync: description: Sync your account with discord donations: diff --git a/bungee/src/main/java/net/leaderos/bungee/Bungee.java b/bungee/src/main/java/net/leaderos/bungee/Bungee.java index c71649544c..73ed6d9a45 100644 --- a/bungee/src/main/java/net/leaderos/bungee/Bungee.java +++ b/bungee/src/main/java/net/leaderos/bungee/Bungee.java @@ -10,7 +10,6 @@ import net.leaderos.bungee.configuration.Modules; import net.leaderos.bungee.helpers.ChatUtil; import net.leaderos.bungee.helpers.DebugBungee; -import net.leaderos.bungee.modules.auth.AuthModule; import net.leaderos.bungee.modules.connect.ConnectModule; import net.leaderos.bungee.modules.credit.CreditModule; import net.leaderos.bungee.modules.discord.DiscordModule; @@ -81,7 +80,6 @@ public void onEnable() { ) ; Bungee.getInstance().getProxy().getPluginManager().registerCommand(Bungee.getInstance(), new LeaderOSCommand("leaderos")); - getModuleManager().registerModule(new AuthModule()); getModuleManager().registerModule(new DiscordModule()); getModuleManager().registerModule(new CreditModule()); getModuleManager().registerModule(new ConnectModule()); diff --git a/bungee/src/main/java/net/leaderos/bungee/configuration/Language.java b/bungee/src/main/java/net/leaderos/bungee/configuration/Language.java index ded846dca4..a0cf60a7f1 100644 --- a/bungee/src/main/java/net/leaderos/bungee/configuration/Language.java +++ b/bungee/src/main/java/net/leaderos/bungee/configuration/Language.java @@ -147,33 +147,6 @@ public static class Command extends OkaeriConfig { } - /** - * Auth messages - */ - private Auth auth = new Auth(); - - /** - * Auth messages of plugin - */ - @Getter @Setter - public static class Auth extends OkaeriConfig { - - /** - * Command Message - */ - private String commandMessage = "{prefix} <&aClick here for authentication!{&eClick Me!}(open_url:%link%)>"; - - /** - * Module error message - */ - private String moduleError = "{prefix} <&cThis system require you to login website, click here!{&eClick Me!}(open_url:%link%)>"; - - /** - * error on auth link - */ - private String noLink = "{prefix} &cAn error occurred while connecting web-server. Please visit our website."; - } - /** * Discord messages */ diff --git a/bungee/src/main/java/net/leaderos/bungee/configuration/Modules.java b/bungee/src/main/java/net/leaderos/bungee/configuration/Modules.java index 2792b123a9..0e8698608d 100644 --- a/bungee/src/main/java/net/leaderos/bungee/configuration/Modules.java +++ b/bungee/src/main/java/net/leaderos/bungee/configuration/Modules.java @@ -17,27 +17,6 @@ @Setter @Names(strategy = NameStrategy.IDENTITY) public class Modules extends OkaeriConfig { - - /** - * Auth system - */ - private Auth Auth = new Auth(); - - /** - * Auth module settings - * - * @since 1.0 - * @author poyrazinan - */ - @Getter - @Setter - public static class Auth extends OkaeriConfig { - /** - * Status of Auth mode - */ - private boolean status = false; - } - /** * Discord module */ diff --git a/bungee/src/main/java/net/leaderos/bungee/configuration/lang/en.java b/bungee/src/main/java/net/leaderos/bungee/configuration/lang/en.java index cfd39ab3c7..43dd1748e0 100644 --- a/bungee/src/main/java/net/leaderos/bungee/configuration/lang/en.java +++ b/bungee/src/main/java/net/leaderos/bungee/configuration/lang/en.java @@ -147,33 +147,6 @@ public static class Command extends Language.Messages.Command { } - /** - * Auth messages - */ - private Auth auth = new Auth(); - - /** - * Auth messages of plugin - */ - @Getter @Setter - public static class Auth extends Language.Messages.Auth { - - /** - * Command Message - */ - private String commandMessage = "{prefix} <&aClick here for authentication!{&eClick Me!}(open_url:%link%)>"; - - /** - * Module error message - */ - private String moduleError = "{prefix} <&cThis system require you to login website, click here!{&eClick Me!}(open_url:%link%)>"; - - /** - * error on auth link - */ - private String noLink = "{prefix} &cAn error occurred while connecting web-server. Please visit our website."; - } - /** * Discord messages */ diff --git a/bungee/src/main/java/net/leaderos/bungee/configuration/lang/tr.java b/bungee/src/main/java/net/leaderos/bungee/configuration/lang/tr.java index 21e8b70ae9..fb3e8409c3 100644 --- a/bungee/src/main/java/net/leaderos/bungee/configuration/lang/tr.java +++ b/bungee/src/main/java/net/leaderos/bungee/configuration/lang/tr.java @@ -147,33 +147,6 @@ public static class Command extends Language.Messages.Command { } - /** - * Auth messages - */ - private Auth auth = new Auth(); - - /** - * Auth messages of plugin - */ - @Getter @Setter - public static class Auth extends Language.Messages.Auth { - - /** - * Command Message - */ - private String commandMessage = "{prefix} <&aHesabını eşlemek için tıkla!{&eTıkla!}(open_url:%link%)>"; - - /** - * Module error message - */ - private String moduleError = "{prefix} <&cSistem siteye girişi gerektirmektedir. Giriş yapmak için tıkla!{&eTıkla!}(open_url:%link%)>"; - - /** - * error on auth link - */ - private String noLink = "{prefix} &cSunucuya bağlanırken hata oluştu."; - } - /** * Discord messages */ diff --git a/bungee/src/main/java/net/leaderos/bungee/modules/auth/AuthModule.java b/bungee/src/main/java/net/leaderos/bungee/modules/auth/AuthModule.java deleted file mode 100644 index 29d21996d9..0000000000 --- a/bungee/src/main/java/net/leaderos/bungee/modules/auth/AuthModule.java +++ /dev/null @@ -1,86 +0,0 @@ -package net.leaderos.bungee.modules.auth; - -import net.leaderos.bungee.Bungee; -import net.leaderos.bungee.helpers.ChatUtil; -import net.leaderos.bungee.helpers.MDChat.MDChatAPI; -import net.leaderos.bungee.modules.auth.commands.AuthCommand; -import net.leaderos.shared.modules.LeaderOSModule; -import net.leaderos.shared.modules.auth.AuthHelper; -import net.md_5.bungee.api.connection.ProxiedPlayer; - -/** - * Auth module of leaderos-plugin - * - * @author poyrazinan - * @since 1.0 - */ -public class AuthModule extends LeaderOSModule { - - /** - * Commands of module - */ - private AuthCommand command; - - /** - * onEnable method of module - */ - public void onEnable() { - this.command = new AuthCommand("auth"); - Bungee.getInstance().getProxy().getPluginManager().registerCommand(Bungee.getInstance(), command); - } - - /** - * onDisable method of module - */ - public void onDisable() { - Bungee.getInstance().getProxy().getPluginManager().unregisterCommand(command); - } - - /** - * sends auth command message - * - * @param player executor - */ - public static void sendAuthCommandMessage(ProxiedPlayer player) { - try { - String link = AuthHelper.getAuthLink(player.getName(), player.getUniqueId()); - if (link != null) - player.sendMessage(MDChatAPI.getFormattedMessage(ChatUtil.color(Bungee.getInstance() - .getLangFile().getMessages() - .getAuth().getCommandMessage() - .replace("%link%", link) - .replace("{prefix}", Bungee.getInstance().getLangFile().getMessages().getPrefix())))); - else - ChatUtil.sendMessage(player, Bungee.getInstance().getLangFile().getMessages().getAuth().getNoLink()); - } catch (Exception ignored) { - ChatUtil.sendMessage(player, Bungee.getInstance().getLangFile().getMessages().getAuth().getNoLink()); - } - } - - /** - * sends auth module error message - * - * @param player executor - */ - public static void sendAuthModuleError(ProxiedPlayer player) { - try { - String link = AuthHelper.getAuthLink(player.getName(), player.getUniqueId()); - if (link != null) - player.sendMessage(MDChatAPI.getFormattedMessage(ChatUtil.color(Bungee.getInstance() - .getLangFile().getMessages() - .getAuth().getModuleError() - .replace("%link%", link) - .replace("{prefix}", Bungee.getInstance().getLangFile().getMessages().getPrefix())))); - else - ChatUtil.sendMessage(player, Bungee.getInstance().getLangFile().getMessages().getAuth().getNoLink()); - } catch (Exception ignored) { - ChatUtil.sendMessage(player, Bungee.getInstance().getLangFile().getMessages().getAuth().getNoLink()); - } - } - - /** - * Constructor of Auth - */ - public AuthModule() { - } -} diff --git a/bungee/src/main/java/net/leaderos/bungee/modules/auth/commands/AuthCommand.java b/bungee/src/main/java/net/leaderos/bungee/modules/auth/commands/AuthCommand.java deleted file mode 100644 index 8576398512..0000000000 --- a/bungee/src/main/java/net/leaderos/bungee/modules/auth/commands/AuthCommand.java +++ /dev/null @@ -1,41 +0,0 @@ -package net.leaderos.bungee.modules.auth.commands; - -import net.leaderos.bungee.Bungee; -import net.leaderos.bungee.helpers.ChatUtil; -import net.leaderos.bungee.modules.auth.AuthModule; -import net.md_5.bungee.api.CommandSender; -import net.md_5.bungee.api.connection.ProxiedPlayer; -import net.md_5.bungee.api.plugin.Command; - -/** - * Auth commands - * @author poyrazinan - * @since 1.0 - */ -public class AuthCommand extends Command { - - /** - * Constructor of author command - * @param name of command - */ - public AuthCommand(String name) { - super(name); - } - - /** - * Default command of auth - * @param sender executor - * @param args command args - */ - @Override - public void execute(CommandSender sender, String[] args) { - if (sender instanceof ProxiedPlayer) { - ProxiedPlayer player = (ProxiedPlayer) sender; - if (player.hasPermission("leaderos.auth")) - AuthModule.sendAuthCommandMessage((ProxiedPlayer) sender); - else - ChatUtil.sendMessage(sender, Bungee.getInstance().getLangFile().getMessages().getCommand().getNoPerm()); - - } - } -} \ No newline at end of file diff --git a/bungee/src/main/java/net/leaderos/bungee/modules/discord/DiscordModule.java b/bungee/src/main/java/net/leaderos/bungee/modules/discord/DiscordModule.java index 5095ff65bf..64592049c1 100644 --- a/bungee/src/main/java/net/leaderos/bungee/modules/discord/DiscordModule.java +++ b/bungee/src/main/java/net/leaderos/bungee/modules/discord/DiscordModule.java @@ -4,8 +4,8 @@ import net.leaderos.bungee.helpers.ChatUtil; import net.leaderos.bungee.helpers.MDChat.MDChatAPI; import net.leaderos.bungee.modules.discord.commands.SyncCommand; +import net.leaderos.shared.Shared; import net.leaderos.shared.modules.LeaderOSModule; -import net.leaderos.shared.modules.discord.DiscordHelper; import net.md_5.bungee.api.connection.ProxiedPlayer; /** @@ -43,15 +43,12 @@ public void onDisable() { */ public static void sendSyncCommandMessage(ProxiedPlayer player) { try { - String link = DiscordHelper.getSyncLink(player.getName()); - if (link != null) - player.sendMessage(MDChatAPI.getFormattedMessage(ChatUtil.color(Bungee.getInstance() - .getLangFile().getMessages() - .getAuth().getCommandMessage() - .replace("%link%", link) - .replace("{prefix}", Bungee.getInstance().getLangFile().getMessages().getPrefix())))); - else - ChatUtil.sendMessage(player, Bungee.getInstance().getLangFile().getMessages().getDiscord().getNoLink()); + String link = Shared.getLink() + "/discord/link"; + player.sendMessage(MDChatAPI.getFormattedMessage(ChatUtil.color(Bungee.getInstance() + .getLangFile().getMessages() + .getDiscord().getCommandMessage() + .replace("%link%", link) + .replace("{prefix}", Bungee.getInstance().getLangFile().getMessages().getPrefix())))); } catch (Exception ignored) { ChatUtil.sendMessage(player, Bungee.getInstance().getLangFile().getMessages().getDiscord().getNoLink()); } diff --git a/shared/src/main/java/net/leaderos/shared/model/Request.java b/shared/src/main/java/net/leaderos/shared/model/Request.java index 02ca5affa5..f47a5ba775 100644 --- a/shared/src/main/java/net/leaderos/shared/model/Request.java +++ b/shared/src/main/java/net/leaderos/shared/model/Request.java @@ -60,7 +60,7 @@ public abstract class Request { */ public Request(String api, Map body, @NotNull RequestType type) throws IOException { this.body = encodeFormData(body); - this.url = new URL( Shared.getLink()+ "/api/" + api); + this.url = new URL( Shared.getLink() + "/api/" + api); this.apiKey = Shared.getApiKey(); this.connection = (HttpURLConnection) this.url.openConnection(); // Request type selector diff --git a/shared/src/main/java/net/leaderos/shared/model/request/impl/auth/AuthRequest.java b/shared/src/main/java/net/leaderos/shared/model/request/impl/auth/AuthRequest.java deleted file mode 100644 index a35ed00c99..0000000000 --- a/shared/src/main/java/net/leaderos/shared/model/request/impl/auth/AuthRequest.java +++ /dev/null @@ -1,17 +0,0 @@ -package net.leaderos.shared.model.request.impl.auth; - -import net.leaderos.shared.model.request.PostRequest; - -import java.io.IOException; -import java.util.HashMap; - -public class AuthRequest extends PostRequest { - - public AuthRequest(String username, String uuid) throws IOException { - super("auth/generate-link", new HashMap() {{ - put("username", username); - put("uuid", uuid); - }}); - } - -} diff --git a/shared/src/main/java/net/leaderos/shared/model/request/impl/bazaar/AddBazaarItemRequest.java b/shared/src/main/java/net/leaderos/shared/model/request/impl/bazaar/AddBazaarItemRequest.java index 004b3227da..aae743547f 100644 --- a/shared/src/main/java/net/leaderos/shared/model/request/impl/bazaar/AddBazaarItemRequest.java +++ b/shared/src/main/java/net/leaderos/shared/model/request/impl/bazaar/AddBazaarItemRequest.java @@ -9,7 +9,6 @@ public class AddBazaarItemRequest extends PostRequest { public AddBazaarItemRequest(String userId, String name, String lore, int amount, int maxDurability, int durability, String base64, double price, String creationDate, String modelId, String enchantments, int serverId, String item) throws IOException { super("bazaar/storages/" + userId + "/items", new HashMap() {{ - put("owner", userId); put("name", name); if (lore != null) put("lore", lore); diff --git a/shared/src/main/java/net/leaderos/shared/model/request/impl/credit/AddCreditsRequest.java b/shared/src/main/java/net/leaderos/shared/model/request/impl/credit/AddCreditsRequest.java index 1196b586df..60e4b72267 100644 --- a/shared/src/main/java/net/leaderos/shared/model/request/impl/credit/AddCreditsRequest.java +++ b/shared/src/main/java/net/leaderos/shared/model/request/impl/credit/AddCreditsRequest.java @@ -7,8 +7,9 @@ public class AddCreditsRequest extends PostRequest { - public AddCreditsRequest(String target, double amount) throws IOException { - super("credits/" + target + "/add", new HashMap() {{ + public AddCreditsRequest(String targetUsername, double amount) throws IOException { + super("credits/add", new HashMap() {{ + put("target_username", String.valueOf(targetUsername)); put("amount", String.valueOf(amount)); }}); } diff --git a/shared/src/main/java/net/leaderos/shared/model/request/impl/credit/GetCreditsRequest.java b/shared/src/main/java/net/leaderos/shared/model/request/impl/credit/GetCreditsRequest.java index 73cba0b52c..4aa7b0f868 100644 --- a/shared/src/main/java/net/leaderos/shared/model/request/impl/credit/GetCreditsRequest.java +++ b/shared/src/main/java/net/leaderos/shared/model/request/impl/credit/GetCreditsRequest.java @@ -7,7 +7,7 @@ public class GetCreditsRequest extends GetRequest { public GetCreditsRequest(String username) throws IOException { - super("credits/" + username); + super("credits?username=" + username); } } diff --git a/shared/src/main/java/net/leaderos/shared/model/request/impl/credit/RemoveCreditsRequest.java b/shared/src/main/java/net/leaderos/shared/model/request/impl/credit/RemoveCreditsRequest.java index 3a66570349..c80f89bfa3 100644 --- a/shared/src/main/java/net/leaderos/shared/model/request/impl/credit/RemoveCreditsRequest.java +++ b/shared/src/main/java/net/leaderos/shared/model/request/impl/credit/RemoveCreditsRequest.java @@ -6,8 +6,9 @@ import java.util.HashMap; public class RemoveCreditsRequest extends PostRequest { - public RemoveCreditsRequest(String target, double amount) throws IOException { - super("credits/" + target + "/remove", new HashMap() {{ + public RemoveCreditsRequest(String targetUsername, double amount) throws IOException { + super("credits/remove", new HashMap() {{ + put("target_username", String.valueOf(targetUsername)); put("amount", String.valueOf(amount)); }}); } diff --git a/shared/src/main/java/net/leaderos/shared/model/request/impl/credit/SendCreditsRequest.java b/shared/src/main/java/net/leaderos/shared/model/request/impl/credit/SendCreditsRequest.java index 224f01cc73..a84a694c8a 100644 --- a/shared/src/main/java/net/leaderos/shared/model/request/impl/credit/SendCreditsRequest.java +++ b/shared/src/main/java/net/leaderos/shared/model/request/impl/credit/SendCreditsRequest.java @@ -6,9 +6,10 @@ import java.util.HashMap; public class SendCreditsRequest extends PostRequest { - public SendCreditsRequest(String sender, String target, double amount) throws IOException { - super("credits/" + sender + "/send", new HashMap() {{ - put("target", target); + public SendCreditsRequest(String senderUsername, String targetUsername, double amount) throws IOException { + super("credits/send", new HashMap() {{ + put("sender_username", senderUsername); + put("target_username", targetUsername); put("amount", String.valueOf(amount)); }}); } diff --git a/shared/src/main/java/net/leaderos/shared/model/request/impl/credit/SetCreditsRequest.java b/shared/src/main/java/net/leaderos/shared/model/request/impl/credit/SetCreditsRequest.java index 6cb91595a7..1a7d6048b0 100644 --- a/shared/src/main/java/net/leaderos/shared/model/request/impl/credit/SetCreditsRequest.java +++ b/shared/src/main/java/net/leaderos/shared/model/request/impl/credit/SetCreditsRequest.java @@ -6,8 +6,9 @@ import java.util.HashMap; public class SetCreditsRequest extends PostRequest { - public SetCreditsRequest(String target, double amount) throws IOException { - super("credits/" + target + "/set", new HashMap() {{ + public SetCreditsRequest(String targetUsername, double amount) throws IOException { + super("credits/set", new HashMap() {{ + put("target_username", String.valueOf(targetUsername)); put("amount", String.valueOf(amount)); }}); } diff --git a/shared/src/main/java/net/leaderos/shared/model/request/impl/discord/DiscordSyncRequest.java b/shared/src/main/java/net/leaderos/shared/model/request/impl/discord/DiscordSyncRequest.java deleted file mode 100644 index cecd0aac09..0000000000 --- a/shared/src/main/java/net/leaderos/shared/model/request/impl/discord/DiscordSyncRequest.java +++ /dev/null @@ -1,14 +0,0 @@ -package net.leaderos.shared.model.request.impl.discord; - -import net.leaderos.shared.model.request.PostRequest; - -import java.io.IOException; -import java.util.HashMap; - -public class DiscordSyncRequest extends PostRequest { - public DiscordSyncRequest(String username) throws IOException { - super("integrations/discord/sync", new HashMap() {{ - put("user", username); - }}); - } -} diff --git a/shared/src/main/java/net/leaderos/shared/model/request/impl/store/BuyRequest.java b/shared/src/main/java/net/leaderos/shared/model/request/impl/store/BuyRequest.java index 1226c19b23..53cd678377 100644 --- a/shared/src/main/java/net/leaderos/shared/model/request/impl/store/BuyRequest.java +++ b/shared/src/main/java/net/leaderos/shared/model/request/impl/store/BuyRequest.java @@ -7,9 +7,9 @@ public class BuyRequest extends PostRequest { - public BuyRequest(String user, String productId) throws IOException { + public BuyRequest(String userId, String productId) throws IOException { super("store/buy", new HashMap() {{ - put("user", user); + put("userID", userId); put("products[0][id]", productId); put("products[0][quantity]", "1"); }}); diff --git a/shared/src/main/java/net/leaderos/shared/model/request/impl/store/ListingRequest.java b/shared/src/main/java/net/leaderos/shared/model/request/impl/store/ListingRequest.java index 9788f7930d..50dec41316 100644 --- a/shared/src/main/java/net/leaderos/shared/model/request/impl/store/ListingRequest.java +++ b/shared/src/main/java/net/leaderos/shared/model/request/impl/store/ListingRequest.java @@ -12,6 +12,6 @@ public class ListingRequest extends GetRequest { * @throws IOException for HttpUrlConnection */ public ListingRequest(String username) throws IOException { - super("store/listing?user=" + username); + super("store/listing?username=" + username); } } diff --git a/shared/src/main/java/net/leaderos/shared/model/request/impl/user/GetUserRequest.java b/shared/src/main/java/net/leaderos/shared/model/request/impl/user/GetUserRequest.java index cbd3bef25d..3681812934 100644 --- a/shared/src/main/java/net/leaderos/shared/model/request/impl/user/GetUserRequest.java +++ b/shared/src/main/java/net/leaderos/shared/model/request/impl/user/GetUserRequest.java @@ -6,8 +6,8 @@ public class GetUserRequest extends GetRequest { - public GetUserRequest(String name) throws IOException { - super("users/" + name); + public GetUserRequest(String username) throws IOException { + super("users?username=" + username); } } diff --git a/shared/src/main/java/net/leaderos/shared/modules/auth/AuthHelper.java b/shared/src/main/java/net/leaderos/shared/modules/auth/AuthHelper.java deleted file mode 100644 index 90648532f8..0000000000 --- a/shared/src/main/java/net/leaderos/shared/modules/auth/AuthHelper.java +++ /dev/null @@ -1,43 +0,0 @@ -package net.leaderos.shared.modules.auth; - -import net.leaderos.shared.model.request.impl.auth.AuthRequest; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.UUID; - -/** - * Auth module helper class, share methods over platforms - * @author poyrazinan - * @since 1.0 - */ -public class AuthHelper { - - /** - * Generates user login link - * - * @param username of player - * @param uuid of player - * @return String of url - * @throws IOException request exception - */ - private static String generateLink(String username, String uuid) throws IOException { - AuthRequest authRequest = new AuthRequest(username, uuid); - JSONObject response = authRequest.getResponse().getResponseMessage().getJSONObject("data"); - return response.getString("url"); - } - - /** - * sends auth command message - * @param playerName name of executor - * @param playerUUID uuid of executor - * @return String of url - */ - public static String getAuthLink(String playerName, UUID playerUUID) { - try { - return generateLink(playerName, playerUUID.toString()); - } catch (Exception e) { - return null; - } - } -} diff --git a/shared/src/main/java/net/leaderos/shared/modules/discord/DiscordHelper.java b/shared/src/main/java/net/leaderos/shared/modules/discord/DiscordHelper.java deleted file mode 100644 index d0f3c1f56f..0000000000 --- a/shared/src/main/java/net/leaderos/shared/modules/discord/DiscordHelper.java +++ /dev/null @@ -1,41 +0,0 @@ -package net.leaderos.shared.modules.discord; - -import net.leaderos.shared.model.request.PostRequest; -import net.leaderos.shared.model.request.impl.discord.DiscordSyncRequest; -import org.json.JSONObject; - -import java.io.IOException; - -/** - * Auth module helper class, share methods over platforms - * @author poyrazinan - * @since 1.0 - */ -public class DiscordHelper { - - /** - * Generates discord sync link - * - * @param username of player - * @return String of url - * @throws IOException request exception - */ - private static String generateLink(String username) throws IOException { - PostRequest postRequest = new DiscordSyncRequest(username); - JSONObject response = postRequest.getResponse().getResponseMessage().getJSONObject("data"); - return response.getString("url"); - } - - /** - * Generates discord sync link - * @param username username of executor - * @return String of url - */ - public static String getSyncLink(String username) { - try { - return generateLink(username); - } catch (Exception e) { - return null; - } - } -} diff --git a/velocity/src/main/java/net/leaderos/velocity/Velocity.java b/velocity/src/main/java/net/leaderos/velocity/Velocity.java index 7dcb8500b3..f0b03dce36 100644 --- a/velocity/src/main/java/net/leaderos/velocity/Velocity.java +++ b/velocity/src/main/java/net/leaderos/velocity/Velocity.java @@ -25,7 +25,6 @@ import net.leaderos.velocity.configuration.Modules; import net.leaderos.velocity.helpers.ChatUtil; import net.leaderos.velocity.helpers.DebugVelocity; -import net.leaderos.velocity.modules.auth.AuthModule; import net.leaderos.velocity.modules.connect.ConnectModule; import net.leaderos.velocity.modules.credit.CreditModule; import net.leaderos.velocity.modules.discord.DiscordModule; @@ -138,7 +137,6 @@ public void onProxyInitialize(ProxyInitializeEvent event) { ); this.moduleManager = new ModuleManager(); getModuleManager().registerModule(new CreditModule()); - getModuleManager().registerModule(new AuthModule()); getModuleManager().registerModule(new DiscordModule()); getModuleManager().registerModule(new ConnectModule()); diff --git a/velocity/src/main/java/net/leaderos/velocity/api/ModuleManager.java b/velocity/src/main/java/net/leaderos/velocity/api/ModuleManager.java index bce3399059..e61f8765c7 100644 --- a/velocity/src/main/java/net/leaderos/velocity/api/ModuleManager.java +++ b/velocity/src/main/java/net/leaderos/velocity/api/ModuleManager.java @@ -49,8 +49,6 @@ public void registerModule(Modulable module) { @SneakyThrows public static boolean getModuleStatus(String moduleName) { switch (moduleName) { - case "Auth": - return Velocity.getInstance().getModulesFile().getAuth().isStatus(); case "Discord": return Velocity.getInstance().getModulesFile().getDiscord().isStatus(); case "Credit": diff --git a/velocity/src/main/java/net/leaderos/velocity/configuration/Language.java b/velocity/src/main/java/net/leaderos/velocity/configuration/Language.java index e50e6671b6..171669515e 100644 --- a/velocity/src/main/java/net/leaderos/velocity/configuration/Language.java +++ b/velocity/src/main/java/net/leaderos/velocity/configuration/Language.java @@ -147,38 +147,6 @@ public static class Command extends OkaeriConfig { } - /** - * Auth messages - */ - private Auth auth = new Auth(); - - /** - * Auth messages of plugin - */ - @Getter @Setter - public static class Auth extends OkaeriConfig { - - /** - * Command Message - */ - private String commandMessage = "{prefix} &aClick here for authentication!"; - - /** - * Module error message - */ - private String moduleError = "{prefix} &cThis system require you to login website, click here!"; - - /** - * error on auth link - */ - private String noLink = "{prefix} &cAn error occurred while connecting web-server. Please visit our website."; - - /** - * Hover message - */ - private String hoverMessage = "&eClick here to open url!"; - } - /** * Discord messages */ diff --git a/velocity/src/main/java/net/leaderos/velocity/configuration/Modules.java b/velocity/src/main/java/net/leaderos/velocity/configuration/Modules.java index 7f907976f1..55a3c944d0 100644 --- a/velocity/src/main/java/net/leaderos/velocity/configuration/Modules.java +++ b/velocity/src/main/java/net/leaderos/velocity/configuration/Modules.java @@ -17,27 +17,6 @@ @Setter @Names(strategy = NameStrategy.IDENTITY) public class Modules extends OkaeriConfig { - - /** - * Auth system - */ - private Auth Auth = new Auth(); - - /** - * Auth module settings - * - * @since 1.0 - * @author poyrazinan - */ - @Getter - @Setter - public static class Auth extends OkaeriConfig { - /** - * Status of Auth mode - */ - private boolean status = false; - } - /** * Discord module */ diff --git a/velocity/src/main/java/net/leaderos/velocity/configuration/lang/en.java b/velocity/src/main/java/net/leaderos/velocity/configuration/lang/en.java index 2d2e4bef72..f2fcd1250f 100644 --- a/velocity/src/main/java/net/leaderos/velocity/configuration/lang/en.java +++ b/velocity/src/main/java/net/leaderos/velocity/configuration/lang/en.java @@ -147,38 +147,6 @@ public static class Command extends Language.Messages.Command { } - /** - * Auth messages - */ - private Auth auth = new Auth(); - - /** - * Auth messages of plugin - */ - @Getter @Setter - public static class Auth extends Language.Messages.Auth { - - /** - * Command Message - */ - private String commandMessage = "{prefix} &aClick here for authentication!"; - - /** - * Module error message - */ - private String moduleError = "{prefix} &cThis system require you to login website, click here!"; - - /** - * error on auth link - */ - private String noLink = "{prefix} &cAn error occurred while connecting web-server. Please visit our website."; - - /** - * Hover message - */ - private String hoverMessage = "&eClick here to open url!"; - } - /** * Discord messages */ diff --git a/velocity/src/main/java/net/leaderos/velocity/configuration/lang/tr.java b/velocity/src/main/java/net/leaderos/velocity/configuration/lang/tr.java index 07e841c9d0..5d8f0f2c73 100644 --- a/velocity/src/main/java/net/leaderos/velocity/configuration/lang/tr.java +++ b/velocity/src/main/java/net/leaderos/velocity/configuration/lang/tr.java @@ -147,38 +147,6 @@ public static class Command extends Language.Messages.Command { } - /** - * Auth messages - */ - private Auth auth = new Auth(); - - /** - * Auth messages of plugin - */ - @Getter @Setter - public static class Auth extends Language.Messages.Auth { - - /** - * Command Message - */ - private String commandMessage = "{prefix} &aHesabını eşlemek için tıkla!"; - - /** - * Module error message - */ - private String moduleError = "{prefix} &cBu sistem siteye girişi gerektirmektedir. Giriş yapmak için tıkla!"; - - /** - * error on auth link - */ - private String noLink = "{prefix} &cSunucuya bağlanırken hata oluştu."; - - /** - * Hover message - */ - private String hoverMessage = "&eBağlantıyı açmak için tıkla!"; - } - /** * Discord messages */ diff --git a/velocity/src/main/java/net/leaderos/velocity/modules/auth/AuthModule.java b/velocity/src/main/java/net/leaderos/velocity/modules/auth/AuthModule.java deleted file mode 100644 index ee90d9a407..0000000000 --- a/velocity/src/main/java/net/leaderos/velocity/modules/auth/AuthModule.java +++ /dev/null @@ -1,113 +0,0 @@ -package net.leaderos.velocity.modules.auth; - -import com.velocitypowered.api.command.CommandMeta; -import com.velocitypowered.api.command.SimpleCommand; -import com.velocitypowered.api.proxy.Player; -import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.event.ClickEvent; -import net.kyori.adventure.text.event.HoverEvent; -import net.leaderos.shared.modules.LeaderOSModule; -import net.leaderos.shared.modules.auth.AuthHelper; -import net.leaderos.velocity.Velocity; -import net.leaderos.velocity.helpers.ChatUtil; -import net.leaderos.velocity.modules.auth.commands.AuthCommand; - -/** - * Auth module of leaderos-plugin - * - * @author poyrazinan - * @since 1.0 - */ -public class AuthModule extends LeaderOSModule { - - /** - * Command meta of module - */ - private CommandMeta commandMeta; - - /** - * Command object of module - */ - private SimpleCommand authCommand; - - /** - * onEnable method of module - */ - public void onEnable() { - commandMeta = Velocity.getInstance().getCommandManager().metaBuilder("auth") - .aliases("doğrula") - .plugin(Velocity.getInstance()) - .build(); - authCommand = new AuthCommand(); - Velocity.getInstance().getCommandManager().register(commandMeta, authCommand); - } - - /** - * onDisable method of module - */ - public void onDisable() { - Velocity.getInstance().getCommandManager().unregister(commandMeta); - } - - /** - * sends auth command message - * - * @param player executor - */ - public static void sendAuthCommandMessage(Player player) { - try { - String link = AuthHelper.getAuthLink(player.getUsername(), player.getUniqueId()); - if (link != null) { - // Hover message - Component hoverMsg = ChatUtil.color(Velocity.getInstance().getLangFile().getMessages().getAuth().getHoverMessage()); - // Main message of auth - Component commandMessage = ChatUtil.color( - Velocity.getInstance().getLangFile().getMessages().getAuth().getCommandMessage() - .replace("{prefix}", Velocity.getInstance().getLangFile().getMessages().getPrefix())); - // Finalized msg - Component component = commandMessage - .clickEvent(ClickEvent.clickEvent(ClickEvent.Action.OPEN_URL, link)) - .hoverEvent(HoverEvent.showText(hoverMsg)); - player.sendMessage(component); - } - else - ChatUtil.sendMessage(player, Velocity.getInstance().getLangFile().getMessages().getAuth().getNoLink()); - } catch (Exception ignored) { - ChatUtil.sendMessage(player, Velocity.getInstance().getLangFile().getMessages().getAuth().getNoLink()); - } - } - - /** - * sends auth module error message - * - * @param player executor - */ - public static void sendAuthModuleError(Player player) { - try { - String link = AuthHelper.getAuthLink(player.getUsername(), player.getUniqueId()); - if (link != null) { - // Hover message - Component hoverMsg = ChatUtil.color(Velocity.getInstance().getLangFile().getMessages().getAuth().getModuleError()); - // Main message of auth - Component commandMessage = ChatUtil.color( - Velocity.getInstance().getLangFile().getMessages().getAuth().getCommandMessage() - .replace("{prefix}", Velocity.getInstance().getLangFile().getMessages().getPrefix())); - // Finalized msg - Component component = commandMessage - .clickEvent(ClickEvent.clickEvent(ClickEvent.Action.OPEN_URL, link)) - .hoverEvent(HoverEvent.showText(hoverMsg)); - player.sendMessage(component); - } - else - ChatUtil.sendMessage(player, Velocity.getInstance().getLangFile().getMessages().getAuth().getNoLink()); - } catch (Exception ignored) { - ChatUtil.sendMessage(player, Velocity.getInstance().getLangFile().getMessages().getAuth().getNoLink()); - } - } - - /** - * Constructor of Auth - */ - public AuthModule() { - } -} diff --git a/velocity/src/main/java/net/leaderos/velocity/modules/auth/commands/AuthCommand.java b/velocity/src/main/java/net/leaderos/velocity/modules/auth/commands/AuthCommand.java deleted file mode 100644 index 16eaa2b786..0000000000 --- a/velocity/src/main/java/net/leaderos/velocity/modules/auth/commands/AuthCommand.java +++ /dev/null @@ -1,33 +0,0 @@ -package net.leaderos.velocity.modules.auth.commands; - -import com.velocitypowered.api.command.CommandSource; -import com.velocitypowered.api.command.SimpleCommand; -import com.velocitypowered.api.proxy.Player; -import net.leaderos.velocity.Velocity; -import net.leaderos.velocity.helpers.ChatUtil; -import net.leaderos.velocity.modules.auth.AuthModule; - -/** - * AuthCommand of auth module - * @author poyrazinan - * @since 1.0 - */ -public class AuthCommand implements SimpleCommand { - - /** - * Executes command method - * @param invocation command manager - */ - @Override - public void execute(Invocation invocation) { - CommandSource source = invocation.source(); - if (source instanceof Player) { - Player player = (Player) source; - if (player.hasPermission("leaderos.auth")) - AuthModule.sendAuthCommandMessage(player); - else - ChatUtil.sendMessage(player, Velocity.getInstance().getLangFile().getMessages().getCommand().getNoPerm()); - - } - } -} diff --git a/velocity/src/main/java/net/leaderos/velocity/modules/discord/DiscordModule.java b/velocity/src/main/java/net/leaderos/velocity/modules/discord/DiscordModule.java index 6597ae0131..696a158cf1 100644 --- a/velocity/src/main/java/net/leaderos/velocity/modules/discord/DiscordModule.java +++ b/velocity/src/main/java/net/leaderos/velocity/modules/discord/DiscordModule.java @@ -6,8 +6,8 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.event.ClickEvent; import net.kyori.adventure.text.event.HoverEvent; +import net.leaderos.shared.Shared; import net.leaderos.shared.modules.LeaderOSModule; -import net.leaderos.shared.modules.discord.DiscordHelper; import net.leaderos.velocity.Velocity; import net.leaderos.velocity.helpers.ChatUtil; import net.leaderos.velocity.modules.discord.commands.SyncCommand; @@ -56,23 +56,18 @@ public void onDisable() { */ public static void sendSyncCommandMessage(Player player) { try { - String link = DiscordHelper.getSyncLink(player.getUsername()); - if (link != null) { - // Hover message - Component hoverMsg = ChatUtil.color(Velocity.getInstance().getLangFile().getMessages().getAuth().getHoverMessage()); - // Main message of auth - Component commandMessage = ChatUtil.color( - Velocity.getInstance().getLangFile().getMessages().getDiscord().getCommandMessage() - .replace("{prefix}", Velocity.getInstance().getLangFile().getMessages().getPrefix())); - // Finalized msg - Component component = commandMessage - .clickEvent(ClickEvent.clickEvent(ClickEvent.Action.OPEN_URL, link)) - .hoverEvent(HoverEvent.showText(hoverMsg)); - player.sendMessage(component); - } - else { - ChatUtil.sendMessage(player, Velocity.getInstance().getLangFile().getMessages().getDiscord().getNoLink()); - } + String link = Shared.getLink() + "/discord/link"; + // Hover message + Component hoverMsg = ChatUtil.color(Velocity.getInstance().getLangFile().getMessages().getDiscord().getHoverMessage()); + // Main message of auth + Component commandMessage = ChatUtil.color( + Velocity.getInstance().getLangFile().getMessages().getDiscord().getCommandMessage() + .replace("{prefix}", Velocity.getInstance().getLangFile().getMessages().getPrefix())); + // Finalized msg + Component component = commandMessage + .clickEvent(ClickEvent.clickEvent(ClickEvent.Action.OPEN_URL, link)) + .hoverEvent(HoverEvent.showText(hoverMsg)); + player.sendMessage(component); } catch (Exception ignored) { ChatUtil.sendMessage(player, Velocity.getInstance().getLangFile().getMessages().getDiscord().getNoLink()); }