Now works with BOSEconomy too!

ChestShop-authors · Apr 16, 2011 · fb173ff · fb173ff
1 parent 8e26039
commit fb173ff
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 20 deletions.
diff --git a/README b/README
@@ -0,0 +1,5 @@
+iConomyChestShop
+
+Shop plugin for Bukkit
+
+http://forums.bukkit.org/threads/econ-iconomychestshop-2-3-chest-shop-for-iconomy-677.4150/
diff --git a/com/Acrobot/iConomyChestShop/MinecartMania/MinecartManiaChest.java b/com/Acrobot/iConomyChestShop/MinecartMania/MinecartManiaChest.java
@@ -1,6 +1,7 @@
 package com.Acrobot.iConomyChestShop.MinecartMania;
 
 import com.Acrobot.iConomyChestShop.Basic;
+import com.Acrobot.iConomyChestShop.ConfigManager;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.bukkit.Location;
@@ -142,7 +143,11 @@ public boolean addItem(ItemStack item) {
         //Attempt to add the item to an empty slot
         int emptySlot = firstEmpty();
         if (emptySlot > -1) {
-            Basic.addItemToInventory(getInventory(), item);
+            if(ConfigManager.getBoolean("stackUnstackableItems")){
+                setItem(emptySlot, item);
+            }else{
+                Basic.addItemToInventory(getInventory(), item);
+            }
             //setItem(emptySlot, item);
             update();
             return true;

diff --git a/com/Acrobot/iConomyChestShop/SignManager.java b/com/Acrobot/iConomyChestShop/SignManager.java
@@ -11,7 +11,6 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.block.BlockListener;
 import org.bukkit.event.block.SignChangeEvent;
-import org.bukkit.inventory.ItemStack;
 
 /**
  * Manages signs

diff --git a/com/Acrobot/iConomyChestShop/iConomyChestShopPlayerListener.java b/com/Acrobot/iConomyChestShop/iConomyChestShopPlayerListener.java
@@ -45,9 +45,9 @@ public void onPlayerInteract(PlayerInteractEvent event) {
         }
         Sign sign = (Sign) event.getClickedBlock().getState();
         String name = sign.getLine(0);
-        if (iConomyManager.getiConomy() == null) {
-            System.out.println("[iConomyChestShop] No iConomy found!");
-            player.sendMessage("[iConomyChestShop] No iConomy found!");
+        if (iConomyManager.getiConomy() == null && iConomyManager.BOSEconomy == null) {
+            System.out.println("[iConomyChestShop] No economy plugin found!");
+            player.sendMessage("[iConomyChestShop] No economy plugin found!");
             return;
         }
         if (!Basic.checkConfig(player)) {
@@ -60,9 +60,11 @@ public void onPlayerInteract(PlayerInteractEvent event) {
         if (!SignManager.mySign(sign)) {
             return;
         }
-        if (iConomyManager.bank.getAccount(name) == null && !name.toLowerCase().replace(" ", "").equals("adminshop")) {
-            player.sendMessage(ConfigManager.getLanguage("Seller_has_no_account"));
-            return;
+        if (!name.toLowerCase().replace(" ", "").equals("adminshop")) {
+            if (!iConomyManager.hasAccount(name)) {
+                player.sendMessage(ConfigManager.getLanguage("Seller_has_no_account"));
+                return;
+            }
         }
         if (sign.getLine(0).equals(player.getName())) {
             player.sendMessage(ConfigManager.getLanguage("You_cannot_use_your_own_shop"));

diff --git a/com/Acrobot/iConomyChestShop/iConomyChestShopPluginListener.java b/com/Acrobot/iConomyChestShop/iConomyChestShopPluginListener.java
@@ -3,6 +3,7 @@
 import com.griefcraft.lwc.LWCPlugin;
 import com.nijiko.coelho.iConomy.iConomy;
 import com.nijikokun.bukkit.Permissions.Permissions;
+import cosine.boseconomy.BOSEconomy;
 import info.somethingodd.bukkit.OddItem.OddItem;
 
 import org.bukkit.event.server.PluginEnableEvent;
@@ -78,6 +79,15 @@ public void onPluginEnable(PluginEnableEvent event) {
                 System.out.println("[iConomyChestShop] " + pDesc.getName() + " version " + pDesc.getVersion() + " loaded.");
             }
         }
-
+
+        //BOSEconomy
+        if (iConomyManager.BOSEconomy == null) {
+            Plugin tmp = iConomyChestShop.getBukkitServer().getPluginManager().getPlugin("BOSEconomy");
+            if (tmp != null) {
+                iConomyManager.BOSEconomy = (BOSEconomy) tmp;
+                PluginDescriptionFile pDesc = tmp.getDescription();
+                System.out.println("[iConomyChestShop] " + pDesc.getName() + " version " + pDesc.getVersion() + " loaded.");
+            }
+        }
     }
 }
diff --git a/com/Acrobot/iConomyChestShop/iConomyManager.java b/com/Acrobot/iConomyChestShop/iConomyManager.java
@@ -3,19 +3,30 @@
 import com.nijiko.coelho.iConomy.iConomy;
 import com.nijiko.coelho.iConomy.system.Account;
 import com.nijiko.coelho.iConomy.system.Bank;
+import cosine.boseconomy.BOSEconomy;
 
 /**
  *
  * @author Acrobot
  */
 public class iConomyManager {
     private static iConomy iConomy = null;
+    public static BOSEconomy BOSEconomy = null;
     static Bank bank = null;
 
     public static iConomy getiConomy() {
         return iConomy;
     }
 
+    public static boolean hasAccount(String p){
+        if(iConomy != null){
+            return bank.hasAccount(p);
+        }
+        if(BOSEconomy != null){
+            return true;
+        }
+        return false;
+    }
     public static boolean setiConomy(iConomy plugin) {
         if (iConomy == null) {
             iConomy = plugin;
@@ -27,25 +38,61 @@ public static boolean setiConomy(iConomy plugin) {
     }
 
     public static void add(String name, int amount){
-        Account acc = bank.getAccount(name);
-        acc.add(amount);
+        if(iConomy != null){
+            Account acc = bank.getAccount(name);
+            acc.add(amount);
+        }
+        if(BOSEconomy != null){
+            BOSEconomy.addPlayerMoney(name, amount, false);
+        }
     }
 
     public static void substract(String name, int amount){
-        Account acc = bank.getAccount(name);
-        acc.subtract(amount);
+        if(iConomy != null){
+            Account acc = bank.getAccount(name);
+            acc.subtract(amount);
+        }
+        if(BOSEconomy != null){
+            BOSEconomy.addPlayerMoney(name, -amount, false);
+        }
     }
-    public static boolean hasEnough(String name, int amount){
-        Account acc = bank.getAccount(name);
-        return acc.hasEnough(amount);
+    public static boolean hasEnough(String name, int amount) {
+        if (iConomy != null) {
+            Account acc = bank.getAccount(name);
+            return acc.hasEnough(amount);
+        }
+        if(BOSEconomy != null){
+            return (BOSEconomy.getPlayerMoney(name) >= amount);
+        }
+        return false;
     }
     public static String getCurrency(){
-        return bank.getCurrency();
+        if(iConomy != null){
+            return bank.getCurrency();
+        }
+        if(BOSEconomy != null){
+            return BOSEconomy.getMoneyNameCaps();
+        }
+        return null;
     }
     public static double balance(String name){
-        return bank.getAccount(name).getBalance();
+        if(iConomy != null){
+            return bank.getAccount(name).getBalance();
+        }
+        if(BOSEconomy != null){
+            return BOSEconomy.getPlayerMoney(name);
+        }
+        return 0;
     }
     public static String formatedBalance(double amount){
-        return bank.format(amount);
+        if(iConomy != null){
+            return bank.format(amount);
+        }
+        String stringAmount = amount + "";
+        stringAmount = stringAmount.replace(".0", "");
+        if(BOSEconomy != null){
+            return stringAmount + " " + BOSEconomy.getMoneyNameCaps();
+        }
+        return amount + "";
     }
 }
diff --git a/plugin.yml b/plugin.yml
@@ -2,7 +2,7 @@ name: iConomyChestShop
 
 main: com.Acrobot.iConomyChestShop.iConomyChestShop
 
-version: 2.3
+version: 2.4
 
 author: Acrobot
 description: >