From 1ff19f5208361a3f02265de9e47818bed3c0d44e Mon Sep 17 00:00:00 2001 From: zhangyuheng Date: Sat, 19 Oct 2024 17:19:06 +0800 Subject: [PATCH] fix lite-version cant link to vault problem --- build.gradle.kts | 4 +- .../controllers/DominionController.java | 2 +- .../dominion/managers/ConfigManager.java | 2 +- .../dominion/utils/VaultConnect/Vault.java | 49 +++++++++ .../dominion/utils/VaultConnect/Vault2.java | 51 +++++++++ .../utils/VaultConnect/VaultConnect.java | 99 ++++++++++++++++++ .../utils/VaultConnect/VaultInterface.java | 21 ++++ logos/logo4.png | Bin 0 -> 12935 bytes .../events_v1_20_1/SelectPointEvents.java | 2 +- .../events_v1_21/SelectPointEvents.java | 2 +- 10 files changed, 227 insertions(+), 5 deletions(-) create mode 100644 core/src/main/java/cn/lunadeer/dominion/utils/VaultConnect/Vault.java create mode 100644 core/src/main/java/cn/lunadeer/dominion/utils/VaultConnect/Vault2.java create mode 100644 core/src/main/java/cn/lunadeer/dominion/utils/VaultConnect/VaultConnect.java create mode 100644 core/src/main/java/cn/lunadeer/dominion/utils/VaultConnect/VaultInterface.java create mode 100644 logos/logo4.png diff --git a/build.gradle.kts b/build.gradle.kts index fc3ed668..797b7a99 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ var libraries = listOf() libraries = libraries + "cn.lunadeer:MinecraftPluginUtils:2.0.7" group = "cn.lunadeer" -version = "2.14.1-beta" +version = "2.14.2-beta" java { toolchain.languageVersion.set(JavaLanguageVersion.of(17)) @@ -40,6 +40,8 @@ allprojects { compileOnly("com.github.BlueMap-Minecraft:BlueMapAPI:v2.6.2") compileOnly("us.dynmap:DynmapCoreAPI:3.4") compileOnly("me.clip:placeholderapi:2.11.6") + compileOnly("com.github.MilkBowl:VaultAPI:1.7") + compileOnly("net.milkbowl.vault:VaultUnlockedAPI:2.2") if (!BuildFull) { libraries.forEach { diff --git a/core/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java b/core/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java index d07f557e..74a45287 100644 --- a/core/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java +++ b/core/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java @@ -6,8 +6,8 @@ import cn.lunadeer.dominion.dtos.PlayerDTO; import cn.lunadeer.dominion.managers.Translation; import cn.lunadeer.dominion.utils.Particle; +import cn.lunadeer.dominion.utils.VaultConnect.VaultConnect; import cn.lunadeer.minecraftpluginutils.Notification; -import cn.lunadeer.minecraftpluginutils.VaultConnect.VaultConnect; import cn.lunadeer.minecraftpluginutils.XLogger; import org.bukkit.Location; import org.bukkit.World; diff --git a/core/src/main/java/cn/lunadeer/dominion/managers/ConfigManager.java b/core/src/main/java/cn/lunadeer/dominion/managers/ConfigManager.java index 955cc798..44d9b540 100644 --- a/core/src/main/java/cn/lunadeer/dominion/managers/ConfigManager.java +++ b/core/src/main/java/cn/lunadeer/dominion/managers/ConfigManager.java @@ -3,7 +3,7 @@ import cn.lunadeer.dominion.Dominion; import cn.lunadeer.dominion.dtos.Flag; import cn.lunadeer.dominion.utils.MessageDisplay; -import cn.lunadeer.minecraftpluginutils.VaultConnect.VaultConnect; +import cn.lunadeer.dominion.utils.VaultConnect.VaultConnect; import cn.lunadeer.minecraftpluginutils.XLogger; import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; diff --git a/core/src/main/java/cn/lunadeer/dominion/utils/VaultConnect/Vault.java b/core/src/main/java/cn/lunadeer/dominion/utils/VaultConnect/Vault.java new file mode 100644 index 00000000..325699db --- /dev/null +++ b/core/src/main/java/cn/lunadeer/dominion/utils/VaultConnect/Vault.java @@ -0,0 +1,49 @@ +package cn.lunadeer.dominion.utils.VaultConnect; + +import cn.lunadeer.minecraftpluginutils.XLogger; +import cn.lunadeer.minecraftpluginutils.i18n.Localization; +import net.milkbowl.vault.economy.Economy; +import org.bukkit.entity.Player; +import org.bukkit.plugin.RegisteredServiceProvider; +import org.bukkit.plugin.java.JavaPlugin; + +public class Vault implements VaultInterface { + + private Economy econ = null; + + @Override + public boolean init(JavaPlugin plugin) { + RegisteredServiceProvider rsp = plugin.getServer().getServicesManager().getRegistration(Economy.class); + if (rsp != null) { + econ = rsp.getProvider(); + return true; + } + XLogger.err(Localization.Utils_VaultNotAvailable); + return false; + } + + @Override + public String currencyNamePlural() { + return econ.currencyNamePlural(); + } + + @Override + public String currencyNameSingular() { + return econ.currencyNameSingular(); + } + + @Override + public void withdrawPlayer(Player player, double amount) { + econ.withdrawPlayer(player, amount); + } + + @Override + public void depositPlayer(Player player, double amount) { + econ.depositPlayer(player, amount); + } + + @Override + public double getBalance(Player player) { + return econ.getBalance(player); + } +} diff --git a/core/src/main/java/cn/lunadeer/dominion/utils/VaultConnect/Vault2.java b/core/src/main/java/cn/lunadeer/dominion/utils/VaultConnect/Vault2.java new file mode 100644 index 00000000..b0dd29e7 --- /dev/null +++ b/core/src/main/java/cn/lunadeer/dominion/utils/VaultConnect/Vault2.java @@ -0,0 +1,51 @@ +package cn.lunadeer.dominion.utils.VaultConnect; + +import cn.lunadeer.minecraftpluginutils.XLogger; +import cn.lunadeer.minecraftpluginutils.i18n.Localization; +import net.milkbowl.vault2.economy.Economy; +import org.bukkit.entity.Player; +import org.bukkit.plugin.RegisteredServiceProvider; +import org.bukkit.plugin.java.JavaPlugin; + +import java.math.BigDecimal; + +public class Vault2 implements VaultInterface { + + private Economy econ = null; + + @Override + public boolean init(JavaPlugin plugin) { + RegisteredServiceProvider rsp = plugin.getServer().getServicesManager().getRegistration(Economy.class); + if (rsp != null) { + econ = rsp.getProvider(); + return true; + } + XLogger.err(Localization.Utils_VaultUnlockedNotAvailable); + return false; + } + + @Override + public String currencyNamePlural() { + return econ.defaultCurrencyNamePlural(); + } + + @Override + public String currencyNameSingular() { + return econ.defaultCurrencyNameSingular(); + } + + @Override + public void withdrawPlayer(Player player, double amount) { + econ.withdraw("MPU", player.getUniqueId(), BigDecimal.valueOf(amount)); + } + + @Override + public void depositPlayer(Player player, double amount) { + econ.deposit("MPU", player.getUniqueId(), BigDecimal.valueOf(amount)); + } + + @Override + public double getBalance(Player player) { + return econ.getBalance("MPU", player.getUniqueId()).doubleValue(); + } +} diff --git a/core/src/main/java/cn/lunadeer/dominion/utils/VaultConnect/VaultConnect.java b/core/src/main/java/cn/lunadeer/dominion/utils/VaultConnect/VaultConnect.java new file mode 100644 index 00000000..47851b5b --- /dev/null +++ b/core/src/main/java/cn/lunadeer/dominion/utils/VaultConnect/VaultConnect.java @@ -0,0 +1,99 @@ +package cn.lunadeer.dominion.utils.VaultConnect; + +import cn.lunadeer.minecraftpluginutils.XLogger; +import cn.lunadeer.minecraftpluginutils.i18n.Localization; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.server.ServiceRegisterEvent; +import org.bukkit.plugin.Plugin; +import org.bukkit.plugin.java.JavaPlugin; + +public class VaultConnect implements Listener { + + public static VaultConnect instance; + private VaultInterface vaultInstance = null; + private JavaPlugin plugin; + + public VaultConnect(JavaPlugin plugin) { + this.plugin = plugin; + instance = this; + plugin.getServer().getPluginManager().registerEvents(this, plugin); + } + + @EventHandler(priority = EventPriority.HIGHEST) + public void onEnable(ServiceRegisterEvent event) { + } + + public boolean economyAvailable() { + if (vaultInstance == null) { + Plugin vaultPlugin = this.plugin.getServer().getPluginManager().getPlugin("Vault"); + if (vaultPlugin == null) { + XLogger.err(Localization.Utils_VaultNotAvailable); + return false; + } + if (vaultPlugin.getDescription().getAuthors().contains("creatorfromhell")) { + vaultInstance = new Vault2(); + } else { + vaultInstance = new Vault(); + } + if (!vaultInstance.init(plugin)) { + vaultInstance = null; + XLogger.err(Localization.Utils_NoEconomyPlugin); + return false; + } + } + XLogger.debug("Vault connected."); + return true; + } + + public String currencyNamePlural() { + if (economyAvailable()) { + return vaultInstance.currencyNamePlural(); + } + XLogger.warn(Localization.Utils_NoEconomyPlugin); + return ""; + } + + public String currencyNameSingular() { + if (economyAvailable()) { + return vaultInstance.currencyNameSingular(); + } + XLogger.warn(Localization.Utils_NoEconomyPlugin); + return ""; + } + + public void withdrawPlayer(Player player, double amount) { + if (economyAvailable()) { + vaultInstance.withdrawPlayer(player, amount); + return; + } + XLogger.warn(Localization.Utils_NoEconomyPlugin); + } + + public void depositPlayer(Player player, double amount) { + if (economyAvailable()) { + vaultInstance.depositPlayer(player, amount); + return; + } + XLogger.warn(Localization.Utils_NoEconomyPlugin); + } + + public double getBalance(Player player) { + if (economyAvailable()) { + return vaultInstance.getBalance(player); + } + XLogger.warn(Localization.Utils_NoEconomyPlugin); + return 0; + } + + private static boolean foundClass(String className) { + try { + Class.forName(className); + return true; + } catch (ClassNotFoundException e) { + return false; + } + } +} diff --git a/core/src/main/java/cn/lunadeer/dominion/utils/VaultConnect/VaultInterface.java b/core/src/main/java/cn/lunadeer/dominion/utils/VaultConnect/VaultInterface.java new file mode 100644 index 00000000..e2730404 --- /dev/null +++ b/core/src/main/java/cn/lunadeer/dominion/utils/VaultConnect/VaultInterface.java @@ -0,0 +1,21 @@ +package cn.lunadeer.dominion.utils.VaultConnect; + +import org.bukkit.entity.Player; +import org.bukkit.plugin.java.JavaPlugin; + +public interface VaultInterface { + + public boolean init(JavaPlugin plugin); + + public String currencyNamePlural(); + + + public String currencyNameSingular(); + + public void withdrawPlayer(Player player, double amount); + + public void depositPlayer(Player player, double amount); + + public double getBalance(Player player); + +} diff --git a/logos/logo4.png b/logos/logo4.png new file mode 100644 index 0000000000000000000000000000000000000000..6c7a527519aa457942995de794a953b4d2e53ef8 GIT binary patch literal 12935 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 S0xyr;f+%aftbJ}B@jn0q|LZ&e literal 0 HcmV?d00001 diff --git a/v1_20_1/src/main/java/cn/lunadeer/dominion/events_v1_20_1/SelectPointEvents.java b/v1_20_1/src/main/java/cn/lunadeer/dominion/events_v1_20_1/SelectPointEvents.java index a13bf86b..22ae8799 100644 --- a/v1_20_1/src/main/java/cn/lunadeer/dominion/events_v1_20_1/SelectPointEvents.java +++ b/v1_20_1/src/main/java/cn/lunadeer/dominion/events_v1_20_1/SelectPointEvents.java @@ -5,8 +5,8 @@ import cn.lunadeer.dominion.dtos.DominionDTO; import cn.lunadeer.dominion.managers.Translation; import cn.lunadeer.dominion.utils.Particle; +import cn.lunadeer.dominion.utils.VaultConnect.VaultConnect; import cn.lunadeer.minecraftpluginutils.Notification; -import cn.lunadeer.minecraftpluginutils.VaultConnect.VaultConnect; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.block.Block; diff --git a/v1_21/src/main/java/cn/lunadeer/dominion/events_v1_21/SelectPointEvents.java b/v1_21/src/main/java/cn/lunadeer/dominion/events_v1_21/SelectPointEvents.java index 01b225d5..84b39953 100644 --- a/v1_21/src/main/java/cn/lunadeer/dominion/events_v1_21/SelectPointEvents.java +++ b/v1_21/src/main/java/cn/lunadeer/dominion/events_v1_21/SelectPointEvents.java @@ -5,8 +5,8 @@ import cn.lunadeer.dominion.dtos.DominionDTO; import cn.lunadeer.dominion.managers.Translation; import cn.lunadeer.dominion.utils.Particle; +import cn.lunadeer.dominion.utils.VaultConnect.VaultConnect; import cn.lunadeer.minecraftpluginutils.Notification; -import cn.lunadeer.minecraftpluginutils.VaultConnect.VaultConnect; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.block.Block;