Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-12-04 16:13:24 +01:00
Code Issues Projects Releases Wiki Activity

Add decimal format for showing money to TL file

Browse Source
This commit is contained in:
Trent Hensler 2018-01-02 01:37:12 -08:00
parent fe7002f674
commit 769722ddb4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/massivecraft/factions/integration/Econ.java
View File

@ -8,6 +8,7 @@ import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.util.RelationUtil; import com.massivecraft.factions.util.RelationUtil;
import com.massivecraft.factions.zcore.util.TL;
import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.economy.Economy;
import net.milkbowl.vault.economy.EconomyResponse; import net.milkbowl.vault.economy.EconomyResponse;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -340,9 +341,8 @@ public class Econ {
} }
} }
// format money string based on server's set currency type, like "24 gold" or "$24.50"
public static String moneyString(double amount) { public static String moneyString(double amount) {
return econ.format(amount); return format.format(amount);
} }
// calculate the cost for claiming land // calculate the cost for claiming land
@ -387,7 +387,7 @@ public class Econ {
return econ.getBalance(account); return econ.getBalance(account);
} }
private static final DecimalFormat format = new DecimalFormat("#,###"); private static final DecimalFormat format = new DecimalFormat(TL.ECON_FORMAT.toString());
public static String getFriendlyBalance(UUID uuid) { public static String getFriendlyBalance(UUID uuid) {
OfflinePlayer offline = Bukkit.getOfflinePlayer(uuid); OfflinePlayer offline = Bukkit.getOfflinePlayer(uuid);

1
src/main/java/com/massivecraft/factions/zcore/util/TL.java
View File

@ -629,6 +629,7 @@ public enum TL {
*/ */
ECON_OFF("no %s"), // no balance, no value, no refund, etc ECON_OFF("no %s"), // no balance, no value, no refund, etc
ECON_FORMAT("###,###.###"),
/** /**
* Relations * Relations