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

Lets show more informative bossbar

Browse Source
This commit is contained in:
Zrips 2020-04-02 18:07:38 +03:00
parent a40698f543
commit fb5fad2a6c
5 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gamingmesh/jobs/Jobs.java
View File

@ -1065,7 +1065,7 @@ public class Jobs extends JavaPlugin {
try {
if (expAmount != 0D && GconfigManager.BossBarEnabled)
if (GconfigManager.BossBarShowOnEachAction)
BBManager.ShowJobProgression(jPlayer, prog);
BBManager.ShowJobProgression(jPlayer, prog, expAmount);
else
jPlayer.getUpdateBossBarFor().add(prog.getJob().getName());
} catch (Throwable e) {

24
src/main/java/com/gamingmesh/jobs/config/BossBarManager.java
View File

@ -38,14 +38,17 @@ public class BossBarManager {
for (String one : temp) {
for (JobProgression oneJob : player.getJobProgression()) {
if (one.equalsIgnoreCase(oneJob.getJob().getName()))
ShowJobProgression(player, oneJob);
if (one.equalsIgnoreCase(oneJob.getJob().getName())) {
Double lastExp = oneJob.getLastExperience();
ShowJobProgression(player, oneJob, oneJob.getExperience() - lastExp);
}
}
}
player.clearUpdateBossBarFor();
}
public synchronized void ShowJobProgression(final JobsPlayer player, final JobProgression jobProg) {
public synchronized void ShowJobProgression(final JobsPlayer player, final JobProgression jobProg, double expGain) {
if (Jobs.getVersionCheckManager().getVersion().isLower(Version.v1_9_R1))
return;
@ -70,11 +73,22 @@ public class BossBarManager {
}
NumberFormat formatter = new DecimalFormat("#0.00");
String message = Jobs.getLanguage().getMessage("command.stats.output",
String gain = "";
if (expGain != 0) {
expGain = (int) (expGain * 100) / 100D;
if (expGain > 0)
gain = "+" + expGain;
else
gain = "" + expGain;
gain = Jobs.getLanguage().getMessage("command.stats.bossBarGain", "%gain%", gain);
}
String message = Jobs.getLanguage().getMessage("command.stats.bossBarOutput",
"%joblevel%", Integer.valueOf(jobProg.getLevel()).toString(),
"%jobname%", jobProg.getJob().getChatColor() + jobProg.getJob().getName(),
"%jobxp%", formatter.format(Math.round(jobProg.getExperience() * 100.0) / 100.0),
"%jobmaxxp%", jobProg.getMaxExperience());
"%jobmaxxp%", jobProg.getMaxExperience(),
"%gain%", gain);
if (bar == null) {
BarColor color = getColor(jobProg.getJob());

2
src/main/java/com/gamingmesh/jobs/config/LanguageManager.java
View File

@ -291,6 +291,8 @@ public class LanguageManager {
Jobs.getGCManager().getCommandArgs().put("stats", Arrays.asList("[playername]"));
c.get("command.stats.error.nojob", "Please join a job first.");
c.get("command.stats.output", "Level %joblevel% for %jobname%: %jobxp%/%jobmaxxp% xp");
c.get("command.stats.bossBarOutput", "Lvl %joblevel% %jobname%: %jobxp%/%jobmaxxp% xp%gain%");
c.get("command.stats.bossBarGain", " &7(&f%gain%&7)");
c.get("command.shop.help.info", "Opens special jobs shop.");
c.get("command.shop.help.args", "");

15
src/main/java/com/gamingmesh/jobs/container/JobProgression.java
View File

@ -26,6 +26,7 @@ public class JobProgression {
private Job job;
private JobsPlayer jPlayer;
private double experience;
private Double lastExperience;
private int level;
private transient int maxExperience = -1;
private Long leftOn = null;
@ -166,7 +167,6 @@ public class JobProgression {
* @returns if level up was performed
*/
private boolean checkLevelUp() {
if (level == 1 && experience < 0)
experience = 0;
if (experience < 0)
@ -189,6 +189,9 @@ public class JobProgression {
if (experience > maxExperience)
experience = maxExperience;
if (lastExperience == null)
lastExperience = experience;
return ret;
}
@ -208,6 +211,8 @@ public class JobProgression {
ret = true;
reloadMaxExperience();
}
if (lastExperience == null)
lastExperience = experience;
return ret;
}
@ -248,4 +253,12 @@ public class JobProgression {
return msg;
}
public Double getLastExperience() {
return lastExperience == null ? experience : lastExperience;
}
public void setLastExperience(Double lastExperience) {
this.lastExperience = lastExperience;
}
}

6
src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java
View File

@ -1453,10 +1453,10 @@ public class JobsPaymentListener implements Listener {
return;
// pay
JobsPlayer jDamager = Jobs.getPlayerManager().getJobsPlayer(player);
if (jDamager == null)
JobsPlayer jPlayer = Jobs.getPlayerManager().getJobsPlayer(player);
if (jPlayer == null)
return;
Jobs.action(jDamager, new EntityActionInfo(animal, ActionType.BREED));
Jobs.action(jPlayer, new EntityActionInfo(animal, ActionType.BREED));
}
}