Famous_Longwing/RealEstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7 from EtienneDx/feature-currency-symbol

Browse Source 
Added currency symbol as a config option
This commit is contained in:
EtienneDx 2019-05-16 17:29:42 +02:00 committed by GitHub
commit aa4138808a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/me/EtienneDx/RealEstate/Config.java
View File

@ -40,6 +40,9 @@ public class Config
public boolean cfgTransferClaimBlocks; public boolean cfgTransferClaimBlocks;
public boolean cfgUseCurrencySymbol;
public String cfgCurrencySymbol;
public boolean cfgMessageOwner; public boolean cfgMessageOwner;
public boolean cfgMessageBuyer; public boolean cfgMessageBuyer;
public boolean cfgBroadcastSell; public boolean cfgBroadcastSell;
@ -101,6 +104,9 @@ public class Config
this.cfgTransferClaimBlocks = config.getBoolean("RealEstate.Rules.TransferClaimBlocks", true); this.cfgTransferClaimBlocks = config.getBoolean("RealEstate.Rules.TransferClaimBlocks", true);
this.cfgUseCurrencySymbol = config.getBoolean("RealEstate.Rules.UseCurrencySymbol", false);
this.cfgCurrencySymbol = config.getString("RealEstate.Rules.CurrencySymbol", "$");
this.cfgMessageOwner = config.getBoolean("RealEstate.Messaging.MessageOwner", true); this.cfgMessageOwner = config.getBoolean("RealEstate.Messaging.MessageOwner", true);
this.cfgMessageBuyer = config.getBoolean("RealEstate.Messaging.MessageBuyer", true); this.cfgMessageBuyer = config.getBoolean("RealEstate.Messaging.MessageBuyer", true);
this.cfgMailOffline = config.getBoolean("RealEstate.Messaging.MailOffline", true); this.cfgMailOffline = config.getBoolean("RealEstate.Messaging.MailOffline", true);
@ -147,6 +153,9 @@ public class Config
outConfig.set("RealEstate.Rules.TransferClaimBlocks", this.cfgTransferClaimBlocks); outConfig.set("RealEstate.Rules.TransferClaimBlocks", this.cfgTransferClaimBlocks);
outConfig.set("RealEstate.Rules.UseCurrencySymbol", this.cfgUseCurrencySymbol);
outConfig.set("RealEstate.Rules.CurrencySymbol", this.cfgCurrencySymbol);
outConfig.set("RealEstate.Messaging.MessageOwner", this.cfgMessageOwner); outConfig.set("RealEstate.Messaging.MessageOwner", this.cfgMessageOwner);
outConfig.set("RealEstate.Messaging.MessageBuyer", this.cfgMessageBuyer); outConfig.set("RealEstate.Messaging.MessageBuyer", this.cfgMessageBuyer);
outConfig.set("RealEstate.Messaging.MailOffline", this.cfgMailOffline); outConfig.set("RealEstate.Messaging.MailOffline", this.cfgMailOffline);

8
src/me/EtienneDx/RealEstate/Transactions/ClaimLease.java
View File

@ -71,7 +71,15 @@ public class ClaimLease extends BoughtTransaction
s.setLine(0, RealEstate.instance.config.cfgSignsHeader); s.setLine(0, RealEstate.instance.config.cfgSignsHeader);
s.setLine(1, ChatColor.DARK_GREEN + RealEstate.instance.config.cfgReplaceLease); s.setLine(1, ChatColor.DARK_GREEN + RealEstate.instance.config.cfgReplaceLease);
//s.setLine(2, owner != null ? Bukkit.getOfflinePlayer(owner).getName() : "SERVER"); //s.setLine(2, owner != null ? Bukkit.getOfflinePlayer(owner).getName() : "SERVER");
//s.setLine(2, paymentsLeft + "x " + price + " " + RealEstate.econ.currencyNamePlural());
if(RealEstate.instance.config.cfgUseCurrencySymbol)
{
s.setLine(2, paymentsLeft + "x " + RealEstate.instance.config.cfgCurrencySymbol + " " + price);
}
else
{
s.setLine(2, paymentsLeft + "x " + price + " " + RealEstate.econ.currencyNamePlural()); s.setLine(2, paymentsLeft + "x " + price + " " + RealEstate.econ.currencyNamePlural());
}
s.setLine(3, Utils.getTime(frequency, null, false)); s.setLine(3, Utils.getTime(frequency, null, false));
s.update(true); s.update(true);
} }

7
src/me/EtienneDx/RealEstate/Transactions/ClaimRent.java
View File

@ -77,7 +77,14 @@ public class ClaimRent extends BoughtTransaction
s.setLine(0, RealEstate.instance.config.cfgSignsHeader); s.setLine(0, RealEstate.instance.config.cfgSignsHeader);
s.setLine(1, ChatColor.DARK_GREEN + RealEstate.instance.config.cfgReplaceRent); s.setLine(1, ChatColor.DARK_GREEN + RealEstate.instance.config.cfgReplaceRent);
//s.setLine(2, owner != null ? Bukkit.getOfflinePlayer(owner).getName() : "SERVER"); //s.setLine(2, owner != null ? Bukkit.getOfflinePlayer(owner).getName() : "SERVER");
if(RealEstate.instance.config.cfgUseCurrencySymbol)
{
s.setLine(2, RealEstate.instance.config.cfgCurrencySymbol + " " + price);
}
else
{
s.setLine(2, price + " " + RealEstate.econ.currencyNamePlural()); s.setLine(2, price + " " + RealEstate.econ.currencyNamePlural());
}
s.setLine(3, (maxPeriod > 1 ? maxPeriod + "x " : "") + Utils.getTime(duration, null, false)); s.setLine(3, (maxPeriod > 1 ? maxPeriod + "x " : "") + Utils.getTime(duration, null, false));
s.update(true); s.update(true);
} }

7
src/me/EtienneDx/RealEstate/Transactions/ClaimSell.java
View File

@ -31,7 +31,14 @@ public class ClaimSell extends ClaimTransaction
s.setLine(0, RealEstate.instance.config.cfgSignsHeader); s.setLine(0, RealEstate.instance.config.cfgSignsHeader);
s.setLine(1, ChatColor.DARK_GREEN + RealEstate.instance.config.cfgReplaceSell); s.setLine(1, ChatColor.DARK_GREEN + RealEstate.instance.config.cfgReplaceSell);
s.setLine(2, owner != null ? Bukkit.getOfflinePlayer(owner).getName() : "SERVER"); s.setLine(2, owner != null ? Bukkit.getOfflinePlayer(owner).getName() : "SERVER");
if(RealEstate.instance.config.cfgUseCurrencySymbol)
{
s.setLine(3, RealEstate.instance.config.cfgCurrencySymbol + " " + price);
}
else
{
s.setLine(3, price + " " + RealEstate.econ.currencyNamePlural()); s.setLine(3, price + " " + RealEstate.econ.currencyNamePlural());
}
s.update(true); s.update(true);
} }
else else