minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-12 01:25:26 +02:00
Code Issues Releases Wiki Activity

Move Economy API, MoneyHolder and WorthHolder to Economy package

Browse Source
This commit is contained in:
snowleo
2012-03-14 03:33:41 +01:00
parent d0d71283cd
commit 30c7a3af16
8 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Essentials/src/com/earth2me/essentials/Essentials.java
View File

@@ -17,6 +17,8 @@
*/ */
package com.earth2me.essentials; package com.earth2me.essentials;
import com.earth2me.essentials.economy.WorthHolder;
import com.earth2me.essentials.economy.Economy;
import com.earth2me.essentials.backup.Backup; import com.earth2me.essentials.backup.Backup;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.api.*; import com.earth2me.essentials.api.*;
@@ -162,7 +164,7 @@ public class Essentials extends JavaPlugin implements IEssentials
warps = new Warps(this); warps = new Warps(this);
reloadList.add(warps); reloadList.add(warps);
execTimer.mark("Init(Spawn/Warp)"); execTimer.mark("Init(Spawn/Warp)");
worth = new Worth(this); worth = new WorthHolder(this);
reloadList.add(worth); reloadList.add(worth);
itemDb = new ItemDb(this); itemDb = new ItemDb(this);
reloadList.add(itemDb); reloadList.add(itemDb);

3
Essentials/src/com/earth2me/essentials/Economy.java → Essentials/src/com/earth2me/essentials/economy/Economy.java
View File

@@ -1,9 +1,8 @@
package com.earth2me.essentials; package com.earth2me.essentials.economy;
import com.earth2me.essentials.utils.Util; import com.earth2me.essentials.utils.Util;
import com.earth2me.essentials.api.*; import com.earth2me.essentials.api.*;
import com.earth2me.essentials.permissions.Permissions; import com.earth2me.essentials.permissions.Permissions;
import com.earth2me.essentials.settings.MoneyHolder;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;

2
Essentials/src/com/earth2me/essentials/settings/Money.java → Essentials/src/com/earth2me/essentials/economy/Money.java
View File

@@ -1,4 +1,4 @@
package com.earth2me.essentials.settings; package com.earth2me.essentials.economy;
import com.earth2me.essentials.storage.MapValueType; import com.earth2me.essentials.storage.MapValueType;
import com.earth2me.essentials.storage.StorageObject; import com.earth2me.essentials.storage.StorageObject;

2
Essentials/src/com/earth2me/essentials/settings/MoneyHolder.java → Essentials/src/com/earth2me/essentials/economy/MoneyHolder.java
View File

@@ -1,4 +1,4 @@
package com.earth2me.essentials.settings; package com.earth2me.essentials.economy;
import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.storage.AsyncStorageObjectHolder; import com.earth2me.essentials.storage.AsyncStorageObjectHolder;

2
Essentials/src/com/earth2me/essentials/settings/Worth.java → Essentials/src/com/earth2me/essentials/economy/Worth.java
View File

@@ -1,4 +1,4 @@
package com.earth2me.essentials.settings; package com.earth2me.essentials.economy;
import com.earth2me.essentials.storage.EnchantmentLevel; import com.earth2me.essentials.storage.EnchantmentLevel;
import com.earth2me.essentials.storage.MapKeyType; import com.earth2me.essentials.storage.MapKeyType;

8
Essentials/src/com/earth2me/essentials/Worth.java → Essentials/src/com/earth2me/essentials/economy/WorthHolder.java
View File

@@ -1,4 +1,4 @@
package com.earth2me.essentials; package com.earth2me.essentials.economy;
import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IWorth; import com.earth2me.essentials.api.IWorth;
@@ -13,11 +13,11 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.material.MaterialData; import org.bukkit.material.MaterialData;
public class Worth extends AsyncStorageObjectHolder<com.earth2me.essentials.settings.Worth> implements IWorth public class WorthHolder extends AsyncStorageObjectHolder<com.earth2me.essentials.economy.Worth> implements IWorth
{ {
public Worth(final IEssentials ess) public WorthHolder(final IEssentials ess)
{ {
super(ess, com.earth2me.essentials.settings.Worth.class); super(ess, com.earth2me.essentials.economy.Worth.class);
onReload(false); onReload(false);
} }

1
Essentials/src/com/earth2me/essentials/settings/Economy.java
View File

@@ -1,5 +1,6 @@
package com.earth2me.essentials.settings; package com.earth2me.essentials.settings;
import com.earth2me.essentials.economy.Worth;
import com.earth2me.essentials.storage.Comment; import com.earth2me.essentials.storage.Comment;
import com.earth2me.essentials.storage.MapValueType; import com.earth2me.essentials.storage.MapValueType;
import com.earth2me.essentials.storage.StorageObject; import com.earth2me.essentials.storage.StorageObject;

3
Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java
View File

@@ -1,5 +1,6 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import com.earth2me.essentials.economy.WorthHolder;
import com.earth2me.essentials.storage.ManagedFile; import com.earth2me.essentials.storage.ManagedFile;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.api.IEssentials;
@@ -52,7 +53,7 @@ public class EssentialsUpgrade
} }
final EssentialsConf conf = new EssentialsConf(configFile); final EssentialsConf conf = new EssentialsConf(configFile);
conf.load(); conf.load();
final Worth worth = new Worth(ess); final WorthHolder worth = new WorthHolder(ess);
boolean found = false; boolean found = false;
for (Material mat : Material.values()) for (Material mat : Material.values())
{ {