mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-13 04:17:36 +00:00
Add BukkitUtil, VaultUtil for Future Economy Handling
This commit is contained in:
1 parent
63c704f80a
commit
0328be57eb
5 files changed
+789
-12
No files matched your search
@@ -0,0 +1,185 @@
|
||||
package kamkeel.npcs.util;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
/**
|
||||
* Utility class for Bukkit integration detection and common operations.
|
||||
* Must be initialized after the server has fully started to ensure Bukkit plugins are loaded.
|
||||
*/
|
||||
public class BukkitUtil {
|
||||
private static final Logger logger = LogManager.getLogger(BukkitUtil.class);
|
||||
|
||||
private static boolean initialized = false;
|
||||
private static boolean bukkitEnabled = false;
|
||||
|
||||
// Bukkit classes
|
||||
private static Class<?> bukkitClass;
|
||||
private static Class<?> serverClass;
|
||||
private static Class<?> servicesManagerClass;
|
||||
private static Class<?> registeredServiceProviderClass;
|
||||
private static Class<?> offlinePlayerClass;
|
||||
private static Class<?> playerClass;
|
||||
|
||||
// Bukkit methods
|
||||
private static Method getServer;
|
||||
private static Method getServicesManager;
|
||||
private static Method getRegistration;
|
||||
private static Method getProvider;
|
||||
private static Method getOfflinePlayer;
|
||||
private static Method getPlayer;
|
||||
private static Method getPluginManager;
|
||||
private static Method isPluginEnabled;
|
||||
|
||||
/**
|
||||
* Initializes Bukkit integration using reflection.
|
||||
* Should be called during FMLServerStartedEvent to ensure Bukkit is fully loaded.
|
||||
*/
|
||||
public static void init() {
|
||||
if (initialized) {
|
||||
return;
|
||||
}
|
||||
initialized = true;
|
||||
|
||||
try {
|
||||
// Load Bukkit classes
|
||||
bukkitClass = Class.forName("org.bukkit.Bukkit");
|
||||
serverClass = Class.forName("org.bukkit.Server");
|
||||
servicesManagerClass = Class.forName("org.bukkit.plugin.ServicesManager");
|
||||
registeredServiceProviderClass = Class.forName("org.bukkit.plugin.RegisteredServiceProvider");
|
||||
offlinePlayerClass = Class.forName("org.bukkit.OfflinePlayer");
|
||||
playerClass = Class.forName("org.bukkit.entity.Player");
|
||||
|
||||
// Get Bukkit methods
|
||||
getServer = bukkitClass.getMethod("getServer");
|
||||
getServicesManager = bukkitClass.getMethod("getServicesManager");
|
||||
getRegistration = servicesManagerClass.getMethod("getRegistration", Class.class);
|
||||
getProvider = registeredServiceProviderClass.getMethod("getProvider");
|
||||
getOfflinePlayer = bukkitClass.getMethod("getOfflinePlayer", String.class);
|
||||
getPlayer = bukkitClass.getMethod("getPlayer", String.class);
|
||||
getPluginManager = bukkitClass.getMethod("getPluginManager");
|
||||
|
||||
Class<?> pluginManagerClass = Class.forName("org.bukkit.plugin.PluginManager");
|
||||
isPluginEnabled = pluginManagerClass.getMethod("isPluginEnabled", String.class);
|
||||
|
||||
bukkitEnabled = true;
|
||||
logger.info("Bukkit integration enabled");
|
||||
|
||||
// Initialize Vault after Bukkit is confirmed
|
||||
VaultUtil.init();
|
||||
|
||||
} catch (ClassNotFoundException e) {
|
||||
logger.debug("Bukkit not found, Bukkit integration disabled");
|
||||
} catch (NoSuchMethodException e) {
|
||||
logger.error("Bukkit API method not found", e);
|
||||
} catch (Exception e) {
|
||||
logger.error("Error initializing Bukkit integration", e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return true if Bukkit integration is enabled
|
||||
*/
|
||||
public static boolean isEnabled() {
|
||||
return bukkitEnabled;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return true if Bukkit has been initialized (may or may not be enabled)
|
||||
*/
|
||||
public static boolean isInitialized() {
|
||||
return initialized;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if a specific Bukkit plugin is enabled.
|
||||
* @param pluginName the plugin name to check
|
||||
* @return true if the plugin is enabled
|
||||
*/
|
||||
public static boolean isPluginEnabled(String pluginName) {
|
||||
if (!bukkitEnabled) return false;
|
||||
|
||||
try {
|
||||
Object pluginManager = getPluginManager.invoke(null);
|
||||
return (Boolean) isPluginEnabled.invoke(pluginManager, pluginName);
|
||||
} catch (Exception e) {
|
||||
logger.error("Error checking if plugin is enabled: " + pluginName, e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets a Bukkit OfflinePlayer by name.
|
||||
* @param playerName the player name
|
||||
* @return the OfflinePlayer object, or null if not available
|
||||
*/
|
||||
public static Object getOfflinePlayer(String playerName) {
|
||||
if (!bukkitEnabled) return null;
|
||||
|
||||
try {
|
||||
return getOfflinePlayer.invoke(null, playerName);
|
||||
} catch (Exception e) {
|
||||
logger.error("Error getting OfflinePlayer: " + playerName, e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets a Bukkit Player by name (online players only).
|
||||
* @param playerName the player name
|
||||
* @return the Player object, or null if not online or not available
|
||||
*/
|
||||
public static Object getPlayer(String playerName) {
|
||||
if (!bukkitEnabled) return null;
|
||||
|
||||
try {
|
||||
return getPlayer.invoke(null, playerName);
|
||||
} catch (Exception e) {
|
||||
logger.error("Error getting Player: " + playerName, e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets a service provider from Bukkit's ServicesManager.
|
||||
* @param serviceClass the service class to get
|
||||
* @return the service provider, or null if not available
|
||||
*/
|
||||
public static Object getServiceProvider(Class<?> serviceClass) {
|
||||
if (!bukkitEnabled) return null;
|
||||
|
||||
try {
|
||||
Object servicesManager = getServicesManager.invoke(null);
|
||||
Object registration = getRegistration.invoke(servicesManager, serviceClass);
|
||||
if (registration != null) {
|
||||
return getProvider.invoke(registration);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
logger.error("Error getting service provider: " + serviceClass.getName(), e);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
// Getters for classes (for use by other utils like VaultUtil)
|
||||
public static Class<?> getBukkitClass() {
|
||||
return bukkitClass;
|
||||
}
|
||||
|
||||
public static Class<?> getServicesManagerClass() {
|
||||
return servicesManagerClass;
|
||||
}
|
||||
|
||||
public static Class<?> getRegisteredServiceProviderClass() {
|
||||
return registeredServiceProviderClass;
|
||||
}
|
||||
|
||||
public static Class<?> getOfflinePlayerClass() {
|
||||
return offlinePlayerClass;
|
||||
}
|
||||
|
||||
public static Class<?> getPlayerClass() {
|
||||
return playerClass;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,575 @@
|
||||
package kamkeel.npcs.util;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
/**
|
||||
* Utility class for Vault Economy integration.
|
||||
* Uses reflection to access Vault API when available.
|
||||
* Requires BukkitUtil to be initialized first.
|
||||
*/
|
||||
public class VaultUtil {
|
||||
private static final Logger logger = LogManager.getLogger(VaultUtil.class);
|
||||
|
||||
private static boolean initialized = false;
|
||||
private static boolean vaultEnabled = false;
|
||||
|
||||
// Vault classes
|
||||
private static Class<?> economyClass;
|
||||
private static Class<?> economyResponseClass;
|
||||
|
||||
// Economy methods
|
||||
private static Method isEnabled;
|
||||
private static Method getName;
|
||||
private static Method hasAccount;
|
||||
private static Method hasAccountOffline;
|
||||
private static Method getBalance;
|
||||
private static Method getBalanceOffline;
|
||||
private static Method has;
|
||||
private static Method hasOffline;
|
||||
private static Method withdrawPlayer;
|
||||
private static Method withdrawPlayerOffline;
|
||||
private static Method depositPlayer;
|
||||
private static Method depositPlayerOffline;
|
||||
private static Method format;
|
||||
private static Method currencyNamePlural;
|
||||
private static Method currencyNameSingular;
|
||||
private static Method createPlayerAccount;
|
||||
private static Method createPlayerAccountOffline;
|
||||
private static Method hasBankSupport;
|
||||
private static Method getBanks;
|
||||
private static Method bankBalance;
|
||||
private static Method bankHas;
|
||||
private static Method bankWithdraw;
|
||||
private static Method bankDeposit;
|
||||
|
||||
// EconomyResponse methods
|
||||
private static Method transactionSuccess;
|
||||
|
||||
// Cached economy instance
|
||||
private static Object economyInstance;
|
||||
|
||||
/**
|
||||
* Initializes the Vault integration using reflection.
|
||||
* Called automatically by BukkitUtil after Bukkit is confirmed available.
|
||||
*/
|
||||
public static void init() {
|
||||
if (initialized) {
|
||||
return;
|
||||
}
|
||||
initialized = true;
|
||||
|
||||
if (!BukkitUtil.isEnabled()) {
|
||||
logger.debug("Bukkit not available, Vault integration disabled");
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
Class<?> offlinePlayerClass = BukkitUtil.getOfflinePlayerClass();
|
||||
if (offlinePlayerClass == null) {
|
||||
logger.error("Could not get OfflinePlayer class from BukkitUtil");
|
||||
return;
|
||||
}
|
||||
|
||||
// Load Vault classes
|
||||
economyClass = Class.forName("net.milkbowl.vault.economy.Economy");
|
||||
economyResponseClass = Class.forName("net.milkbowl.vault.economy.EconomyResponse");
|
||||
|
||||
// Get Economy methods (using deprecated String methods for broader compatibility)
|
||||
isEnabled = economyClass.getMethod("isEnabled");
|
||||
getName = economyClass.getMethod("getName");
|
||||
hasAccount = economyClass.getMethod("hasAccount", String.class);
|
||||
hasAccountOffline = economyClass.getMethod("hasAccount", offlinePlayerClass);
|
||||
getBalance = economyClass.getMethod("getBalance", String.class);
|
||||
getBalanceOffline = economyClass.getMethod("getBalance", offlinePlayerClass);
|
||||
has = economyClass.getMethod("has", String.class, double.class);
|
||||
hasOffline = economyClass.getMethod("has", offlinePlayerClass, double.class);
|
||||
withdrawPlayer = economyClass.getMethod("withdrawPlayer", String.class, double.class);
|
||||
withdrawPlayerOffline = economyClass.getMethod("withdrawPlayer", offlinePlayerClass, double.class);
|
||||
depositPlayer = economyClass.getMethod("depositPlayer", String.class, double.class);
|
||||
depositPlayerOffline = economyClass.getMethod("depositPlayer", offlinePlayerClass, double.class);
|
||||
format = economyClass.getMethod("format", double.class);
|
||||
currencyNamePlural = economyClass.getMethod("currencyNamePlural");
|
||||
currencyNameSingular = economyClass.getMethod("currencyNameSingular");
|
||||
createPlayerAccount = economyClass.getMethod("createPlayerAccount", String.class);
|
||||
createPlayerAccountOffline = economyClass.getMethod("createPlayerAccount", offlinePlayerClass);
|
||||
hasBankSupport = economyClass.getMethod("hasBankSupport");
|
||||
getBanks = economyClass.getMethod("getBanks");
|
||||
bankBalance = economyClass.getMethod("bankBalance", String.class);
|
||||
bankHas = economyClass.getMethod("bankHas", String.class, double.class);
|
||||
bankWithdraw = economyClass.getMethod("bankWithdraw", String.class, double.class);
|
||||
bankDeposit = economyClass.getMethod("bankDeposit", String.class, double.class);
|
||||
|
||||
// Get EconomyResponse methods
|
||||
transactionSuccess = economyResponseClass.getMethod("transactionSuccess");
|
||||
|
||||
// Get the economy instance
|
||||
economyInstance = BukkitUtil.getServiceProvider(economyClass);
|
||||
|
||||
if (economyInstance != null) {
|
||||
vaultEnabled = true;
|
||||
logger.info("Vault Economy integration enabled - Provider: " + getEconomyName());
|
||||
} else {
|
||||
logger.info("Vault found but no Economy provider registered");
|
||||
}
|
||||
|
||||
} catch (ClassNotFoundException e) {
|
||||
logger.debug("Vault not found, economy integration disabled");
|
||||
} catch (NoSuchMethodException e) {
|
||||
logger.error("Vault API method not found, economy integration disabled", e);
|
||||
} catch (Exception e) {
|
||||
logger.error("Error initializing Vault integration", e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Refreshes the economy provider. Call this if the economy plugin loads after initialization.
|
||||
*/
|
||||
public static void refreshEconomyProvider() {
|
||||
if (!initialized || !BukkitUtil.isEnabled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
economyInstance = BukkitUtil.getServiceProvider(economyClass);
|
||||
if (economyInstance != null) {
|
||||
vaultEnabled = true;
|
||||
logger.info("Vault Economy provider refreshed: " + getEconomyName());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
logger.error("Error refreshing Vault economy provider", e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return true if Vault economy integration is enabled and working
|
||||
*/
|
||||
public static boolean isEnabled() {
|
||||
if (!vaultEnabled || economyInstance == null) return false;
|
||||
|
||||
try {
|
||||
return (Boolean) isEnabled.invoke(economyInstance);
|
||||
} catch (Exception e) {
|
||||
logger.error("Error checking if economy is enabled", e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the name of the economy provider, or null if not available
|
||||
*/
|
||||
public static String getEconomyName() {
|
||||
if (!vaultEnabled || economyInstance == null) return null;
|
||||
|
||||
try {
|
||||
return (String) getName.invoke(economyInstance);
|
||||
} catch (Exception e) {
|
||||
logger.error("Error getting economy name", e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if a player has an account in the economy system.
|
||||
* @param player the player to check
|
||||
* @return true if the player has an account
|
||||
*/
|
||||
public static boolean hasAccount(EntityPlayer player) {
|
||||
return hasAccount(player.getCommandSenderName());
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if a player has an account in the economy system.
|
||||
* @param playerName the player name to check
|
||||
* @return true if the player has an account
|
||||
*/
|
||||
public static boolean hasAccount(String playerName) {
|
||||
if (!vaultEnabled || economyInstance == null) return false;
|
||||
|
||||
try {
|
||||
Object offlinePlayer = BukkitUtil.getOfflinePlayer(playerName);
|
||||
if (offlinePlayer != null) {
|
||||
return (Boolean) hasAccountOffline.invoke(economyInstance, offlinePlayer);
|
||||
}
|
||||
return (Boolean) hasAccount.invoke(economyInstance, playerName);
|
||||
} catch (Exception e) {
|
||||
logger.error("Error checking if player has account: " + playerName, e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the balance of a player.
|
||||
* @param player the player
|
||||
* @return the player's balance, or 0 if not available
|
||||
*/
|
||||
public static double getBalance(EntityPlayer player) {
|
||||
return getBalance(player.getCommandSenderName());
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the balance of a player by name.
|
||||
* @param playerName the player name
|
||||
* @return the player's balance, or 0 if not available
|
||||
*/
|
||||
public static double getBalance(String playerName) {
|
||||
if (!vaultEnabled || economyInstance == null) return 0;
|
||||
|
||||
try {
|
||||
Object offlinePlayer = BukkitUtil.getOfflinePlayer(playerName);
|
||||
if (offlinePlayer != null) {
|
||||
return (Double) getBalanceOffline.invoke(economyInstance, offlinePlayer);
|
||||
}
|
||||
return (Double) getBalance.invoke(economyInstance, playerName);
|
||||
} catch (Exception e) {
|
||||
logger.error("Error getting balance for player: " + playerName, e);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if a player has at least the specified amount.
|
||||
* @param player the player
|
||||
* @param amount the amount to check
|
||||
* @return true if the player has at least the specified amount
|
||||
*/
|
||||
public static boolean has(EntityPlayer player, double amount) {
|
||||
return has(player.getCommandSenderName(), amount);
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if a player has at least the specified amount.
|
||||
* @param playerName the player name
|
||||
* @param amount the amount to check
|
||||
* @return true if the player has at least the specified amount
|
||||
*/
|
||||
public static boolean has(String playerName, double amount) {
|
||||
if (!vaultEnabled || economyInstance == null) return false;
|
||||
|
||||
try {
|
||||
Object offlinePlayer = BukkitUtil.getOfflinePlayer(playerName);
|
||||
if (offlinePlayer != null) {
|
||||
return (Boolean) hasOffline.invoke(economyInstance, offlinePlayer, amount);
|
||||
}
|
||||
return (Boolean) has.invoke(economyInstance, playerName, amount);
|
||||
} catch (Exception e) {
|
||||
logger.error("Error checking if player has amount: " + playerName, e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Withdraws money from a player's account.
|
||||
* @param player the player
|
||||
* @param amount the amount to withdraw
|
||||
* @return true if the transaction was successful
|
||||
*/
|
||||
public static boolean withdrawMoney(EntityPlayer player, double amount) {
|
||||
return withdrawMoney(player.getCommandSenderName(), amount);
|
||||
}
|
||||
|
||||
/**
|
||||
* Withdraws money from a player's account.
|
||||
* @param playerName the player name
|
||||
* @param amount the amount to withdraw
|
||||
* @return true if the transaction was successful
|
||||
*/
|
||||
public static boolean withdrawMoney(String playerName, double amount) {
|
||||
if (!vaultEnabled || economyInstance == null) return false;
|
||||
|
||||
try {
|
||||
Object offlinePlayer = BukkitUtil.getOfflinePlayer(playerName);
|
||||
Object response;
|
||||
if (offlinePlayer != null) {
|
||||
response = withdrawPlayerOffline.invoke(economyInstance, offlinePlayer, amount);
|
||||
} else {
|
||||
response = withdrawPlayer.invoke(economyInstance, playerName, amount);
|
||||
}
|
||||
return (Boolean) transactionSuccess.invoke(response);
|
||||
} catch (Exception e) {
|
||||
logger.error("Error withdrawing money from player: " + playerName, e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds money to a player's account (deposit).
|
||||
* @param player the player
|
||||
* @param amount the amount to add
|
||||
* @return true if the transaction was successful
|
||||
*/
|
||||
public static boolean addMoney(EntityPlayer player, double amount) {
|
||||
return addMoney(player.getCommandSenderName(), amount);
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds money to a player's account (deposit).
|
||||
* @param playerName the player name
|
||||
* @param amount the amount to add
|
||||
* @return true if the transaction was successful
|
||||
*/
|
||||
public static boolean addMoney(String playerName, double amount) {
|
||||
if (!vaultEnabled || economyInstance == null) return false;
|
||||
|
||||
try {
|
||||
Object offlinePlayer = BukkitUtil.getOfflinePlayer(playerName);
|
||||
Object response;
|
||||
if (offlinePlayer != null) {
|
||||
response = depositPlayerOffline.invoke(economyInstance, offlinePlayer, amount);
|
||||
} else {
|
||||
response = depositPlayer.invoke(economyInstance, playerName, amount);
|
||||
}
|
||||
return (Boolean) transactionSuccess.invoke(response);
|
||||
} catch (Exception e) {
|
||||
logger.error("Error adding money to player: " + playerName, e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets a player's balance to the specified amount.
|
||||
* This withdraws all money first, then deposits the new amount.
|
||||
* @param player the player
|
||||
* @param amount the new balance
|
||||
* @return true if the transaction was successful
|
||||
*/
|
||||
public static boolean setBalance(EntityPlayer player, double amount) {
|
||||
return setBalance(player.getCommandSenderName(), amount);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets a player's balance to the specified amount.
|
||||
* This withdraws all money first, then deposits the new amount.
|
||||
* @param playerName the player name
|
||||
* @param amount the new balance
|
||||
* @return true if the transaction was successful
|
||||
*/
|
||||
public static boolean setBalance(String playerName, double amount) {
|
||||
if (!vaultEnabled || economyInstance == null) return false;
|
||||
|
||||
double currentBalance = getBalance(playerName);
|
||||
if (currentBalance > 0) {
|
||||
if (!withdrawMoney(playerName, currentBalance)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
if (amount > 0) {
|
||||
return addMoney(playerName, amount);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Formats an amount according to the economy plugin's settings.
|
||||
* @param amount the amount to format
|
||||
* @return the formatted string, or the raw number as string if not available
|
||||
*/
|
||||
public static String format(double amount) {
|
||||
if (!vaultEnabled || economyInstance == null) return String.valueOf(amount);
|
||||
|
||||
try {
|
||||
return (String) format.invoke(economyInstance, amount);
|
||||
} catch (Exception e) {
|
||||
logger.error("Error formatting amount", e);
|
||||
return String.valueOf(amount);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the plural currency name (e.g., "Dollars").
|
||||
* @return the plural currency name, or "coins" if not available
|
||||
*/
|
||||
public static String getCurrencyNamePlural() {
|
||||
if (!vaultEnabled || economyInstance == null) return "coins";
|
||||
|
||||
try {
|
||||
return (String) currencyNamePlural.invoke(economyInstance);
|
||||
} catch (Exception e) {
|
||||
logger.error("Error getting currency name plural", e);
|
||||
return "coins";
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the singular currency name (e.g., "Dollar").
|
||||
* @return the singular currency name, or "coin" if not available
|
||||
*/
|
||||
public static String getCurrencyNameSingular() {
|
||||
if (!vaultEnabled || economyInstance == null) return "coin";
|
||||
|
||||
try {
|
||||
return (String) currencyNameSingular.invoke(economyInstance);
|
||||
} catch (Exception e) {
|
||||
logger.error("Error getting currency name singular", e);
|
||||
return "coin";
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates an account for the player if one doesn't exist.
|
||||
* @param player the player
|
||||
* @return true if the account was created or already exists
|
||||
*/
|
||||
public static boolean createAccount(EntityPlayer player) {
|
||||
return createAccount(player.getCommandSenderName());
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates an account for the player if one doesn't exist.
|
||||
* @param playerName the player name
|
||||
* @return true if the account was created or already exists
|
||||
*/
|
||||
public static boolean createAccount(String playerName) {
|
||||
if (!vaultEnabled || economyInstance == null) return false;
|
||||
|
||||
if (hasAccount(playerName)) return true;
|
||||
|
||||
try {
|
||||
Object offlinePlayer = BukkitUtil.getOfflinePlayer(playerName);
|
||||
if (offlinePlayer != null) {
|
||||
return (Boolean) createPlayerAccountOffline.invoke(economyInstance, offlinePlayer);
|
||||
}
|
||||
return (Boolean) createPlayerAccount.invoke(economyInstance, playerName);
|
||||
} catch (Exception e) {
|
||||
logger.error("Error creating account for player: " + playerName, e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return true if the economy supports bank accounts
|
||||
*/
|
||||
public static boolean hasBankSupport() {
|
||||
if (!vaultEnabled || economyInstance == null) return false;
|
||||
|
||||
try {
|
||||
return (Boolean) hasBankSupport.invoke(economyInstance);
|
||||
} catch (Exception e) {
|
||||
logger.error("Error checking bank support", e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets a list of all bank names.
|
||||
* @return list of bank names, or empty list if not available
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
public static java.util.List<String> getBanks() {
|
||||
if (!vaultEnabled || economyInstance == null) return java.util.Collections.emptyList();
|
||||
|
||||
try {
|
||||
return (java.util.List<String>) getBanks.invoke(economyInstance);
|
||||
} catch (Exception e) {
|
||||
logger.error("Error getting banks", e);
|
||||
return java.util.Collections.emptyList();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the balance of a bank.
|
||||
* @param bankName the bank name
|
||||
* @return the bank balance, or 0 if not available
|
||||
*/
|
||||
public static double getBankBalance(String bankName) {
|
||||
if (!vaultEnabled || economyInstance == null) return 0;
|
||||
|
||||
try {
|
||||
Object response = bankBalance.invoke(economyInstance, bankName);
|
||||
return economyResponseClass.getField("balance").getDouble(response);
|
||||
} catch (Exception e) {
|
||||
logger.error("Error getting bank balance: " + bankName, e);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if a bank has at least the specified amount.
|
||||
* @param bankName the bank name
|
||||
* @param amount the amount to check
|
||||
* @return true if the bank has at least the specified amount
|
||||
*/
|
||||
public static boolean bankHas(String bankName, double amount) {
|
||||
if (!vaultEnabled || economyInstance == null) return false;
|
||||
|
||||
try {
|
||||
Object response = bankHas.invoke(economyInstance, bankName, amount);
|
||||
return (Boolean) transactionSuccess.invoke(response);
|
||||
} catch (Exception e) {
|
||||
logger.error("Error checking bank balance: " + bankName, e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Withdraws money from a bank.
|
||||
* @param bankName the bank name
|
||||
* @param amount the amount to withdraw
|
||||
* @return true if the transaction was successful
|
||||
*/
|
||||
public static boolean bankWithdraw(String bankName, double amount) {
|
||||
if (!vaultEnabled || economyInstance == null) return false;
|
||||
|
||||
try {
|
||||
Object response = bankWithdraw.invoke(economyInstance, bankName, amount);
|
||||
return (Boolean) transactionSuccess.invoke(response);
|
||||
} catch (Exception e) {
|
||||
logger.error("Error withdrawing from bank: " + bankName, e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Deposits money into a bank.
|
||||
* @param bankName the bank name
|
||||
* @param amount the amount to deposit
|
||||
* @return true if the transaction was successful
|
||||
*/
|
||||
public static boolean bankDeposit(String bankName, double amount) {
|
||||
if (!vaultEnabled || economyInstance == null) return false;
|
||||
|
||||
try {
|
||||
Object response = bankDeposit.invoke(economyInstance, bankName, amount);
|
||||
return (Boolean) transactionSuccess.invoke(response);
|
||||
} catch (Exception e) {
|
||||
logger.error("Error depositing to bank: " + bankName, e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Transfers money from one player to another.
|
||||
* @param from the player to take money from
|
||||
* @param to the player to give money to
|
||||
* @param amount the amount to transfer
|
||||
* @return true if the transfer was successful
|
||||
*/
|
||||
public static boolean transfer(EntityPlayer from, EntityPlayer to, double amount) {
|
||||
return transfer(from.getCommandSenderName(), to.getCommandSenderName(), amount);
|
||||
}
|
||||
|
||||
/**
|
||||
* Transfers money from one player to another.
|
||||
* @param fromPlayerName the player name to take money from
|
||||
* @param toPlayerName the player name to give money to
|
||||
* @param amount the amount to transfer
|
||||
* @return true if the transfer was successful
|
||||
*/
|
||||
public static boolean transfer(String fromPlayerName, String toPlayerName, double amount) {
|
||||
if (!has(fromPlayerName, amount)) {
|
||||
return false;
|
||||
}
|
||||
if (!withdrawMoney(fromPlayerName, amount)) {
|
||||
return false;
|
||||
}
|
||||
if (!addMoney(toPlayerName, amount)) {
|
||||
// Rollback
|
||||
addMoney(fromPlayerName, amount);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -23,6 +23,7 @@ import kamkeel.npcs.controllers.SyncController;
|
||||
import kamkeel.npcs.controllers.data.profile.CNPCData;
|
||||
import kamkeel.npcs.developer.Developer;
|
||||
import kamkeel.npcs.network.PacketHandler;
|
||||
import kamkeel.npcs.util.BukkitUtil;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockIce;
|
||||
import net.minecraft.block.BlockLeavesBase;
|
||||
@@ -317,6 +318,10 @@ public class CustomNpcs {
|
||||
ServerCloneController.Instance = new ServerCloneController();
|
||||
ServerTagMapController.Instance = new ServerTagMapController();
|
||||
SyncController.load();
|
||||
|
||||
// Initialize Bukkit integration (loads Vault and Permissions)
|
||||
BukkitUtil.init();
|
||||
CustomNpcsPermissions.Instance.init();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@ package noppes.npcs;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import kamkeel.npcs.developer.Developer;
|
||||
import kamkeel.npcs.util.BukkitUtil;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
@@ -110,24 +111,29 @@ public class CustomNpcsPermissions {
|
||||
public static final Permission PROFILE_MAX = new Permission("customnpcs.profile.max.*");
|
||||
|
||||
public static CustomNpcsPermissions Instance;
|
||||
private Class<?> bukkit;
|
||||
private Method getPlayer;
|
||||
private Method hasPermission;
|
||||
|
||||
public CustomNpcsPermissions() {
|
||||
Instance = this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Initializes permission checking using BukkitUtil.
|
||||
* Called after BukkitUtil is initialized on server start.
|
||||
*/
|
||||
public void init() {
|
||||
if (!BukkitUtil.isEnabled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
bukkit = Class.forName("org.bukkit.Bukkit");
|
||||
getPlayer = bukkit.getMethod("getPlayer", String.class);
|
||||
hasPermission = Class.forName("org.bukkit.entity.Player").getMethod("hasPermission", String.class);
|
||||
hasPermission = BukkitUtil.getPlayerClass().getMethod("hasPermission", String.class);
|
||||
LogManager.getLogger(CustomNpcs.class).info("Bukkit permissions enabled");
|
||||
LogManager.getLogger(CustomNpcs.class).info("Permissions available:");
|
||||
Collections.sort(Permission.permissions, String.CASE_INSENSITIVE_ORDER);
|
||||
for (String p : Permission.permissions) {
|
||||
LogManager.getLogger(CustomNpcs.class).info(p);
|
||||
}
|
||||
} catch (ClassNotFoundException e) {
|
||||
// bukkit/mcpc+ is not loaded
|
||||
} catch (NoSuchMethodException e) {
|
||||
e.printStackTrace();
|
||||
} catch (SecurityException e) {
|
||||
@@ -142,7 +148,7 @@ public class CustomNpcsPermissions {
|
||||
if (Developer.Instance.hasUniversal(player.getUniqueID()))
|
||||
return true;
|
||||
if (permission != null) {
|
||||
if (Instance.bukkit != null) {
|
||||
if (BukkitUtil.isEnabled()) {
|
||||
return Instance.bukkitPermission(player.getCommandSenderName(), permission.name);
|
||||
}
|
||||
}
|
||||
@@ -156,7 +162,7 @@ public class CustomNpcsPermissions {
|
||||
return true;
|
||||
if (Developer.Instance.hasUniversal(player.getUniqueID()))
|
||||
return true;
|
||||
if (Instance.bukkit != null) {
|
||||
if (BukkitUtil.isEnabled()) {
|
||||
return Instance.bukkitPermission(player.getCommandSenderName(), permission);
|
||||
}
|
||||
}
|
||||
@@ -164,8 +170,11 @@ public class CustomNpcsPermissions {
|
||||
}
|
||||
|
||||
private boolean bukkitPermission(String username, String permission) {
|
||||
if (hasPermission == null) return false;
|
||||
|
||||
try {
|
||||
Object player = getPlayer.invoke(null, username);
|
||||
Object player = BukkitUtil.getPlayer(username);
|
||||
if (player == null) return false;
|
||||
return (Boolean) hasPermission.invoke(player, permission);
|
||||
} catch (IllegalAccessException e) {
|
||||
e.printStackTrace();
|
||||
@@ -189,13 +198,13 @@ public class CustomNpcsPermissions {
|
||||
}
|
||||
|
||||
public static boolean hasPermissionString(EntityPlayerMP player, String permission) {
|
||||
if (Instance.bukkit != null) {
|
||||
if (BukkitUtil.isEnabled()) {
|
||||
return Instance.bukkitPermission(player.getCommandSenderName(), permission);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public static boolean enabled() {
|
||||
return Instance.bukkit != null;
|
||||
return BukkitUtil.isEnabled();
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user