Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-03 15:08:18 +01:00
Code Issues Projects Releases Wiki Activity

Kit cleanup and refactor.

Browse Source
This commit is contained in:
KHobbits 2014-06-25 19:03:31 +01:00
parent 6c7ba6a76f
commit dbceccaa3e
4 changed files with 108 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
Essentials/src/com/earth2me/essentials/Kit.java
View File

@ -21,6 +21,24 @@ import org.bukkit.inventory.ItemStack;
public class Kit public class Kit
{ {
final IEssentials ess;
final String kitName;
final Map<String, Object> kit;
final Trade charge;
public Kit(final String kitName, final IEssentials ess) throws Exception
{
this.kitName = kitName;
this.ess = ess;
this.kit = ess.getSettings().getKit(kitName);
this.charge = new Trade("kit-" + kitName, new Trade("kit-kit", ess), ess);
if (kit == null)
{
throw new Exception(tl("kitNotFound"));
}
}
//TODO: Convert this to use one of the new text classes? //TODO: Convert this to use one of the new text classes?
public static String listKits(final IEssentials ess, final User user) throws Exception public static String listKits(final IEssentials ess, final User user) throws Exception
{ {
@ -43,9 +61,9 @@ public class Kit
{ {
cost = tl("kitCost", NumberUtil.displayCurrency(costPrice, ess)); cost = tl("kitCost", NumberUtil.displayCurrency(costPrice, ess));
} }
final Map<String, Object> kit = ess.getSettings().getKit(kitItem);
if (Kit.getNextUse(user, kitItem, kit) != 0) Kit kit = new Kit(kitItem, ess);
if (kit.getNextUse(user) != 0)
{ {
name = tl("kitDelay", name); name = tl("kitDelay", name);
} }
@ -62,14 +80,26 @@ public class Kit
} }
public static void checkTime(final User user, final String kitName, final Map<String, Object> els) throws Exception public String getName()
{ {
final Calendar time = new GregorianCalendar(); return kitName;
long nextUse = getNextUse(user, kitName, els); }
public void checkPerms(final User user) throws Exception
{
if (!user.isAuthorized("essentials.kits." + kitName))
{
throw new Exception(tl("noKitPermission", "essentials.kits." + kitName));
}
}
public void checkDelay(final User user) throws Exception
{
long nextUse = getNextUse(user);
if (nextUse == 0L) if (nextUse == 0L)
{ {
user.setKitTimestamp(kitName, time.getTimeInMillis()); return;
} }
else if (nextUse < 0L) else if (nextUse < 0L)
{ {
@ -83,7 +113,23 @@ public class Kit
} }
} }
public static long getNextUse(final User user, final String kitName, final Map<String, Object> els) throws Exception public void checkAffordable(final User user) throws Exception
{
charge.isAffordableFor(user);
}
public void setTime(final User user) throws Exception
{
final Calendar time = new GregorianCalendar();
user.setKitTimestamp(kitName, time.getTimeInMillis());
}
public void chargeUser(final User user) throws Exception
{
charge.charge(user);
}
public long getNextUse(final User user) throws Exception
{ {
if (user.isAuthorized("essentials.kit.exemptdelay")) if (user.isAuthorized("essentials.kit.exemptdelay"))
{ {
@ -96,7 +142,7 @@ public class Kit
try try
{ {
// Make sure delay is valid // Make sure delay is valid
delay = els.containsKey("delay") ? ((Number)els.get("delay")).doubleValue() : 0.0d; delay = kit.containsKey("delay") ? ((Number)kit.get("delay")).doubleValue() : 0.0d;
} }
catch (Exception e) catch (Exception e)
{ {
@ -134,7 +180,7 @@ public class Kit
} }
} }
public static List<String> getItems(final IEssentials ess, final User user, final String kitName, final Map<String, Object> kit) throws Exception public List<String> getItems(final User user) throws Exception
{ {
if (kit == null) if (kit == null)
{ {
@ -166,7 +212,12 @@ public class Kit
} }
} }
public static void expandItems(final IEssentials ess, final User user, final List<String> items) throws Exception public void expandItems(final User user) throws Exception
{
expandItems(user, getItems(user));
}
public void expandItems(final User user, final List<String> items) throws Exception
{ {
try try
{ {
@ -188,7 +239,8 @@ public class Kit
final String[] parts = kitItem.split(" +"); final String[] parts = kitItem.split(" +");
final ItemStack parseStack = ess.getItemDb().get(parts[0], parts.length > 1 ? Integer.parseInt(parts[1]) : 1); final ItemStack parseStack = ess.getItemDb().get(parts[0], parts.length > 1 ? Integer.parseInt(parts[1]) : 1);
if (parseStack.getType() == Material.AIR) { if (parseStack.getType() == Material.AIR)
{
continue; continue;
} }
@ -213,10 +265,12 @@ public class Kit
for (ItemStack itemStack : overfilled.values()) for (ItemStack itemStack : overfilled.values())
{ {
int spillAmount = itemStack.getAmount(); int spillAmount = itemStack.getAmount();
if (!allowOversizedStacks) { if (!allowOversizedStacks)
itemStack.setAmount(spillAmount < itemStack.getMaxStackSize() ? spillAmount : itemStack.getMaxStackSize()); {
itemStack.setAmount(spillAmount < itemStack.getMaxStackSize() ? spillAmount : itemStack.getMaxStackSize());
} }
while (spillAmount > 0) { while (spillAmount > 0)
{
user.getWorld().dropItemNaturally(user.getLocation(), itemStack); user.getWorld().dropItemNaturally(user.getLocation(), itemStack);
spillAmount -= itemStack.getAmount(); spillAmount -= itemStack.getAmount();
} }

71
Essentials/src/com/earth2me/essentials/commands/Commandkit.java
View File

@ -3,12 +3,11 @@ package com.earth2me.essentials.commands;
import com.earth2me.essentials.CommandSource; import com.earth2me.essentials.CommandSource;
import static com.earth2me.essentials.I18n.tl; import static com.earth2me.essentials.I18n.tl;
import com.earth2me.essentials.Kit; import com.earth2me.essentials.Kit;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.StringUtil; import com.earth2me.essentials.utils.StringUtil;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map;
import org.bukkit.Server; import org.bukkit.Server;
@ -57,9 +56,8 @@ public class Commandkit extends EssentialsCommand
for (final String kitName : kits) for (final String kitName : kits)
{ {
final Map<String, Object> kit = ess.getSettings().getKit(kitName); final Kit kit = new Kit(kitName, ess);
final List<String> items = Kit.getItems(ess, userTo, kitName, kit); kit.expandItems(userTo);
Kit.expandItems(ess, userTo, items);
sender.sendMessage(tl("kitGiveTo", kitName, userTo.getDisplayName())); sender.sendMessage(tl("kitGiveTo", kitName, userTo.getDisplayName()));
userTo.sendMessage(tl("kitReceive", kitName)); userTo.sendMessage(tl("kitReceive", kitName));
@ -67,49 +65,42 @@ public class Commandkit extends EssentialsCommand
} }
} }
private void giveKits(User userTo, User userFrom, String kitNames) throws Exception private void giveKits(final User userTo, final User userFrom, final String kitNames) throws Exception
{ {
if (kitNames.isEmpty()) if (kitNames.isEmpty())
{ {
throw new Exception(tl("kitError2")); throw new Exception(tl("kitNotFound"));
} }
String[] kits = kitNames.split(","); String[] kitList = kitNames.split(",");
for (final String kitName : kits) List<Kit> kits = new ArrayList<Kit>();
for (final String kitName : kitList)
{ {
giveKit(userTo, userFrom, kitName); if (kitName.isEmpty())
} {
} throw new Exception(tl("kitNotFound"));
}
private void giveKit(User userTo, User userFrom, String kitName) throws Exception Kit kit = new Kit(kitName, ess);
{ kit.checkPerms(userFrom);
if (kitName.isEmpty()) kit.checkDelay(userFrom);
kit.checkAffordable(userFrom);
kits.add(kit);
}
for (final Kit kit : kits)
{ {
throw new Exception(tl("kitError2")); kit.setTime(userFrom);
kit.expandItems(userTo);
kit.chargeUser(userTo);
if (!userFrom.equals(userTo))
{
userFrom.sendMessage(tl("kitGiveTo", kit.getName(), userTo.getDisplayName()));
}
userTo.sendMessage(tl("kitReceive", kit.getName()));
} }
final Map<String, Object> kit = ess.getSettings().getKit(kitName);
if (!userFrom.isAuthorized("essentials.kits." + kitName))
{
throw new Exception(tl("noKitPermission", "essentials.kits." + kitName));
}
final List<String> items = Kit.getItems(ess, userTo, kitName, kit);
final Trade charge = new Trade("kit-" + kitName, new Trade("kit-kit", ess), ess);
charge.isAffordableFor(userFrom);
Kit.checkTime(userFrom, kitName, kit);
Kit.expandItems(ess, userTo, items);
charge.charge(userFrom);
if (!userFrom.equals(userTo))
{
userFrom.sendMessage(tl("kitGiveTo", kitName, userTo.getDisplayName()));
}
userTo.sendMessage(tl("kitReceive", kitName));
} }
} }

9
Essentials/src/com/earth2me/essentials/signs/SignKit.java
View File

@ -59,10 +59,11 @@ public class SignKit extends EssentialsSign
charge.isAffordableFor(player); charge.isAffordableFor(player);
try try
{ {
final Map<String, Object> kit = ess.getSettings().getKit(kitName); final Kit kit = new Kit(kitName, ess);
Kit.checkTime(player, kitName, kit); kit.checkDelay(player);
final List<String> items = Kit.getItems(ess, player, kitName, kit); kit.setTime(player);
Kit.expandItems(ess, player, items); kit.expandItems(player);
charge.charge(player); charge.charge(player);
Trade.log("Sign", "Kit", "Interact", username, null, username, charge, sign.getBlock().getLocation(), ess); Trade.log("Sign", "Kit", "Interact", username, null, username, charge, sign.getBlock().getLocation(), ess);
} }

5
EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
View File

@ -122,9 +122,8 @@ public class EssentialsSpawnPlayerListener implements Listener
{ {
try try
{ {
final Map<String, Object> kit = ess.getSettings().getKit(kitName.toLowerCase(Locale.ENGLISH)); final Kit kit = new Kit(kitName.toLowerCase(Locale.ENGLISH), ess);
final List<String> items = Kit.getItems(ess, user, kitName, kit); kit.expandItems(user);
Kit.expandItems(ess, user, items);
} }
catch (Exception ex) catch (Exception ex)
{ {