Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2025-03-12 14:49:37 +01:00
Code Issues Projects Releases Wiki Activity

Added 2 placeholders to show the original number of exp and the formatted (#659)

Browse Source 
fix a discrepency between formatting of jexp and jmaxexp as well as adding unformatted versions for math
This commit is contained in:
deadcutlass2 2020-02-01 09:21:15 -06:00 committed by GitHub
parent 5ecc62d514
commit cdb91e0cce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/gamingmesh/jobs/Placeholders/Placeholder.java
View File

@ -50,6 +50,8 @@ public class Placeholder {
user_jlevel_$1("jname/number"), user_jlevel_$1("jname/number"),
user_jexp_$1("jname/number"), user_jexp_$1("jname/number"),
user_jmaxexp_$1("jname/number"), user_jmaxexp_$1("jname/number"),
user_jexpunf_$1("jname/number"),
user_jmaxexpunf_$1("jname/number"),
user_jmaxlvl_$1("jname/number"), user_jmaxlvl_$1("jname/number"),
user_job$1("jname/number"), user_job$1("jname/number"),
@ -410,6 +412,7 @@ public class Placeholder {
if (placeHolder.isComplex()) { if (placeHolder.isComplex()) {
List<String> vals = placeHolder.getComplexValues(value); List<String> vals = placeHolder.getComplexValues(value);
NumberFormat format = NumberFormat.getInstance(Locale.ENGLISH);
if (vals.isEmpty()) if (vals.isEmpty())
return ""; return "";
JobProgression j = getProgFromValue(user, vals.get(0)); JobProgression j = getProgFromValue(user, vals.get(0));
@ -426,9 +429,12 @@ public class Placeholder {
case user_jlevel_$1: case user_jlevel_$1:
return j == null ? "" : Integer.toString(j.getLevel()); return j == null ? "" : Integer.toString(j.getLevel());
case user_jexp_$1: case user_jexp_$1:
NumberFormat format = NumberFormat.getInstance(Locale.ENGLISH);
return j == null ? "" : format.format(j.getExperience()); return j == null ? "" : format.format(j.getExperience());
case user_jmaxexp_$1: case user_jmaxexp_$1:
return j == null ? "" : format.format(j.getMaxExperience());
case user_jexpunf_$1:
return j == null ? "" : Integer.toString(j.getExperience());
case user_jmaxexpunf_$1:
return j == null ? "" : Integer.toString(j.getMaxExperience()); return j == null ? "" : Integer.toString(j.getMaxExperience());
case user_jmaxlvl_$1: case user_jmaxlvl_$1:
return j == null ? "" : Integer.toString(j.getJob().getMaxLevel(user)); return j == null ? "" : Integer.toString(j.getJob().getMaxLevel(user));