Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-11-25 20:16:13 +01:00
Code Issues Projects Releases Wiki Activity

New placeholder to show bonus in percentage from between 0 and 100

Browse Source 
%jobsr_user_pboost_[job]_[currency]%
This commit is contained in:
Zrips 2024-01-25 12:59:14 +02:00
parent 79fbf40ac6
commit 999a1fc224
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>Jobs</groupId> <groupId>Jobs</groupId>
<artifactId>jobs</artifactId> <artifactId>jobs</artifactId>
<version>5.2.2.1</version> <version>5.2.2.2</version>
<name>Jobs</name> <name>Jobs</name>
<url>http://maven.apache.org</url> <url>http://maven.apache.org</url>
@ -288,7 +288,7 @@
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version> <version>2.3.1</version>
<configuration> <configuration>
<outputDirectory>build/jar</outputDirectory> <outputDirectory>D:/MC/Server 1.20/plugins</outputDirectory>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

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

@ -71,6 +71,7 @@ public class Placeholder {
user_jobs, user_jobs,
user_boost_$1_$2("jname/number", "money/exp/points"), user_boost_$1_$2("jname/number", "money/exp/points"),
user_pboost_$1_$2("jname/number", "money/exp/points"),
user_isin_$1("jname/number"), user_isin_$1("jname/number"),
user_canjoin_$1("jname/number"), user_canjoin_$1("jname/number"),
user_jlevel_$1("jname/number"), user_jlevel_$1("jname/number"),
@ -535,6 +536,9 @@ public class Placeholder {
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_pboost_$1_$2:
boost = Jobs.getPlayerManager().getFinalBonus(user, job, true, true);
return (vals.size() < 2 || j == null) ? "" : simplifyDouble(boost.getFinal(CurrencyType.getByName(vals.get(1)), false, true) * 100D);
case user_isin_$1: case user_isin_$1:
return job == null ? "no" : convert(user.isInJob(job)); return job == null ? "no" : convert(user.isInJob(job));
case user_job_$1: case user_job_$1:

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

@ -1087,7 +1087,7 @@ public final class JobsPaymentListener implements Listener {
if (!Jobs.getGCManager().preventShopItemEnchanting) if (!Jobs.getGCManager().preventShopItemEnchanting)
return; return;
if (!Jobs.getPlayerManager().containsItemBoostByNBT(event.getInventory().getContents()[0])) if (!ItemBoostManager.containsItemBoostByNBT(event.getInventory().getContents()[0]))
return; return;
if (!CMIMaterial.get(event.getInventory().getContents()[1]).equals(CMIMaterial.ENCHANTED_BOOK)) if (!CMIMaterial.get(event.getInventory().getContents()[1]).equals(CMIMaterial.ENCHANTED_BOOK))