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

New placeholders to get quest real name and description

Browse Source
This commit is contained in:
Zrips 2022-05-26 13:36:30 +03:00
parent 4341e2a333
commit c8a811ca6e
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,8 @@ import com.gamingmesh.jobs.container.blockOwnerShip.BlockOwnerShip;
import com.gamingmesh.jobs.container.blockOwnerShip.BlockTypes; import com.gamingmesh.jobs.container.blockOwnerShip.BlockTypes;
import com.gamingmesh.jobs.stuff.TimeManage; import com.gamingmesh.jobs.stuff.TimeManage;
import net.Zrips.CMILib.Colors.CMIChatColor;
import net.Zrips.CMILib.Container.CMIList;
import net.Zrips.CMILib.Locale.LC; import net.Zrips.CMILib.Locale.LC;
import net.Zrips.CMILib.Logs.CMIDebug; import net.Zrips.CMILib.Logs.CMIDebug;
@ -107,6 +109,8 @@ public class Placeholder {
maxviplvl_$1("jname/number"), maxviplvl_$1("jname/number"),
totalplayers_$1("jname/number"), totalplayers_$1("jname/number"),
maxslots_$1("jname/number"), maxslots_$1("jname/number"),
questname_$1_$2("jname/number", "questIndicator"),
questdesc_$1_$2("jname/number", "questIndicator"),
bonus_$1("jname/number"); bonus_$1("jname/number");
private String[] vars; private String[] vars;
@ -525,7 +529,7 @@ public class Placeholder {
return j == null ? "0" : Integer.toString(j.getJob().getMaxLevel(user)); return j == null ? "0" : Integer.toString(j.getJob().getMaxLevel(user));
case user_boost_$1_$2: case user_boost_$1_$2:
Boost boost = Jobs.getPlayerManager().getFinalBonus(user, job, true, true); Boost boost = Jobs.getPlayerManager().getFinalBonus(user, job, true, true);
return (vals.size() < 2 || j == null) ? "" : simplifyDouble(boost.getFinal(CurrencyType.getByName(vals.get(1)), false, true)); return (vals.size() < 2 || j == null) ? "" : simplifyDouble(boost.getFinal(CurrencyType.getByName(vals.get(1)), false, true));
case user_jtoplvl_$1_$2: case user_jtoplvl_$1_$2:
if (vals.size() < 2 || job == null) if (vals.size() < 2 || job == null)
return ""; return "";
@ -635,6 +639,16 @@ public class Placeholder {
return Integer.toString(jo.getTotalPlayers()); return Integer.toString(jo.getTotalPlayers());
case maxslots_$1: case maxslots_$1:
return Integer.toString(jo.getMaxSlots()); return Integer.toString(jo.getMaxSlots());
case questname_$1_$2:
Quest quest = jo.getQuest(values.get(1));
if (quest == null)
return null;
return CMIChatColor.translate(quest.getQuestName());
case questdesc_$1_$2:
quest = jo.getQuest(values.get(1));
if (quest == null)
return null;
return CMIChatColor.translate(CMIList.listToString(quest.getDescription(), "\n"));
default: default:
break; break;
} }

8
src/main/java/com/gamingmesh/jobs/config/ConfigManager.java
View File

@ -304,10 +304,12 @@ public class ConfigManager {
cfg.addComment(pt + ".Collect", "Payment for collecting things like sweet berry bush, composter or honey"); cfg.addComment(pt + ".Collect", "Payment for collecting things like sweet berry bush, composter or honey");
generate(cfg, pt + ".Collect.sweet_berry_bush-3"); generate(cfg, pt + ".Collect.sweet_berries-2");
generate(cfg, pt + ".Collect.sweet_berries-3");
generate(cfg, pt + ".Collect.composter"); generate(cfg, pt + ".Collect.composter");
generate(cfg, pt + ".Collect.beehive-5"); generate(cfg, pt + ".Collect.honeycomb");
generate(cfg, pt + ".Collect.bee_nest-5"); generate(cfg, pt + ".Collect.honey_bottle");
generate(cfg, pt + ".Collect.glow_berries");
cfg.addComment(pt + ".Bake", "Payment for cooking raw foods in camp fire"); cfg.addComment(pt + ".Bake", "Payment for cooking raw foods in camp fire");
generate(cfg, pt + ".Bake.beef"); generate(cfg, pt + ".Bake.beef");