Added the choice of excluding decimal numbers in the config (quick solution)
This commit is contained in:
parent
0174d9cb95
commit
cb35296c2c
@ -61,6 +61,8 @@ public class Config extends AnnotationConfig
|
|||||||
public boolean cfgUseCurrencySymbol = false;
|
public boolean cfgUseCurrencySymbol = false;
|
||||||
@ConfigField(name="RealEstate.Rules.CurrencySymbol", comment = "In case UseCurrencySymbol is true, what symbol should be used?")
|
@ConfigField(name="RealEstate.Rules.CurrencySymbol", comment = "In case UseCurrencySymbol is true, what symbol should be used?")
|
||||||
public String cfgCurrencySymbol = "$";
|
public String cfgCurrencySymbol = "$";
|
||||||
|
@ConfigField(name="RealEstate.Rules.UseDecimalCurrency", comment = "Allow players to use decimal currency e.g. $10.15")
|
||||||
|
public boolean cfgUseDecimalCurrency = true;
|
||||||
|
|
||||||
@ConfigField(name="RealEstate.Messaging.MessageOwner", comment = "Should the owner get messaged once one of his claim is rented/leased/bought and on end of contracts?")
|
@ConfigField(name="RealEstate.Messaging.MessageOwner", comment = "Should the owner get messaged once one of his claim is rented/leased/bought and on end of contracts?")
|
||||||
public boolean cfgMessageOwner = true;
|
public boolean cfgMessageOwner = true;
|
||||||
|
|||||||
@ -114,6 +114,13 @@ public class REListener implements Listener
|
|||||||
event.getBlock().breakNaturally();
|
event.getBlock().breakNaturally();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if((price%1)!=0 && !RealEstate.instance.config.cfgUseDecimalCurrency) //if the price has a decimal number AND Decimal currency is disabled
|
||||||
|
{
|
||||||
|
player.sendMessage(RealEstate.instance.config.chatPrefix + ChatColor.RED + "The price cannot have a decimal number!");
|
||||||
|
event.setCancelled(true);
|
||||||
|
event.getBlock().breakNaturally();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if(claim.isAdminClaim())
|
if(claim.isAdminClaim())
|
||||||
{
|
{
|
||||||
@ -175,6 +182,13 @@ public class REListener implements Listener
|
|||||||
event.getBlock().breakNaturally();
|
event.getBlock().breakNaturally();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if((price%1)!=0 && !RealEstate.instance.config.cfgUseDecimalCurrency) //if the price has a decimal number AND Decimal currency is disabled
|
||||||
|
{
|
||||||
|
player.sendMessage(RealEstate.instance.config.chatPrefix + ChatColor.RED + "The price cannot have a decimal number!");
|
||||||
|
event.setCancelled(true);
|
||||||
|
event.getBlock().breakNaturally();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if(event.getLine(2).isEmpty())
|
if(event.getLine(2).isEmpty())
|
||||||
{
|
{
|
||||||
@ -279,6 +293,13 @@ public class REListener implements Listener
|
|||||||
event.getBlock().breakNaturally();
|
event.getBlock().breakNaturally();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if((price%1)!=0 && !RealEstate.instance.config.cfgUseDecimalCurrency) //if the price has a decimal number AND Decimal currency is disabled
|
||||||
|
{
|
||||||
|
player.sendMessage(RealEstate.instance.config.chatPrefix + ChatColor.RED + "The price cannot have a decimal number!");
|
||||||
|
event.setCancelled(true);
|
||||||
|
event.getBlock().breakNaturally();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if(event.getLine(2).isEmpty())
|
if(event.getLine(2).isEmpty())
|
||||||
{
|
{
|
||||||
|
|||||||
@ -71,11 +71,25 @@ public class ClaimLease extends BoughtTransaction
|
|||||||
//s.setLine(2, paymentsLeft + "x " + price + " " + RealEstate.econ.currencyNamePlural());
|
//s.setLine(2, paymentsLeft + "x " + price + " " + RealEstate.econ.currencyNamePlural());
|
||||||
if(RealEstate.instance.config.cfgUseCurrencySymbol)
|
if(RealEstate.instance.config.cfgUseCurrencySymbol)
|
||||||
{
|
{
|
||||||
s.setLine(2, paymentsLeft + "x " + RealEstate.instance.config.cfgCurrencySymbol + " " + price);
|
if(RealEstate.instance.config.cfgUseDecimalCurrency == false)
|
||||||
|
{
|
||||||
|
s.setLine(2, paymentsLeft + "x " + RealEstate.instance.config.cfgCurrencySymbol + " " + (int)Math.round(price));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
s.setLine(2, paymentsLeft + "x " + RealEstate.instance.config.cfgCurrencySymbol + " " + price);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
s.setLine(2, paymentsLeft + "x " + price + " " + RealEstate.econ.currencyNamePlural());
|
if(RealEstate.instance.config.cfgUseDecimalCurrency == false)
|
||||||
|
{
|
||||||
|
s.setLine(2, paymentsLeft + "x " + (int)Math.round(price) + " " + RealEstate.econ.currencyNamePlural());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
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);
|
||||||
|
|||||||
@ -76,11 +76,26 @@ public class ClaimRent extends BoughtTransaction
|
|||||||
//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)
|
if(RealEstate.instance.config.cfgUseCurrencySymbol)
|
||||||
{
|
{
|
||||||
s.setLine(2, RealEstate.instance.config.cfgCurrencySymbol + " " + price);
|
if(RealEstate.instance.config.cfgUseDecimalCurrency == false)
|
||||||
|
{
|
||||||
|
s.setLine(2, RealEstate.instance.config.cfgCurrencySymbol + " " + (int)Math.round(price));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
s.setLine(2, RealEstate.instance.config.cfgCurrencySymbol + " " + price);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
s.setLine(2, price + " " + RealEstate.econ.currencyNamePlural());
|
if(RealEstate.instance.config.cfgUseDecimalCurrency == false)
|
||||||
|
{
|
||||||
|
s.setLine(2, (int)Math.round(price) + " " + RealEstate.econ.currencyNamePlural());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
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);
|
||||||
|
|||||||
@ -42,11 +42,25 @@ public class ClaimSell extends ClaimTransaction
|
|||||||
s.setLine(2, owner != null ? Utils.getSignString(Bukkit.getOfflinePlayer(owner).getName()) : "SERVER");
|
s.setLine(2, owner != null ? Utils.getSignString(Bukkit.getOfflinePlayer(owner).getName()) : "SERVER");
|
||||||
if(RealEstate.instance.config.cfgUseCurrencySymbol)
|
if(RealEstate.instance.config.cfgUseCurrencySymbol)
|
||||||
{
|
{
|
||||||
s.setLine(3, RealEstate.instance.config.cfgCurrencySymbol + " " + price);
|
if(RealEstate.instance.config.cfgUseDecimalCurrency == false)
|
||||||
|
{
|
||||||
|
s.setLine(3, RealEstate.instance.config.cfgCurrencySymbol + " " + (int)Math.round(price));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
s.setLine(3, RealEstate.instance.config.cfgCurrencySymbol + " " + price);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
s.setLine(3, price + " " + RealEstate.econ.currencyNamePlural());
|
if(RealEstate.instance.config.cfgUseDecimalCurrency == false)
|
||||||
|
{
|
||||||
|
s.setLine(3, (int)Math.round(price) + " " + RealEstate.econ.currencyNamePlural());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
s.setLine(3, price + " " + RealEstate.econ.currencyNamePlural());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
s.update(true);
|
s.update(true);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user