From 8835e69e3c96683873c4d735221d9cdceef04932 Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Sun, 19 Sep 2021 15:05:19 +0200 Subject: [PATCH] Moves some code from Stargate to EconomyHandler --- .../java/net/knarcraft/stargate/Stargate.java | 79 +-------- .../stargate/listener/BlockEventListener.java | 14 +- .../listener/PlayerEventListener.java | 3 +- .../listener/VehicleEventListener.java | 3 +- .../net/knarcraft/stargate/portal/Gate.java | 5 +- .../stargate/portal/PortalHandler.java | 5 +- .../stargate/utility/EconomyHandler.java | 166 +++++++++++++++--- .../stargate/utility/EconomyHelper.java | 4 +- 8 files changed, 166 insertions(+), 113 deletions(-) diff --git a/src/main/java/net/knarcraft/stargate/Stargate.java b/src/main/java/net/knarcraft/stargate/Stargate.java index 64f8e92..d0f02a9 100644 --- a/src/main/java/net/knarcraft/stargate/Stargate.java +++ b/src/main/java/net/knarcraft/stargate/Stargate.java @@ -264,8 +264,11 @@ public class Stargate extends JavaPlugin { return !hasPermission(player, "stargate.world." + world); } - /* - * Check whether player can use network + /** + * Checks whether a player can access the given network + * @param player

The player to check

+ * @param network

The network to check

+ * @return

True if the player is denied from accessing the network

*/ public static boolean cannotAccessNetwork(Player player, String network) { // Can user all stargate player features, or access all networks @@ -273,8 +276,10 @@ public class Stargate extends JavaPlugin { // Do a deep check to see if the player lacks this specific network node return !hasPermDeep(player, "stargate.network." + network); } - // Can access this network - if (hasPermission(player, "stargate.network." + network)) return false; + //Check if the player can access this network + if (hasPermission(player, "stargate.network." + network)) { + return false; + } // Is able to create personal gates (Assumption is made they can also access them) String playerName = player.getName(); if (playerName.length() > 11) playerName = playerName.substring(0, 11); @@ -457,72 +462,6 @@ public class Stargate extends JavaPlugin { return portal.isOwner(player) && hasPermission(player, "stargate.destroy.personal"); } - /* - * Charge player for {action} if required, true on success, false if can't afford - */ - public static boolean chargePlayer(Player player, UUID target, int cost) { - // If cost is 0 - if (cost == 0) return true; - // Economy is disabled - if (!EconomyHandler.useEconomy()) return true; - // Charge player - return EconomyHandler.chargePlayer(player, target, cost); - } - - /* - * Charge player for {action} if required, true on success, false if can't afford - */ - public static boolean chargePlayer(Player player, int cost) { - // If cost is 0 - if (cost == 0) return true; - // Economy is disabled - if (!EconomyHandler.useEconomy()) return true; - // Charge player - return EconomyHandler.chargePlayer(player, cost); - } - - /* - * Determine the cost of a gate - */ - public static int getUseCost(Player player, Portal src, Portal dest) { - // Not using Economy - if (!EconomyHandler.useEconomy()) return 0; - // Portal is free - if (src.isFree()) return 0; - // Not charging for free destinations - if (dest != null && !EconomyHandler.chargeFreeDestination && dest.isFree()) return 0; - // Cost is 0 if the player owns this gate and funds go to the owner - if (src.getGate().getToOwner() && src.isOwner(player)) return 0; - // Player gets free gate use - if (hasPermission(player, "stargate.free") || hasPermission(player, "stargate.free.use")) return 0; - - return src.getGate().getUseCost(); - } - - /* - * Determine the cost to create the gate - */ - public static int getCreateCost(Player player, Gate gate) { - // Not using Economy - if (!EconomyHandler.useEconomy()) return 0; - // Player gets free gate destruction - if (hasPermission(player, "stargate.free") || hasPermission(player, "stargate.free.create")) return 0; - - return gate.getCreateCost(); - } - - /* - * Determine the cost to destroy the gate - */ - public static int getDestroyCost(Player player, Gate gate) { - // Not using Economy - if (!EconomyHandler.useEconomy()) return 0; - // Player gets free gate destruction - if (hasPermission(player, "stargate.free") || hasPermission(player, "stargate.free.destroy")) return 0; - - return gate.getDestroyCost(); - } - /** * Replaces a list of variables in a string in the order they are given * diff --git a/src/main/java/net/knarcraft/stargate/listener/BlockEventListener.java b/src/main/java/net/knarcraft/stargate/listener/BlockEventListener.java index 99ff498..cc5eb9e 100644 --- a/src/main/java/net/knarcraft/stargate/listener/BlockEventListener.java +++ b/src/main/java/net/knarcraft/stargate/listener/BlockEventListener.java @@ -4,6 +4,7 @@ import net.knarcraft.stargate.portal.Portal; import net.knarcraft.stargate.portal.PortalHandler; import net.knarcraft.stargate.Stargate; import net.knarcraft.stargate.event.StargateDestroyEvent; +import net.knarcraft.stargate.utility.EconomyHandler; import net.knarcraft.stargate.utility.EconomyHelper; import net.knarcraft.stargate.utility.MaterialHelper; import org.bukkit.Material; @@ -89,7 +90,7 @@ public class BlockEventListener implements Listener { Stargate.log.info(Stargate.getString("prefix") + player.getName() + " tried to destroy gate"); } - int cost = Stargate.getDestroyCost(player, portal.getGate()); + int cost = EconomyHandler.getDestroyCost(player, portal.getGate()); //Create and call a StarGateDestroyEvent StargateDestroyEvent destroyEvent = new StargateDestroyEvent(portal, player, deny, denyMsg, cost); @@ -128,16 +129,19 @@ public class BlockEventListener implements Listener { BlockBreakEvent event) { int cost = destroyEvent.getCost(); if (cost != 0) { - if (!Stargate.chargePlayer(player, cost)) { + String portalName = portal.getName(); + //Cannot pay + if (!EconomyHandler.chargePlayerIfNecessary(player, cost)) { Stargate.debug("onBlockBreak", "Insufficient Funds"); - EconomyHelper.sendInsufficientFundsMessage(portal.getName(), player, cost); + EconomyHelper.sendInsufficientFundsMessage(portalName, player, cost); event.setCancelled(true); return false; } + //Tell the player they've paid or deceived money if (cost > 0) { - EconomyHelper.sendDeductMessage(portal.getName(), player, cost); + EconomyHelper.sendDeductMessage(portalName, player, cost); } else { - EconomyHelper.sendRefundMessage(portal.getName(), player, cost); + EconomyHelper.sendRefundMessage(portalName, player, cost); } } return true; diff --git a/src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java b/src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java index e8b88de..f7ac066 100644 --- a/src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java +++ b/src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java @@ -5,6 +5,7 @@ import net.knarcraft.stargate.portal.Portal; import net.knarcraft.stargate.portal.PortalHandler; import net.knarcraft.stargate.Stargate; import net.knarcraft.stargate.utility.BungeeHelper; +import net.knarcraft.stargate.utility.EconomyHandler; import net.knarcraft.stargate.utility.EconomyHelper; import net.knarcraft.stargate.utility.MaterialHelper; import org.bukkit.GameMode; @@ -378,7 +379,7 @@ public class PlayerEventListener implements Listener { } //Player cannot pay for teleportation - int cost = Stargate.getUseCost(player, entrancePortal, destination); + int cost = EconomyHandler.getUseCost(player, entrancePortal, destination); if (cost > 0) { return EconomyHelper.payTeleportFee(entrancePortal, player, cost); } diff --git a/src/main/java/net/knarcraft/stargate/listener/VehicleEventListener.java b/src/main/java/net/knarcraft/stargate/listener/VehicleEventListener.java index 5175517..eba8466 100644 --- a/src/main/java/net/knarcraft/stargate/listener/VehicleEventListener.java +++ b/src/main/java/net/knarcraft/stargate/listener/VehicleEventListener.java @@ -3,6 +3,7 @@ package net.knarcraft.stargate.listener; import net.knarcraft.stargate.portal.Portal; import net.knarcraft.stargate.portal.PortalHandler; import net.knarcraft.stargate.Stargate; +import net.knarcraft.stargate.utility.EconomyHandler; import net.knarcraft.stargate.utility.EconomyHelper; import net.knarcraft.stargate.utility.EntityHelper; import org.bukkit.entity.Entity; @@ -99,7 +100,7 @@ public class VehicleEventListener implements Listener { } //Transfer payment if necessary - int cost = Stargate.getUseCost(player, entrancePortal, destinationPortal); + int cost = EconomyHandler.getUseCost(player, entrancePortal, destinationPortal); if (cost > 0) { if (!EconomyHelper.payTeleportFee(entrancePortal, player, cost)) { return; diff --git a/src/main/java/net/knarcraft/stargate/portal/Gate.java b/src/main/java/net/knarcraft/stargate/portal/Gate.java index 29090a6..55673fc 100644 --- a/src/main/java/net/knarcraft/stargate/portal/Gate.java +++ b/src/main/java/net/knarcraft/stargate/portal/Gate.java @@ -161,7 +161,7 @@ public class Gate { * @return

The cost of creating a portal with this gate

*/ public Integer getCreateCost() { - return createCost < 0 ? EconomyHandler.getCreateCost() : createCost; + return createCost < 0 ? EconomyHandler.getDefaultCreateCost() : createCost; } /** @@ -170,8 +170,7 @@ public class Gate { * @return

The cost of destroying a portal with this gate

*/ public Integer getDestroyCost() { - if (destroyCost < 0) return EconomyHandler.getDestroyCost(); - return destroyCost; + return destroyCost < 0 ? EconomyHandler.getDefaultDestroyCost() : destroyCost; } /** diff --git a/src/main/java/net/knarcraft/stargate/portal/PortalHandler.java b/src/main/java/net/knarcraft/stargate/portal/PortalHandler.java index 62cb745..ac7f41d 100644 --- a/src/main/java/net/knarcraft/stargate/portal/PortalHandler.java +++ b/src/main/java/net/knarcraft/stargate/portal/PortalHandler.java @@ -6,6 +6,7 @@ import net.knarcraft.stargate.Stargate; import net.knarcraft.stargate.container.TwoTuple; import net.knarcraft.stargate.event.StargateCreateEvent; import net.knarcraft.stargate.utility.DirectionHelper; +import net.knarcraft.stargate.utility.EconomyHandler; import net.knarcraft.stargate.utility.EconomyHelper; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -395,7 +396,7 @@ public class PortalHandler { portal = new Portal(topLeft, modX, modZ, yaw, id, button, destinationName, name, false, network, gate, player.getUniqueId(), player.getName(), portalOptions); - int cost = Stargate.getCreateCost(player, gate); + int cost = EconomyHandler.getCreateCost(player, gate); // Call StargateCreateEvent StargateCreateEvent cEvent = new StargateCreateEvent(player, portal, event.getLines(), deny, denyMsg, cost); @@ -440,7 +441,7 @@ public class PortalHandler { } if (cost > 0) { - if (!Stargate.chargePlayer(player, cost)) { + if (!EconomyHandler.chargePlayerIfNecessary(player, cost)) { EconomyHelper.sendInsufficientFundsMessage(name, player, cost); Stargate.debug("createPortal", "Insufficient Funds"); return null; diff --git a/src/main/java/net/knarcraft/stargate/utility/EconomyHandler.java b/src/main/java/net/knarcraft/stargate/utility/EconomyHandler.java index 0a614e2..315996e 100644 --- a/src/main/java/net/knarcraft/stargate/utility/EconomyHandler.java +++ b/src/main/java/net/knarcraft/stargate/utility/EconomyHandler.java @@ -1,6 +1,8 @@ package net.knarcraft.stargate.utility; import net.knarcraft.stargate.Stargate; +import net.knarcraft.stargate.portal.Gate; +import net.knarcraft.stargate.portal.Portal; import net.milkbowl.vault.economy.Economy; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -53,7 +55,7 @@ public final class EconomyHandler { * * @return

The gate creation cost

*/ - public static int getCreateCost() { + public static int getDefaultCreateCost() { return createCost; } @@ -73,7 +75,7 @@ public final class EconomyHandler { * * @return

The gate destruction cost

*/ - public static int getDestroyCost() { + public static int getDefaultDestroyCost() { return destroyCost; } @@ -101,40 +103,32 @@ public final class EconomyHandler { } /** - * Charges a player, giving the charge to a target - * - * @param player

The player to charge

- * @param target

The UUID of the player to pay

- * @param amount

The amount to charge

- * @return

True if the payment succeeded, or if no payment was necessary

+ * Charges the player for an action, if required + * @param player

The player to take money from

+ * @param cost

The cost of the transaction

+ * @return

True if the player was charged successfully

*/ - public static boolean chargePlayer(Player player, UUID target, double amount) { - if (economyEnabled && player.getUniqueId().compareTo(target) != 0 && economy != null) { - if (!economy.has(player, amount)) { - return false; - } - //Take money from the user and give to the owner - economy.withdrawPlayer(player, amount); - economy.depositPlayer(Bukkit.getOfflinePlayer(target), amount); + public static boolean chargePlayerIfNecessary(Player player, int cost) { + if (skipPayment(cost)) { + return true; } - return true; + // Charge player + return EconomyHandler.chargePlayer(player, cost); } /** - * Charges a player - * - * @param player

The player to charge

- * @param amount

The amount to charge

- * @return

True if the payment succeeded, or if no payment was necessary

+ * Charges the player for an action, if required + * @param player

The player to take money from

+ * @param target

The target to pay

+ * @param cost

The cost of the transaction

+ * @return

True if the player was charged successfully

*/ - public static boolean chargePlayer(Player player, double amount) { - if (economyEnabled && economy != null) { - if (!economy.has(player, amount)) { - return false; - } - economy.withdrawPlayer(player, amount); + public static boolean chargePlayerIfNecessary(Player player, UUID target, int cost) { + if (skipPayment(cost)) { + return true; } - return true; + // Charge player + return EconomyHandler.chargePlayer(player, target, cost); } /** @@ -188,4 +182,118 @@ public final class EconomyHandler { return economyEnabled && economy != null; } + /** + * Checks whether a payment transaction should be skipped + * @param cost

The cost of the transaction

+ * @return

True if the transaction should be skipped

+ */ + private static boolean skipPayment(int cost) { + return cost == 0 || !EconomyHandler.useEconomy(); + } + + /** + * Determines the cost of using a gate + * + * @param player

The player trying to use the gate

+ * @param source

The source/entry portal

+ * @param destination

The destination portal

+ * @return

The cost of using the portal

+ */ + public static int getUseCost(Player player, Portal source, Portal destination) { + //No payment required + if (!EconomyHandler.useEconomy() || source.isFree()) { + return 0; + } + //Not charging for free destinations + if (destination != null && !EconomyHandler.chargeFreeDestination && destination.isFree()) { + return 0; + } + //Cost is 0 if the player owns this gate and funds go to the owner + if (source.getGate().getToOwner() && source.isOwner(player)) { + return 0; + } + //Player gets free gate use + if (Stargate.hasPermission(player, "stargate.free") || Stargate.hasPermission(player, "stargate.free.use")) { + return 0; + } + + return source.getGate().getUseCost(); + } + + /** + * Gets the cost of creating the given gate + * @param player

The player creating the gate

+ * @param gate

The gate type used

+ * @return

The cost of creating the gate

+ */ + public static int getCreateCost(Player player, Gate gate) { + if (isFree(player, "create")) { + return 0; + } else { + return gate.getCreateCost(); + } + } + + /** + * Gets the cost of destroying the given gate + * @param player

The player creating the gate

+ * @param gate

The gate type used

+ * @return

The cost of destroying the gate

+ */ + public static int getDestroyCost(Player player, Gate gate) { + if (isFree(player, "destroy")) { + return 0; + } else { + return gate.getDestroyCost(); + } + } + + /** + * Determines if a player can do a gate action for free + * @param player

The player to check

+ * @param permissionNode

The free.permissionNode necessary to allow free gate {action}

+ * @return

+ */ + private static boolean isFree(Player player, String permissionNode) { + return !EconomyHandler.useEconomy() || Stargate.hasPermission(player, "stargate.free") || + Stargate.hasPermission(player, "stargate.free." + permissionNode); + } + + /** + * Charges a player + * + * @param player

The player to charge

+ * @param amount

The amount to charge

+ * @return

True if the payment succeeded, or if no payment was necessary

+ */ + private static boolean chargePlayer(Player player, double amount) { + if (economyEnabled && economy != null) { + if (!economy.has(player, amount)) { + return false; + } + economy.withdrawPlayer(player, amount); + } + return true; + } + + /** + * Charges a player, giving the charge to a target + * + * @param player

The player to charge

+ * @param target

The UUID of the player to pay

+ * @param amount

The amount to charge

+ * @return

True if the payment succeeded, or if no payment was necessary

+ */ + private static boolean chargePlayer(Player player, UUID target, double amount) { + if (economyEnabled && player.getUniqueId().compareTo(target) != 0 && economy != null) { + if (!economy.has(player, amount)) { + return false; + } + //Take money from the user and give to the owner + economy.withdrawPlayer(player, amount); + economy.depositPlayer(Bukkit.getOfflinePlayer(target), amount); + } + return true; + } + } diff --git a/src/main/java/net/knarcraft/stargate/utility/EconomyHelper.java b/src/main/java/net/knarcraft/stargate/utility/EconomyHelper.java index 3df2b1f..25db29f 100644 --- a/src/main/java/net/knarcraft/stargate/utility/EconomyHelper.java +++ b/src/main/java/net/knarcraft/stargate/utility/EconomyHelper.java @@ -26,10 +26,10 @@ public final class EconomyHelper { //Try to charge the player if (entrancePortal.getGate().getToOwner()) { - success = entrancePortal.getOwnerUUID() != null && Stargate.chargePlayer(player, + success = entrancePortal.getOwnerUUID() != null && EconomyHandler.chargePlayerIfNecessary(player, entrancePortal.getOwnerUUID(), cost); } else { - success = Stargate.chargePlayer(player, cost); + success = EconomyHandler.chargePlayerIfNecessary(player, cost); } // Insufficient Funds