TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-11 11:49:12 +00:00
Code Issues Projects Releases Wiki Activity

[trunk] I have gone insane. [trade] sign fixes

Browse source 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1365 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
ementalo 2011-05-07 23:06:03 +00:00
parent 31f5802611
commit 42971cfad6
3 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java
View file

@ -164,7 +164,7 @@ public class EssentialsEcoBlockListener extends BlockListener
double q1 = Double.parseDouble(m1 ? l1[0].substring(1) : l1[0]); double q1 = Double.parseDouble(m1 ? l1[0].substring(1) : l1[0]);
double q2 = Double.parseDouble(m2 ? l2[0].substring(1) : l2[0]); double q2 = Double.parseDouble(m2 ? l2[0].substring(1) : l2[0]);
double r2 = Double.parseDouble(l2[m2 ? 1 : 2]); double r2 = Double.parseDouble(l2[m2 ? 1 : 2]);
r2 = r2 - r2 % q2; r2 = m2 ? r2 : r2 - r2 % q2;
if ((!m1 & q1 < 1) || (!m2 &q2 < 1) || r2 < 1) if ((!m1 & q1 < 1) || (!m2 &q2 < 1) || r2 < 1)
{ {
throw new Exception("Quantities must be greater than 0."); throw new Exception("Quantities must be greater than 0.");

26
Essentials/src/com/earth2me/essentials/EssentialsEcoPlayerListener.java
View file

@ -13,12 +13,12 @@ import org.bukkit.inventory.ItemStack;
public class EssentialsEcoPlayerListener extends PlayerListener public class EssentialsEcoPlayerListener extends PlayerListener
{ {
Essentials ess; Essentials ess;
EssentialsEcoPlayerListener(Essentials ess) EssentialsEcoPlayerListener(Essentials ess)
{ {
this.ess = ess; this.ess = ess;
} }
@Override @Override
public void onPlayerInteract(PlayerInteractEvent event) public void onPlayerInteract(PlayerInteractEvent event)
{ {
@ -98,16 +98,16 @@ public class EssentialsEcoPlayerListener extends PlayerListener
double q2 = Double.parseDouble(m2 ? l2[0].substring(1) : l2[0]); double q2 = Double.parseDouble(m2 ? l2[0].substring(1) : l2[0]);
double r1 = Double.parseDouble(l1[m1 ? 1 : 2]); double r1 = Double.parseDouble(l1[m1 ? 1 : 2]);
double r2 = Double.parseDouble(l2[m2 ? 1 : 2]); double r2 = Double.parseDouble(l2[m2 ? 1 : 2]);
r1 = r1 - r1 % q1; r1 = m1 ? r1 : r1 - r1 % q1;
r2 = r2 - r2 % q2; r2 = m2 ? r2 : r2 - r2 % q2;
if ((!m1 & q1 < 1) || (!m2 & q2 < 1)) if ((!m1 & q1 < 1) || (!m2 & q2 < 1))
{ {
throw new Exception("Quantities must be greater than 0."); throw new Exception("Quantities must be greater than 0.");
} }
ItemStack i1 = m1 || r1 <= 0 ? null : ItemDb.get(l1[1], (int) r1); ItemStack i1 = m1 || r1 <= 0 ? null : ItemDb.get(l1[1], (int)r1);
ItemStack qi1 = m1 ? null : ItemDb.get(l1[1], (int) q1); ItemStack qi1 = m1 ? null : ItemDb.get(l1[1], (int)q1);
ItemStack qi2 = m2 ? null : ItemDb.get(l2[1], (int) q2); ItemStack qi2 = m2 ? null : ItemDb.get(l2[1], (int)q2);
if (username.equals(sign.getLines()[3].substring(2))) if (username.equals(sign.getLines()[3].substring(2)))
{ {
@ -125,7 +125,8 @@ public class EssentialsEcoPlayerListener extends PlayerListener
user.updateInventory(); user.updateInventory();
} }
r1 = 0; r1 = 0;
sign.setLine(1, (m1 ? Util.formatCurrency(q1) : (int)q1 + " " + l1[1]) + ":" + r1); sign.setLine(1, (m1 ? Util.formatCurrency(q1) : String.format("%.0f", q1) + " " + l1[1]) + ":" + r1);
sign.update();
} }
else else
{ {
@ -140,7 +141,7 @@ public class EssentialsEcoPlayerListener extends PlayerListener
{ {
if (!InventoryWorkaround.containsItem(user.getInventory(), true, qi1)) if (!InventoryWorkaround.containsItem(user.getInventory(), true, qi1))
{ {
throw new Exception("You do not have " + q1 + "x " + l1[1] + "."); throw new Exception("You do not have " + String.valueOf((int)q1) + "x " + l1[1] + ".");
} }
} }
@ -175,11 +176,12 @@ public class EssentialsEcoPlayerListener extends PlayerListener
r1 += q1; r1 += q1;
r2 -= q2; r2 -= q2;
user.sendMessage("r1 = " + Util.roundDouble(r1) + "r2 = " + Util.roundDouble(r2));
sign.setLine(0, "§1[Trade]"); sign.setLine(0, "§1[Trade]");
sign.setLine(1, (m1 ? Util.formatCurrency(q1) : String.format("%.0f",q1) + " " + l1[1]) + ":" + String.format("%.0f",r1)); sign.setLine(1, (m1 ? Util.formatCurrency(q1) : String.format("%.0f", q1) + " " + l1[1]) + ":" + String.format((m1 ? "%.2f" : "%.0f"), Util.roundDouble(r1)));
sign.setLine(2, (m2 ? Util.formatCurrency(q2) : String.format("%.0f",q2) + " " + l2[1]) + ":" + String.format("%.0f",r2)); sign.setLine(2, (m2 ? Util.formatCurrency(q2) : String.format("%.0f", q2) + " " + l2[1]) + ":" + String.format((m2 ? "%.2f" : "%.0f"), Util.roundDouble(r2)));
sign.update();
user.sendMessage("§7Trade completed."); user.sendMessage("§7Trade completed.");
} }
} }

18
Essentials/src/com/earth2me/essentials/Util.java
View file

@ -25,7 +25,7 @@ public class Util
Calendar now = new GregorianCalendar(); Calendar now = new GregorianCalendar();
return Util.formatDateDiff(now, c); return Util.formatDateDiff(now, c);
} }
public static String formatDateDiff(Calendar fromDate, Calendar toDate) public static String formatDateDiff(Calendar fromDate, Calendar toDate)
{ {
boolean future = false; boolean future = false;
@ -190,7 +190,7 @@ public class Util
} }
return c.getTimeInMillis(); return c.getTimeInMillis();
} }
public static Location getSafeDestination(Location loc) throws Exception public static Location getSafeDestination(Location loc) throws Exception
{ {
if (loc == null) if (loc == null)
@ -257,9 +257,15 @@ public class Util
} }
return isBlockAboveAir(world, x, y, z); return isBlockAboveAir(world, x, y, z);
} }
private static DecimalFormat df = new DecimalFormat("#.00");
private static DecimalFormat df = new DecimalFormat("0.##");
public static String formatCurrency(double value) { public static String formatCurrency(double value)
return "$"+Double.valueOf(df.format(value)); {
return "$" + Double.valueOf(df.format(value));
}
public static double roundDouble(double d)
{
return Double.valueOf(df.format(d));
} }
} }