mirror of
https://github.com/Auxilor/EcoJobs.git
synced 2025-12-20 15:39:26 +00:00
Compare commits
90 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
edf978fa28 | ||
|
|
5504a89f1b | ||
|
|
ae3f3ac2d3 | ||
|
|
704dfc65e5 | ||
|
|
2169581466 | ||
|
|
034265a0e9 | ||
|
|
4eded008fe | ||
|
|
7492f3e548 | ||
|
|
6bf9d371b9 | ||
|
|
4034f5098f | ||
|
|
2014a6dd5f | ||
|
|
bcf5ef3b0f | ||
|
|
7e10899c72 | ||
|
|
9bd24ed4e9 | ||
|
|
935e9a7937 | ||
|
|
04c2571d0f | ||
|
|
bd1b1aaa75 | ||
|
|
f942ebd9ed | ||
|
|
dfbc77cd0a | ||
|
|
760c3ce707 | ||
|
|
b4db83feb1 | ||
|
|
31980faf05 | ||
|
|
91645c13ac | ||
|
|
420279fefa | ||
|
|
e5d4cfb4ac | ||
|
|
ee3a4110ee | ||
|
|
c8ae5bd4be | ||
|
|
83ee1c2c1e | ||
|
|
f79cb8192a | ||
|
|
7d8f79a81b | ||
|
|
3571d7ddf3 | ||
|
|
ed33219f97 | ||
|
|
78cef09786 | ||
|
|
2a72f7d6ce | ||
|
|
762a871354 | ||
|
|
b101e23a86 | ||
|
|
07e1cb7797 | ||
|
|
409a84aea8 | ||
|
|
886b2e0c06 | ||
|
|
0ff5dcf670 | ||
|
|
1b93969d3b | ||
|
|
af5f5cfba6 | ||
|
|
2c726fd9ac | ||
|
|
8dbe453bc5 | ||
|
|
768d2218d0 | ||
|
|
e212762951 | ||
|
|
c5d7e07d49 | ||
|
|
88d118cdd7 | ||
|
|
b08616b01e | ||
|
|
3811e46fac | ||
|
|
b16905e435 | ||
|
|
e0084d61f7 | ||
|
|
3606d5f12b | ||
|
|
599b2800d8 | ||
|
|
e4af959945 | ||
|
|
d1af2e25e7 | ||
|
|
1eb0bdb639 | ||
|
|
85e117ba78 | ||
|
|
e27077dd71 | ||
|
|
17f471228d | ||
|
|
14d0997690 | ||
|
|
0f449aa7cb | ||
|
|
5ad4401762 | ||
|
|
e54712c960 | ||
|
|
72aa54a9e3 | ||
|
|
d9487300d7 | ||
|
|
9911244f34 | ||
|
|
2447dc0279 | ||
|
|
3b949c0119 | ||
|
|
a8f11ffb44 | ||
|
|
3829e326ba | ||
|
|
26d44fb2d9 | ||
|
|
5cba64d19f | ||
|
|
52f3230307 | ||
|
|
ad16872efd | ||
|
|
21ab58b425 | ||
|
|
c80dd2371c | ||
|
|
e0b2ae4f40 | ||
|
|
b9f7d6db42 | ||
|
|
f62476c1d4 | ||
|
|
ca25f78c60 | ||
|
|
765d7ee7e2 | ||
|
|
850e1ec888 | ||
|
|
fe29bb611f | ||
|
|
87c8c6755a | ||
|
|
964d668713 | ||
|
|
d8113c3819 | ||
|
|
2e655ffbb8 | ||
|
|
88a44777e1 | ||
|
|
bd7305fae1 |
@@ -42,12 +42,14 @@ allprojects {
|
||||
|
||||
shadowJar {
|
||||
relocate('com.willfp.libreforge', 'com.willfp.ecojobs.libreforge')
|
||||
relocate('com.willfp.ecomponent', 'com.willfp.ecojobs.ecomponent')
|
||||
relocate('org.joml', 'com.willfp.ecojobs.libreforge.joml')
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly 'com.willfp:eco:6.42.0'
|
||||
implementation 'com.willfp:libreforge:3.106.0'
|
||||
compileOnly 'com.willfp:eco:6.51.1'
|
||||
implementation 'com.willfp:libreforge:3.129.5'
|
||||
implementation 'com.willfp:ecomponent:1.3.0'
|
||||
implementation 'org.joml:joml:1.10.4'
|
||||
|
||||
compileOnly 'org.jetbrains:annotations:23.0.0'
|
||||
|
||||
@@ -1,184 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE module PUBLIC
|
||||
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
|
||||
"https://checkstyle.org/dtds/configuration_1_3.dtd">
|
||||
|
||||
<!--
|
||||
|
||||
Checkstyle configuration that checks the sun coding conventions from:
|
||||
|
||||
- the Java Language Specification at
|
||||
https://docs.oracle.com/javase/specs/jls/se11/html/index.html
|
||||
|
||||
- the Sun Code Conventions at https://www.oracle.com/java/technologies/javase/codeconventions-contents.html
|
||||
|
||||
- the Javadoc guidelines at
|
||||
https://www.oracle.com/technical-resources/articles/java/javadoc-tool.html
|
||||
|
||||
- the JDK Api documentation https://docs.oracle.com/en/java/javase/11/
|
||||
|
||||
- some best practices
|
||||
|
||||
Checkstyle is very configurable. Be sure to read the documentation at
|
||||
https://checkstyle.org (or in your downloaded distribution).
|
||||
|
||||
Most Checks are configurable, be sure to consult the documentation.
|
||||
|
||||
To completely disable a check, just comment it out or delete it from the file.
|
||||
To suppress certain violations please review suppression filters.
|
||||
|
||||
Finally, it is worth reading the documentation.
|
||||
|
||||
-->
|
||||
|
||||
<module name="Checker">
|
||||
<module name="SuppressionFilter">
|
||||
<property name="file" value="config/checkstyle/suppression.xml"/>
|
||||
</module>
|
||||
|
||||
<!--
|
||||
If you set the basedir property below, then all reported file
|
||||
names will be relative to the specified directory. See
|
||||
https://checkstyle.org/config.html#Checker
|
||||
|
||||
<property name="basedir" value="${basedir}"/>
|
||||
-->
|
||||
<property name="severity" value="error"/>
|
||||
|
||||
<property name="fileExtensions" value="java, properties, xml"/>
|
||||
|
||||
<!-- Excludes all 'module-info.java' files -->
|
||||
<!-- See https://checkstyle.org/config_filefilters.html -->
|
||||
<module name="BeforeExecutionExclusionFileFilter">
|
||||
<property name="fileNamePattern" value="module\-info\.java$"/>
|
||||
</module>
|
||||
|
||||
<!-- Checks whether files end with a new line. -->
|
||||
<!-- See https://checkstyle.org/config_misc.html#NewlineAtEndOfFile -->
|
||||
<module name="NewlineAtEndOfFile"/>
|
||||
|
||||
<!-- Checks that property files contain the same keys. -->
|
||||
<!-- See https://checkstyle.org/config_misc.html#Translation -->
|
||||
<module name="Translation"/>
|
||||
|
||||
<!-- Checks for Size Violations. -->
|
||||
<!-- See https://checkstyle.org/config_sizes.html -->
|
||||
<module name="FileLength"/>
|
||||
<module name="LineLength">
|
||||
<property name="fileExtensions" value="java"/>
|
||||
<property name="max" value="200"/>
|
||||
</module>
|
||||
|
||||
<!-- Checks for whitespace -->
|
||||
<!-- See https://checkstyle.org/config_whitespace.html -->
|
||||
<module name="FileTabCharacter"/>
|
||||
|
||||
<!-- Miscellaneous other checks. -->
|
||||
<!-- See https://checkstyle.org/config_misc.html -->
|
||||
<module name="RegexpSingleline">
|
||||
<property name="format" value="\s+$"/>
|
||||
<property name="minimum" value="0"/>
|
||||
<property name="maximum" value="0"/>
|
||||
<property name="message" value="Line has trailing spaces."/>
|
||||
</module>
|
||||
|
||||
<!-- Checks for Headers -->
|
||||
<!-- See https://checkstyle.org/config_header.html -->
|
||||
<!-- <module name="Header"> -->
|
||||
<!-- <property name="headerFile" value="${checkstyle.header.file}"/> -->
|
||||
<!-- <property name="fileExtensions" value="java"/> -->
|
||||
<!-- </module> -->
|
||||
|
||||
<module name="TreeWalker">
|
||||
|
||||
<!-- Checks for Javadoc comments. -->
|
||||
<!-- See https://checkstyle.org/config_javadoc.html -->
|
||||
<module name="InvalidJavadocPosition"/>
|
||||
<module name="JavadocMethod"/>
|
||||
<module name="JavadocType"/>
|
||||
<module name="JavadocVariable"/>
|
||||
<module name="JavadocStyle"/>
|
||||
<module name="MissingJavadocMethod"/>
|
||||
|
||||
<!-- Checks for Naming Conventions. -->
|
||||
<!-- See https://checkstyle.org/config_naming.html -->
|
||||
<module name="ConstantName"/>
|
||||
<module name="LocalFinalVariableName"/>
|
||||
<module name="LocalVariableName"/>
|
||||
<module name="MemberName"/>
|
||||
<module name="MethodName"/>
|
||||
<module name="PackageName"/>
|
||||
<module name="ParameterName"/>
|
||||
<module name="StaticVariableName"/>
|
||||
<module name="TypeName"/>
|
||||
|
||||
<!-- Checks for imports -->
|
||||
<!-- See https://checkstyle.org/config_imports.html -->
|
||||
<module name="AvoidStarImport"/>
|
||||
<module name="IllegalImport"/> <!-- defaults to sun.* packages -->
|
||||
<module name="RedundantImport"/>
|
||||
<module name="UnusedImports">
|
||||
<property name="processJavadoc" value="true"/>
|
||||
</module>
|
||||
|
||||
<!-- Checks for Size Violations. -->
|
||||
<!-- See https://checkstyle.org/config_sizes.html -->
|
||||
<!-- <module name="MethodLength"/> -->
|
||||
<module name="ParameterNumber"/>
|
||||
|
||||
<!-- Checks for whitespace -->
|
||||
<!-- See https://checkstyle.org/config_whitespace.html -->
|
||||
<module name="EmptyForIteratorPad"/>
|
||||
<module name="GenericWhitespace"/>
|
||||
<module name="MethodParamPad"/>
|
||||
<module name="NoWhitespaceAfter"/>
|
||||
<module name="NoWhitespaceBefore"/>
|
||||
<module name="OperatorWrap"/>
|
||||
<module name="ParenPad"/>
|
||||
<module name="TypecastParenPad"/>
|
||||
<module name="WhitespaceAfter"/>
|
||||
<module name="WhitespaceAround"/>
|
||||
|
||||
<!-- Modifier Checks -->
|
||||
<!-- See https://checkstyle.org/config_modifiers.html -->
|
||||
<module name="ModifierOrder"/>
|
||||
<module name="RedundantModifier"/>
|
||||
|
||||
<!-- Checks for blocks. You know, those {}'s -->
|
||||
<!-- See https://checkstyle.org/config_blocks.html -->
|
||||
<module name="AvoidNestedBlocks"/>
|
||||
<module name="EmptyBlock"/>
|
||||
<module name="LeftCurly"/>
|
||||
<module name="NeedBraces"/>
|
||||
<module name="RightCurly"/>
|
||||
|
||||
<!-- Checks for common coding problems -->
|
||||
<!-- See https://checkstyle.org/config_coding.html -->
|
||||
<module name="EmptyStatement"/>
|
||||
<module name="EqualsHashCode"/>
|
||||
<module name="IllegalInstantiation"/>
|
||||
<module name="InnerAssignment"/>
|
||||
<!-- <module name="MagicNumber"/> -->
|
||||
<module name="MissingSwitchDefault"/>
|
||||
<module name="MultipleVariableDeclarations"/>
|
||||
<module name="SimplifyBooleanExpression"/>
|
||||
<module name="SimplifyBooleanReturn"/>
|
||||
|
||||
<!-- Checks for class design -->
|
||||
<!-- See https://checkstyle.org/config_design.html -->
|
||||
<!-- <module name="DesignForExtension"/> -->
|
||||
<module name="FinalClass"/>
|
||||
<!-- <module name="HideUtilityClassConstructor"/> -->
|
||||
<module name="InterfaceIsType"/>
|
||||
<module name="VisibilityModifier"/>
|
||||
<module name="RequireThis"/>
|
||||
|
||||
<!-- Miscellaneous other checks. -->
|
||||
<!-- See https://checkstyle.org/config_misc.html -->
|
||||
<module name="ArrayTypeStyle"/>
|
||||
<module name="FinalParameters"/>
|
||||
<module name="TodoComment"/>
|
||||
<module name="UpperEll"/>
|
||||
|
||||
</module>
|
||||
</module>
|
||||
@@ -1,12 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
|
||||
<!DOCTYPE suppressions PUBLIC
|
||||
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
|
||||
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
|
||||
|
||||
<suppressions>
|
||||
<!-- Fields don't need javadoc -->
|
||||
<suppress files="Effects.java" checks="JavadocVariable"/>
|
||||
<suppress files="Skills.java" checks="JavadocVariable"/>
|
||||
<suppress files="Stats.java" checks="JavadocVariable"/>
|
||||
</suppressions>
|
||||
@@ -1,36 +0,0 @@
|
||||
package com.willfp.ecojobs
|
||||
|
||||
import com.willfp.ecojobs.api.EcoJobsAPI
|
||||
import com.willfp.ecojobs.jobs.Job
|
||||
import com.willfp.ecojobs.jobs.activeJob
|
||||
import com.willfp.ecojobs.jobs.getJobLevel
|
||||
import com.willfp.ecojobs.jobs.getJobProgress
|
||||
import com.willfp.ecojobs.jobs.getJobXP
|
||||
import com.willfp.ecojobs.jobs.getJobXPRequired
|
||||
import com.willfp.ecojobs.jobs.giveJobExperience
|
||||
import com.willfp.ecojobs.jobs.hasJob
|
||||
import org.bukkit.OfflinePlayer
|
||||
import org.bukkit.entity.Player
|
||||
|
||||
internal object EcoJobsAPIImpl : EcoJobsAPI {
|
||||
override fun hasJob(player: OfflinePlayer, job: Job) = player.hasJob(job)
|
||||
|
||||
override fun getActiveJob(player: OfflinePlayer): Job? = player.activeJob
|
||||
|
||||
override fun getJobLevel(player: OfflinePlayer, job: Job) = player.getJobLevel(job)
|
||||
|
||||
override fun giveJobExperience(player: Player, job: Job, amount: Double) =
|
||||
player.giveJobExperience(job, amount)
|
||||
|
||||
override fun giveJobExperience(player: Player, job: Job, amount: Double, applyMultipliers: Boolean) =
|
||||
player.giveJobExperience(job, amount, noMultiply = !applyMultipliers)
|
||||
|
||||
override fun getJobProgress(player: OfflinePlayer, job: Job) =
|
||||
player.getJobProgress(job)
|
||||
|
||||
override fun getJobXPRequired(player: OfflinePlayer, job: Job) =
|
||||
player.getJobXPRequired(job)
|
||||
|
||||
override fun getJobXP(player: OfflinePlayer, job: Job) =
|
||||
player.getJobXP(job)
|
||||
}
|
||||
@@ -1,23 +1,30 @@
|
||||
package com.willfp.ecojobs
|
||||
|
||||
import com.willfp.eco.core.command.impl.PluginCommand
|
||||
import com.willfp.eco.core.placeholder.DynamicPlaceholder
|
||||
import com.willfp.eco.core.placeholder.PlayerPlaceholder
|
||||
import com.willfp.eco.util.toSingletonList
|
||||
import com.willfp.eco.util.savedDisplayName
|
||||
import com.willfp.eco.util.toNiceString
|
||||
import com.willfp.ecojobs.api.activeJobs
|
||||
import com.willfp.ecojobs.api.getJobLevel
|
||||
import com.willfp.ecojobs.api.jobLimit
|
||||
import com.willfp.ecojobs.commands.CommandEcojobs
|
||||
import com.willfp.ecojobs.commands.CommandJobs
|
||||
import com.willfp.ecojobs.jobs.JobLevelListener
|
||||
import com.willfp.ecojobs.jobs.JobTriggerXPGainListener
|
||||
import com.willfp.ecojobs.jobs.Jobs
|
||||
import com.willfp.ecojobs.jobs.PriceHandler
|
||||
import com.willfp.ecojobs.jobs.ResetOnQuitListener
|
||||
import com.willfp.ecojobs.jobs.activeJob
|
||||
import com.willfp.ecojobs.jobs.activeJobLevel
|
||||
import com.willfp.libreforge.LibReforgePlugin
|
||||
import org.bukkit.event.Listener
|
||||
import java.util.regex.Pattern
|
||||
|
||||
class EcoJobsPlugin : LibReforgePlugin() {
|
||||
init {
|
||||
instance = this
|
||||
registerHolderProvider { it.activeJobLevel?.toSingletonList() ?: emptyList() }
|
||||
registerHolderProvider { player ->
|
||||
player.activeJobs.map { it.getLevel(player.getJobLevel(it)) }
|
||||
}
|
||||
}
|
||||
|
||||
override fun handleEnableAdditional() {
|
||||
@@ -25,13 +32,44 @@ class EcoJobsPlugin : LibReforgePlugin() {
|
||||
|
||||
PlayerPlaceholder(
|
||||
this,
|
||||
"job"
|
||||
) { it.activeJob?.name ?: "" }.register()
|
||||
"limit"
|
||||
) { it.jobLimit.toString() }.register()
|
||||
|
||||
PlayerPlaceholder(
|
||||
this,
|
||||
"job_id"
|
||||
) { it.activeJob?.id ?: "" }.register()
|
||||
"in_jobs"
|
||||
) { it.activeJobs.size.toString() }.register()
|
||||
|
||||
PlayerPlaceholder(
|
||||
this,
|
||||
"total_job_level"
|
||||
) {
|
||||
var level = 0
|
||||
for (job in Jobs.values()) {
|
||||
level += it.getJobLevel(job)
|
||||
}
|
||||
level.toString()
|
||||
}.register()
|
||||
|
||||
DynamicPlaceholder(
|
||||
this,
|
||||
Pattern.compile("top_[a-z]+_[0-9]+_[a-z]+")
|
||||
) {
|
||||
val split = it.split("_")
|
||||
val jobId = split.getOrNull(1) ?: return@DynamicPlaceholder "You must specify the job id!"
|
||||
val job = Jobs.getByID(jobId) ?: return@DynamicPlaceholder "Invalid job id!"
|
||||
val placeString = split.getOrNull(2) ?: return@DynamicPlaceholder "You must specify the place!"
|
||||
val place = placeString.toIntOrNull() ?: return@DynamicPlaceholder "Invalid place!"
|
||||
val type = split.getOrNull(3) ?: return@DynamicPlaceholder "You must specify the top type!"
|
||||
val topEntry = job.getTop(place)
|
||||
return@DynamicPlaceholder when(type) {
|
||||
"name" -> topEntry?.player?.savedDisplayName
|
||||
?: this.langYml.getFormattedString("top.name-empty")
|
||||
"amount" -> topEntry?.amount?.toNiceString()
|
||||
?: this.langYml.getFormattedString("top.amount-empty")
|
||||
else -> "Invalid type: $type! Available types: name/amount"
|
||||
}
|
||||
}.register()
|
||||
}
|
||||
|
||||
override fun loadPluginCommands(): List<PluginCommand> {
|
||||
|
||||
@@ -1,117 +1,192 @@
|
||||
@file:JvmName("EcoJobsAPI")
|
||||
|
||||
package com.willfp.ecojobs.api
|
||||
|
||||
import com.willfp.ecojobs.EcoJobsAPIImpl
|
||||
import com.willfp.eco.core.data.keys.PersistentDataKey
|
||||
import com.willfp.eco.core.data.keys.PersistentDataKeyType
|
||||
import com.willfp.eco.core.data.profile
|
||||
import com.willfp.ecojobs.EcoJobsPlugin
|
||||
import com.willfp.ecojobs.api.event.PlayerJobExpGainEvent
|
||||
import com.willfp.ecojobs.api.event.PlayerJobJoinEvent
|
||||
import com.willfp.ecojobs.api.event.PlayerJobLeaveEvent
|
||||
import com.willfp.ecojobs.api.event.PlayerJobLevelUpEvent
|
||||
import com.willfp.ecojobs.jobs.Job
|
||||
import com.willfp.ecojobs.jobs.Jobs
|
||||
import com.willfp.ecojobs.jobs.getNumericalPermission
|
||||
import com.willfp.ecojobs.jobs.jobExperienceMultiplier
|
||||
import org.bukkit.Bukkit
|
||||
import org.bukkit.OfflinePlayer
|
||||
import org.bukkit.entity.Player
|
||||
import kotlin.math.abs
|
||||
|
||||
interface EcoJobsAPI {
|
||||
/**
|
||||
* Get if a player has a job.
|
||||
*
|
||||
* @param player The player.
|
||||
* @param job The job.
|
||||
* @return If the player has the job unlocked.
|
||||
*/
|
||||
fun hasJob(
|
||||
player: OfflinePlayer,
|
||||
job: Job
|
||||
): Boolean
|
||||
private val plugin = EcoJobsPlugin.instance
|
||||
|
||||
/**
|
||||
* Get a player's active job.
|
||||
*
|
||||
* @param player The player.
|
||||
* @return The active job.
|
||||
*/
|
||||
fun getActiveJob(
|
||||
player: OfflinePlayer
|
||||
): Job?
|
||||
/*
|
||||
|
||||
/**
|
||||
* Get a player's level of a certain job.
|
||||
*
|
||||
* @param player The player.
|
||||
* @param job The job.
|
||||
* @return The level.
|
||||
*/
|
||||
fun getJobLevel(
|
||||
player: OfflinePlayer,
|
||||
job: Job
|
||||
): Int
|
||||
The old key is around for backwards compatibility with 1.x.x.
|
||||
|
||||
/**
|
||||
* Give job experience to a player.
|
||||
*
|
||||
* @param player The player.
|
||||
* @param job The job.
|
||||
* @param amount The amount of experience to give.
|
||||
*/
|
||||
fun giveJobExperience(
|
||||
player: Player,
|
||||
job: Job,
|
||||
amount: Double
|
||||
)
|
||||
|
||||
/**
|
||||
* Give job experience to a player.
|
||||
*
|
||||
* @param player The player.
|
||||
* @param job The job.
|
||||
* @param amount The amount of experience to give.
|
||||
* @param applyMultipliers If multipliers should be applied.
|
||||
*/
|
||||
fun giveJobExperience(
|
||||
player: Player,
|
||||
job: Job,
|
||||
amount: Double,
|
||||
applyMultipliers: Boolean
|
||||
)
|
||||
private val legacyActiveJobKey: PersistentDataKey<String> = PersistentDataKey(
|
||||
plugin.namespacedKeyFactory.create("active_job"), PersistentDataKeyType.STRING, ""
|
||||
)
|
||||
|
||||
/**
|
||||
* Get progress to next level between 0 and 1, where 0 is none and 1 is complete.
|
||||
*
|
||||
* @param player The player.
|
||||
* @param job The job.
|
||||
* @return The progress.
|
||||
*/
|
||||
fun getJobProgress(
|
||||
player: OfflinePlayer,
|
||||
job: Job
|
||||
): Double
|
||||
private val activeJobsKey: PersistentDataKey<List<String>> = PersistentDataKey(
|
||||
plugin.namespacedKeyFactory.create("active_jobs"), PersistentDataKeyType.STRING_LIST, listOf()
|
||||
)
|
||||
|
||||
/**
|
||||
* Get the experience required to advance to the next level.
|
||||
*
|
||||
* @param player The player.
|
||||
* @param job The job.
|
||||
* @return The experience required.
|
||||
/**
|
||||
* The job limit.
|
||||
*/
|
||||
fun getJobXPRequired(
|
||||
player: OfflinePlayer,
|
||||
job: Job
|
||||
): Int
|
||||
val Player.jobLimit: Int
|
||||
get() {
|
||||
return this.getNumericalPermission("ecojobs.limit", plugin.configYml.getDouble("jobs.limit")).toInt()
|
||||
}
|
||||
|
||||
/**
|
||||
* Get experience to the next level.
|
||||
*
|
||||
* @param player The player.
|
||||
* @param job The job.
|
||||
* @return The experience.
|
||||
/**
|
||||
* If a player can join a job.
|
||||
*/
|
||||
fun getJobXP(
|
||||
player: OfflinePlayer,
|
||||
job: Job
|
||||
): Double
|
||||
fun Player.canJoinJob(job: Job): Boolean {
|
||||
return this.activeJobs.size < this.jobLimit && job !in this.activeJobs && this.hasJob(job)
|
||||
}
|
||||
|
||||
companion object {
|
||||
/**
|
||||
* Get the instance of the API.
|
||||
*
|
||||
* @return The API.
|
||||
/**
|
||||
* Get if a job is unlocked.
|
||||
*/
|
||||
@JvmStatic
|
||||
val instance: EcoJobsAPI
|
||||
get() = EcoJobsAPIImpl
|
||||
fun OfflinePlayer.hasJob(job: Job) = this.getJobLevel(job) > 0
|
||||
|
||||
/**
|
||||
* Get if a player has a job active.
|
||||
*/
|
||||
fun OfflinePlayer.hasJobActive(job: Job) = job in this.activeJobs
|
||||
|
||||
/**
|
||||
* Get a player's active jobs.
|
||||
*/
|
||||
val OfflinePlayer.activeJobs: Collection<Job>
|
||||
get() {
|
||||
if (this.profile.read(legacyActiveJobKey).isNotBlank()) {
|
||||
this.profile.write(activeJobsKey, listOf(this.profile.read(legacyActiveJobKey)))
|
||||
this.profile.write(legacyActiveJobKey, "")
|
||||
}
|
||||
|
||||
return this.profile.read(activeJobsKey).mapNotNull { Jobs.getByID(it) }
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Join a job.
|
||||
*/
|
||||
fun OfflinePlayer.joinJob(job: Job) {
|
||||
val event = PlayerJobJoinEvent(this, job)
|
||||
Bukkit.getPluginManager().callEvent(event)
|
||||
|
||||
if (!event.isCancelled) {
|
||||
this.profile.write(activeJobsKey, this.activeJobs.plus(job).map { it.id })
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Leave a job.
|
||||
*/
|
||||
fun OfflinePlayer.leaveJob(job: Job) {
|
||||
if (job !in this.activeJobs) {
|
||||
return
|
||||
}
|
||||
|
||||
val event = PlayerJobLeaveEvent(this, job)
|
||||
Bukkit.getPluginManager().callEvent(event)
|
||||
|
||||
if (!event.isCancelled) {
|
||||
this.forceLeaveJob(job)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Leave a job without checking.
|
||||
*/
|
||||
fun OfflinePlayer.forceLeaveJob(job: Job) {
|
||||
this.profile.write(activeJobsKey, this.activeJobs.minus(job).map { it.id })
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the level of a certain job.
|
||||
*/
|
||||
fun OfflinePlayer.getJobLevel(job: Job) = this.profile.read(job.levelKey)
|
||||
|
||||
/**
|
||||
* Set the level of a certain job.
|
||||
*/
|
||||
fun OfflinePlayer.setJobLevel(job: Job, level: Int) = this.profile.write(job.levelKey, level)
|
||||
|
||||
/**
|
||||
* Get current job experience.
|
||||
*/
|
||||
fun OfflinePlayer.getJobXP(job: Job) = this.profile.read(job.xpKey)
|
||||
|
||||
/**
|
||||
* Set current job experience.
|
||||
*/
|
||||
fun OfflinePlayer.setJobXP(job: Job, xp: Double) = this.profile.write(job.xpKey, xp)
|
||||
|
||||
/**
|
||||
* Reset a job.
|
||||
*/
|
||||
fun OfflinePlayer.resetJob(job: Job) {
|
||||
this.setJobLevel(job, 1)
|
||||
this.setJobXP(job, 0.0)
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the experience required to advance to the next level.
|
||||
*/
|
||||
fun OfflinePlayer.getJobXPRequired(job: Job) = job.getExpForLevel(this.getJobLevel(job) + 1)
|
||||
|
||||
/**
|
||||
* Get progress to next level between 0 and 1, where 0 is none and 1 is complete.
|
||||
*/
|
||||
fun OfflinePlayer.getJobProgress(job: Job): Double {
|
||||
val currentXP = this.getJobXP(job)
|
||||
val requiredXP = job.getExpForLevel(this.getJobLevel(job) + 1)
|
||||
return currentXP / requiredXP
|
||||
}
|
||||
|
||||
/**
|
||||
* Give job experience.
|
||||
*/
|
||||
@JvmOverloads
|
||||
fun Player.giveJobExperience(job: Job, experience: Double, withMultipliers: Boolean = true) {
|
||||
val exp = abs(
|
||||
if (withMultipliers) experience * this.jobExperienceMultiplier
|
||||
else experience
|
||||
)
|
||||
|
||||
val gainEvent = PlayerJobExpGainEvent(this, job, exp, !withMultipliers)
|
||||
Bukkit.getPluginManager().callEvent(gainEvent)
|
||||
|
||||
if (gainEvent.isCancelled) {
|
||||
return
|
||||
}
|
||||
|
||||
this.giveExactJobExperience(job, gainEvent.amount)
|
||||
}
|
||||
|
||||
/**
|
||||
* Give exact job experience, without calling PlayerJobExpGainEvent.
|
||||
*/
|
||||
fun Player.giveExactJobExperience(job: Job, experience: Double) {
|
||||
val level = this.getJobLevel(job)
|
||||
|
||||
val progress = this.getJobXP(job) + experience
|
||||
|
||||
if (progress >= job.getExpForLevel(level + 1) && level + 1 <= job.maxLevel) {
|
||||
val overshoot = progress - job.getExpForLevel(level + 1)
|
||||
this.setJobXP(job, 0.0)
|
||||
this.setJobLevel(job, level + 1)
|
||||
val levelUpEvent = PlayerJobLevelUpEvent(this, job, level + 1)
|
||||
Bukkit.getPluginManager().callEvent(levelUpEvent)
|
||||
this.giveExactJobExperience(job, overshoot)
|
||||
} else {
|
||||
this.setJobXP(job, progress)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
package com.willfp.ecojobs.api.event
|
||||
|
||||
import com.willfp.ecojobs.jobs.Job
|
||||
|
||||
interface JobEvent {
|
||||
val job: Job
|
||||
}
|
||||
@@ -8,10 +8,10 @@ import org.bukkit.event.Cancellable
|
||||
|
||||
class PlayerJobExpGainEvent(
|
||||
who: Player,
|
||||
val job: Job,
|
||||
override val job: Job,
|
||||
var amount: Double,
|
||||
val isMultiply: Boolean
|
||||
) : PlayerEvent(who), Cancellable {
|
||||
) : PlayerEvent(who), Cancellable, JobEvent {
|
||||
private var cancelled = false
|
||||
|
||||
override fun setCancelled(cancel: Boolean) {
|
||||
|
||||
@@ -2,17 +2,14 @@ package com.willfp.ecojobs.api.event
|
||||
|
||||
import com.willfp.ecojobs.jobs.Job
|
||||
import org.bukkit.OfflinePlayer
|
||||
import org.bukkit.entity.Player
|
||||
import org.bukkit.event.Cancellable
|
||||
import org.bukkit.event.Event
|
||||
import org.bukkit.event.HandlerList
|
||||
import org.bukkit.event.player.PlayerEvent
|
||||
|
||||
class PlayerJobJoinEvent(
|
||||
val player: OfflinePlayer,
|
||||
val job: Job,
|
||||
val oldJob: Job?
|
||||
) : Event(), Cancellable {
|
||||
override val job: Job
|
||||
) : Event(), Cancellable, JobEvent {
|
||||
private var cancelled = false
|
||||
|
||||
override fun isCancelled() = this.cancelled
|
||||
|
||||
@@ -8,8 +8,8 @@ import org.bukkit.event.HandlerList
|
||||
|
||||
class PlayerJobLeaveEvent(
|
||||
val player: OfflinePlayer,
|
||||
val job: Job
|
||||
) : Event(), Cancellable {
|
||||
override val job: Job
|
||||
) : Event(), Cancellable, JobEvent {
|
||||
private var cancelled = false
|
||||
|
||||
override fun isCancelled() = this.cancelled
|
||||
|
||||
@@ -7,9 +7,9 @@ import org.bukkit.event.HandlerList
|
||||
|
||||
class PlayerJobLevelUpEvent(
|
||||
who: Player,
|
||||
val job: Job,
|
||||
override val job: Job,
|
||||
val level: Int
|
||||
) : PlayerEvent(who) {
|
||||
) : PlayerEvent(who), JobEvent {
|
||||
override fun getHandlers(): HandlerList {
|
||||
return handlerList
|
||||
}
|
||||
|
||||
@@ -2,14 +2,28 @@ package com.willfp.ecojobs.commands
|
||||
|
||||
import com.willfp.eco.core.EcoPlugin
|
||||
import com.willfp.eco.core.command.impl.PluginCommand
|
||||
import com.willfp.ecojobs.jobs.Jobs
|
||||
import com.willfp.libreforge.LibReforgePlugin
|
||||
import com.willfp.libreforge.lrcdb.CommandExport
|
||||
import com.willfp.libreforge.lrcdb.CommandImport
|
||||
import com.willfp.libreforge.lrcdb.ExportableConfig
|
||||
import org.bukkit.command.CommandSender
|
||||
|
||||
class CommandEcojobs(plugin: EcoPlugin) : PluginCommand(plugin, "ecojobs", "ecojobs.command.ecojobs", false) {
|
||||
class CommandEcojobs(plugin: LibReforgePlugin) : PluginCommand(plugin, "ecojobs", "ecojobs.command.ecojobs", false) {
|
||||
init {
|
||||
this.addSubcommand(CommandReload(plugin))
|
||||
.addSubcommand(CommandUnlock(plugin))
|
||||
.addSubcommand(CommandGiveXP(plugin))
|
||||
.addSubcommand(CommandReset(plugin))
|
||||
.addSubcommand(CommandImport("jobs", plugin))
|
||||
.addSubcommand(CommandExport(plugin) {
|
||||
Jobs.values().map {
|
||||
ExportableConfig(
|
||||
it.id,
|
||||
it.config
|
||||
)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
override fun onExecute(sender: CommandSender, args: List<String>) {
|
||||
|
||||
@@ -5,10 +5,9 @@ import com.willfp.eco.core.command.impl.Subcommand
|
||||
import com.willfp.eco.util.StringUtils
|
||||
import com.willfp.eco.util.savedDisplayName
|
||||
import com.willfp.eco.util.toNiceString
|
||||
import com.willfp.ecojobs.api.giveExactJobExperience
|
||||
import com.willfp.ecojobs.api.hasJob
|
||||
import com.willfp.ecojobs.jobs.Jobs
|
||||
import com.willfp.ecojobs.jobs.giveExactJobExperience
|
||||
import com.willfp.ecojobs.jobs.giveJobExperience
|
||||
import com.willfp.ecojobs.jobs.hasJob
|
||||
import org.bukkit.Bukkit
|
||||
import org.bukkit.command.CommandSender
|
||||
|
||||
|
||||
@@ -2,9 +2,11 @@ package com.willfp.ecojobs.commands
|
||||
|
||||
import com.willfp.eco.core.EcoPlugin
|
||||
import com.willfp.eco.core.command.impl.PluginCommand
|
||||
import com.willfp.ecojobs.api.hasJob
|
||||
import com.willfp.ecojobs.jobs.Jobs
|
||||
import com.willfp.ecojobs.jobs.JobsGUI
|
||||
import org.bukkit.command.CommandSender
|
||||
import org.bukkit.entity.Player
|
||||
import org.bukkit.util.StringUtil
|
||||
|
||||
class CommandJobs(plugin: EcoPlugin) : PluginCommand(plugin, "jobs", "ecojobs.command.jobs", true) {
|
||||
init {
|
||||
@@ -12,8 +14,44 @@ class CommandJobs(plugin: EcoPlugin) : PluginCommand(plugin, "jobs", "ecojobs.co
|
||||
.addSubcommand(CommandLeave(plugin))
|
||||
}
|
||||
|
||||
override fun onExecute(player: CommandSender, args: List<String>) {
|
||||
player as Player
|
||||
override fun onExecute(player: Player, args: List<String>) {
|
||||
if (args.isEmpty()) {
|
||||
JobsGUI.open(player)
|
||||
return
|
||||
}
|
||||
|
||||
val id = args[0].lowercase()
|
||||
val job = Jobs.getByID(id)
|
||||
|
||||
if (job == null) {
|
||||
player.sendMessage(plugin.langYml.getMessage("invalid-job"))
|
||||
return
|
||||
}
|
||||
|
||||
if (!player.hasJob(job)) {
|
||||
player.sendMessage(plugin.langYml.getMessage("dont-have-job"))
|
||||
return
|
||||
}
|
||||
|
||||
job.levelGUI.open(player)
|
||||
}
|
||||
|
||||
override fun tabComplete(player: Player, args: List<String>): List<String> {
|
||||
val completions = mutableListOf<String>()
|
||||
|
||||
if (args.isEmpty()) {
|
||||
return Jobs.values().filter { player.hasJob(it) }.map { it.id }
|
||||
}
|
||||
|
||||
if (args.size == 1) {
|
||||
StringUtil.copyPartialMatches(
|
||||
args[0],
|
||||
Jobs.values().filter { player.hasJob(it) }.map { it.id },
|
||||
completions
|
||||
)
|
||||
return completions
|
||||
}
|
||||
|
||||
return emptyList()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,9 +3,11 @@ package com.willfp.ecojobs.commands
|
||||
import com.willfp.eco.core.EcoPlugin
|
||||
import com.willfp.eco.core.command.impl.Subcommand
|
||||
import com.willfp.eco.util.StringUtils
|
||||
import com.willfp.ecojobs.api.canJoinJob
|
||||
import com.willfp.ecojobs.api.hasJob
|
||||
import com.willfp.ecojobs.api.hasJobActive
|
||||
import com.willfp.ecojobs.api.joinJob
|
||||
import com.willfp.ecojobs.jobs.Jobs
|
||||
import com.willfp.ecojobs.jobs.activeJob
|
||||
import com.willfp.ecojobs.jobs.hasJob
|
||||
import org.bukkit.command.CommandSender
|
||||
import org.bukkit.entity.Player
|
||||
import org.bukkit.util.StringUtil
|
||||
@@ -28,16 +30,22 @@ class CommandJoin(plugin: EcoPlugin) : Subcommand(plugin, "join", "ecojobs.comma
|
||||
return
|
||||
}
|
||||
|
||||
if (player.activeJob == job) {
|
||||
if (player.hasJobActive(job)) {
|
||||
player.sendMessage(plugin.langYml.getMessage("job-already-joined"))
|
||||
return
|
||||
}
|
||||
|
||||
if (!player.canJoinJob(job)) {
|
||||
player.sendMessage(plugin.langYml.getMessage("cannot-join-job"))
|
||||
return
|
||||
}
|
||||
|
||||
player.sendMessage(
|
||||
plugin.langYml.getMessage("joined-job", StringUtils.FormatOption.WITHOUT_PLACEHOLDERS)
|
||||
.replace("%job%", job.name)
|
||||
)
|
||||
player.activeJob = job
|
||||
|
||||
player.joinJob(job)
|
||||
}
|
||||
|
||||
override fun tabComplete(sender: CommandSender, args: List<String>): List<String> {
|
||||
@@ -46,14 +54,14 @@ class CommandJoin(plugin: EcoPlugin) : Subcommand(plugin, "join", "ecojobs.comma
|
||||
}
|
||||
|
||||
val completions = mutableListOf<String>()
|
||||
|
||||
if (args.isEmpty()) {
|
||||
// Currently, this case is not ever reached
|
||||
return Jobs.values().filter { sender.hasJob(it) }.map { it.id }
|
||||
}
|
||||
|
||||
if (args.size == 1) {
|
||||
StringUtil.copyPartialMatches(
|
||||
args[1],
|
||||
args[0],
|
||||
Jobs.values().filter { sender.hasJob(it) }.map { it.id },
|
||||
completions
|
||||
)
|
||||
|
||||
@@ -2,25 +2,78 @@ package com.willfp.ecojobs.commands
|
||||
|
||||
import com.willfp.eco.core.EcoPlugin
|
||||
import com.willfp.eco.core.command.impl.Subcommand
|
||||
import com.willfp.eco.util.StringUtils
|
||||
import com.willfp.ecojobs.jobs.activeJob
|
||||
import com.willfp.ecojobs.api.activeJobs
|
||||
import com.willfp.ecojobs.api.hasJob
|
||||
import com.willfp.ecojobs.api.hasJobActive
|
||||
import com.willfp.ecojobs.api.leaveJob
|
||||
import com.willfp.ecojobs.jobs.Jobs
|
||||
import org.bukkit.command.CommandSender
|
||||
import org.bukkit.entity.Player
|
||||
import org.bukkit.util.StringUtil
|
||||
|
||||
class CommandLeave(plugin: EcoPlugin) : Subcommand(plugin, "leave", "ecojobs.command.leave", true) {
|
||||
override fun onExecute(player: CommandSender, args: List<String>) {
|
||||
player as Player
|
||||
|
||||
if (player.activeJob == null) {
|
||||
if (args.isEmpty()) {
|
||||
player.sendMessage(plugin.langYml.getMessage("needs-job"))
|
||||
return
|
||||
}
|
||||
|
||||
if (player.activeJobs.isEmpty()) {
|
||||
player.sendMessage(plugin.langYml.getMessage("no-job"))
|
||||
return
|
||||
}
|
||||
|
||||
player.sendMessage(
|
||||
plugin.langYml.getMessage("left-job", StringUtils.FormatOption.WITHOUT_PLACEHOLDERS)
|
||||
.replace("%job%", player.activeJob?.name ?: "")
|
||||
)
|
||||
val id = args[0]
|
||||
|
||||
player.activeJob = null
|
||||
val job = Jobs.getByID(id)
|
||||
|
||||
if (job == null || !player.hasJob(job)) {
|
||||
player.sendMessage(plugin.langYml.getMessage("invalid-job"))
|
||||
return
|
||||
}
|
||||
|
||||
if (!player.hasJobActive(job)) {
|
||||
player.sendMessage(plugin.langYml.getMessage("not-in-job"))
|
||||
return
|
||||
}
|
||||
|
||||
player.leaveJob(job)
|
||||
|
||||
if (!player.hasJobActive(job)) {
|
||||
player.sendMessage(
|
||||
plugin.langYml.getMessage("left-job")
|
||||
.replace("%job%", job.name)
|
||||
)
|
||||
} else {
|
||||
player.sendMessage(
|
||||
plugin.langYml.getMessage("cant-leave-job")
|
||||
.replace("%job%", job.name)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
override fun tabComplete(sender: CommandSender, args: List<String>): List<String> {
|
||||
if (sender !is Player) {
|
||||
return emptyList()
|
||||
}
|
||||
|
||||
val completions = mutableListOf<String>()
|
||||
|
||||
if (args.isEmpty()) {
|
||||
return Jobs.values().filter { sender.hasJobActive(it) }.map { it.id }
|
||||
}
|
||||
|
||||
if (args.size == 1) {
|
||||
StringUtil.copyPartialMatches(
|
||||
args[0],
|
||||
Jobs.values().filter { sender.hasJobActive(it) }.map { it.id },
|
||||
completions
|
||||
)
|
||||
return completions
|
||||
}
|
||||
|
||||
return emptyList()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,12 +4,10 @@ import com.willfp.eco.core.EcoPlugin
|
||||
import com.willfp.eco.core.command.impl.Subcommand
|
||||
import com.willfp.eco.util.StringUtils
|
||||
import com.willfp.eco.util.savedDisplayName
|
||||
import com.willfp.ecojobs.api.forceLeaveJob
|
||||
import com.willfp.ecojobs.api.hasJob
|
||||
import com.willfp.ecojobs.api.resetJob
|
||||
import com.willfp.ecojobs.jobs.Jobs
|
||||
import com.willfp.ecojobs.jobs.activeJob
|
||||
import com.willfp.ecojobs.jobs.hasJob
|
||||
import com.willfp.ecojobs.jobs.resetJob
|
||||
import com.willfp.ecojobs.jobs.setJobLevel
|
||||
import com.willfp.ecojobs.jobs.setJobXP
|
||||
import org.bukkit.Bukkit
|
||||
import org.bukkit.command.CommandSender
|
||||
|
||||
@@ -46,9 +44,7 @@ class CommandReset(plugin: EcoPlugin) : Subcommand(plugin, "reset", "ecojobs.com
|
||||
return
|
||||
}
|
||||
|
||||
if (player.activeJob == job) {
|
||||
player.activeJob = null
|
||||
}
|
||||
player.forceLeaveJob(job)
|
||||
player.resetJob(job)
|
||||
|
||||
sender.sendMessage(
|
||||
|
||||
@@ -4,9 +4,9 @@ import com.willfp.eco.core.EcoPlugin
|
||||
import com.willfp.eco.core.command.impl.Subcommand
|
||||
import com.willfp.eco.util.StringUtils
|
||||
import com.willfp.eco.util.savedDisplayName
|
||||
import com.willfp.ecojobs.api.hasJob
|
||||
import com.willfp.ecojobs.api.setJobLevel
|
||||
import com.willfp.ecojobs.jobs.Jobs
|
||||
import com.willfp.ecojobs.jobs.hasJob
|
||||
import com.willfp.ecojobs.jobs.setJobLevel
|
||||
import org.bukkit.Bukkit
|
||||
import org.bukkit.command.CommandSender
|
||||
import org.bukkit.util.StringUtil
|
||||
|
||||
@@ -10,14 +10,24 @@ import com.willfp.eco.core.items.builder.ItemStackBuilder
|
||||
import com.willfp.eco.core.placeholder.PlayerPlaceholder
|
||||
import com.willfp.eco.core.placeholder.PlayerStaticPlaceholder
|
||||
import com.willfp.eco.core.placeholder.PlayerlessPlaceholder
|
||||
import com.willfp.eco.core.price.ConfiguredPrice
|
||||
import com.willfp.eco.core.price.impl.PriceEconomy
|
||||
import com.willfp.eco.util.NumberUtils
|
||||
import com.willfp.eco.util.formatEco
|
||||
import com.willfp.eco.util.toNiceString
|
||||
import com.willfp.ecojobs.EcoJobsPlugin
|
||||
import com.willfp.ecojobs.api.activeJobs
|
||||
import com.willfp.ecojobs.api.canJoinJob
|
||||
import com.willfp.ecojobs.api.event.PlayerJobExpGainEvent
|
||||
import com.willfp.ecojobs.api.event.PlayerJobJoinEvent
|
||||
import com.willfp.ecojobs.api.event.PlayerJobLeaveEvent
|
||||
import com.willfp.ecojobs.api.event.PlayerJobLevelUpEvent
|
||||
import com.willfp.ecojobs.api.getJobLevel
|
||||
import com.willfp.ecojobs.api.getJobProgress
|
||||
import com.willfp.ecojobs.api.getJobXP
|
||||
import com.willfp.ecojobs.api.getJobXPRequired
|
||||
import com.willfp.ecojobs.api.hasJobActive
|
||||
import com.willfp.ecojobs.api.jobLimit
|
||||
import com.willfp.libreforge.conditions.Conditions
|
||||
import com.willfp.libreforge.conditions.ConfiguredCondition
|
||||
import com.willfp.libreforge.effects.ConfiguredEffect
|
||||
@@ -28,21 +38,32 @@ import org.bukkit.Bukkit
|
||||
import org.bukkit.OfflinePlayer
|
||||
import org.bukkit.entity.Player
|
||||
import org.bukkit.inventory.ItemStack
|
||||
import java.util.*
|
||||
import java.time.Duration
|
||||
import java.util.DoubleSummaryStatistics
|
||||
import java.util.Objects
|
||||
import java.util.concurrent.TimeUnit
|
||||
import kotlin.math.abs
|
||||
import kotlin.math.max
|
||||
|
||||
class Job(
|
||||
val id: String,
|
||||
val config: Config,
|
||||
private val plugin: EcoJobsPlugin
|
||||
val id: String, val config: Config, private val plugin: EcoJobsPlugin
|
||||
) {
|
||||
private val topCache = Caffeine.newBuilder()
|
||||
.expireAfterWrite(Duration.ofSeconds(plugin.configYml.getInt("leaderboard-cache-lifetime").toLong()))
|
||||
.build<Int, LeaderboardCacheEntry?>()
|
||||
|
||||
val name = config.getFormattedString("name")
|
||||
val description = config.getFormattedString("description")
|
||||
val isUnlockedByDefault = config.getBool("unlocked-by-default")
|
||||
val resetsOnQuit = config.getBool("reset-on-quit")
|
||||
val joinPrice = config.getDouble("join-price")
|
||||
val leavePrice = config.getDouble("leave-price")
|
||||
|
||||
val joinPrice = ConfiguredPrice.create(config.getSubsection("join-price")) ?: ConfiguredPrice(
|
||||
PriceEconomy(config.getDouble("join-price")), ""
|
||||
)
|
||||
|
||||
val leavePrice = ConfiguredPrice.create(config.getSubsection("leave-price")) ?: ConfiguredPrice(
|
||||
PriceEconomy(config.getDouble("leave-price")), ""
|
||||
)
|
||||
|
||||
val levelKey: PersistentDataKey<Int> = PersistentDataKey(
|
||||
EcoJobsPlugin.instance.namespacedKeyFactory.create("${id}_level"),
|
||||
@@ -51,9 +72,7 @@ class Job(
|
||||
)
|
||||
|
||||
val xpKey: PersistentDataKey<Double> = PersistentDataKey(
|
||||
EcoJobsPlugin.instance.namespacedKeyFactory.create("${id}_xp"),
|
||||
PersistentDataKeyType.DOUBLE,
|
||||
0.0
|
||||
EcoJobsPlugin.instance.namespacedKeyFactory.create("${id}_xp"), PersistentDataKeyType.DOUBLE, 0.0
|
||||
)
|
||||
|
||||
private val levelXpRequirements = listOf(0) + config.getInts("level-xp-requirements")
|
||||
@@ -62,30 +81,26 @@ class Job(
|
||||
|
||||
val levelGUI = JobLevelGUI(plugin, this)
|
||||
|
||||
val leaveGUI = JobLeaveGUI(plugin, this)
|
||||
|
||||
private val baseItem: ItemStack = Items.lookup(config.getString("icon")).item
|
||||
|
||||
private val effects: Set<ConfiguredEffect>
|
||||
private val conditions: Set<ConfiguredCondition>
|
||||
|
||||
private val levels = Caffeine.newBuilder()
|
||||
.build<Int, JobLevel>()
|
||||
private val effectsDescription = Caffeine.newBuilder()
|
||||
.build<Int, List<String>>()
|
||||
private val rewardsDescription = Caffeine.newBuilder()
|
||||
.build<Int, List<String>>()
|
||||
private val levelUpMessages = Caffeine.newBuilder()
|
||||
.build<Int, List<String>>()
|
||||
private val levels = Caffeine.newBuilder().build<Int, JobLevel>()
|
||||
private val effectsDescription = Caffeine.newBuilder().build<Int, List<String>>()
|
||||
private val rewardsDescription = Caffeine.newBuilder().build<Int, List<String>>()
|
||||
private val levelUpMessages = Caffeine.newBuilder().build<Int, List<String>>()
|
||||
|
||||
private val levelCommands = mutableMapOf<Int, MutableList<String>>()
|
||||
|
||||
private val levelPlaceholders = config.getSubsections("level-placeholders")
|
||||
.map { sub ->
|
||||
private val levelPlaceholders = config.getSubsections("level-placeholders").map { sub ->
|
||||
LevelPlaceholder(
|
||||
sub.getString("id")
|
||||
) {
|
||||
NumberUtils.evaluateExpression(
|
||||
sub.getString("value")
|
||||
.replace("%level%", it.toString())
|
||||
sub.getString("value").replace("%level%", it.toString())
|
||||
).toNiceString()
|
||||
}
|
||||
}
|
||||
@@ -95,13 +110,11 @@ class Job(
|
||||
}
|
||||
|
||||
init {
|
||||
config.injectPlaceholders(
|
||||
PlayerStaticPlaceholder(
|
||||
config.injectPlaceholders(PlayerStaticPlaceholder(
|
||||
"level"
|
||||
) { p ->
|
||||
p.getJobLevel(this).toString()
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
effects = config.getSubsections("effects").mapNotNull {
|
||||
Effects.compile(it, "Job $id")
|
||||
@@ -131,46 +144,52 @@ class Job(
|
||||
}
|
||||
|
||||
PlayerPlaceholder(
|
||||
plugin,
|
||||
"${id}_percentage_progress"
|
||||
plugin, "${id}_percentage_progress"
|
||||
) {
|
||||
(it.getJobProgress(this) * 100).toNiceString()
|
||||
}.register()
|
||||
|
||||
PlayerPlaceholder(
|
||||
plugin,
|
||||
id
|
||||
plugin, id
|
||||
) {
|
||||
it.getJobLevel(this).toString()
|
||||
}.register()
|
||||
|
||||
PlayerPlaceholder(
|
||||
plugin,
|
||||
"${id}_current_xp"
|
||||
plugin, "${id}_current_xp"
|
||||
) {
|
||||
NumberUtils.format(it.getJobXP(this))
|
||||
}.register()
|
||||
|
||||
PlayerPlaceholder(
|
||||
plugin,
|
||||
"${id}_required_xp"
|
||||
plugin, "${id}_required_xp"
|
||||
) {
|
||||
it.getJobXPRequired(this).toString()
|
||||
}.register()
|
||||
|
||||
PlayerlessPlaceholder(
|
||||
plugin,
|
||||
"${id}_name"
|
||||
plugin, "${id}_name"
|
||||
) {
|
||||
this.name
|
||||
}.register()
|
||||
|
||||
PlayerPlaceholder(
|
||||
plugin,
|
||||
"${id}_level"
|
||||
plugin, "${id}_level"
|
||||
) {
|
||||
it.getJobLevel(this).toString()
|
||||
}.register()
|
||||
|
||||
PlayerPlaceholder(
|
||||
plugin, "${id}_active"
|
||||
) {
|
||||
it.hasJobActive(this).toString()
|
||||
}.register()
|
||||
|
||||
PlayerPlaceholder(
|
||||
plugin, "${id}_total_players"
|
||||
) {
|
||||
Bukkit.getOfflinePlayers().count { this in it.activeJobs }.toString()
|
||||
}.register()
|
||||
}
|
||||
|
||||
fun getLevel(level: Int): JobLevel = levels.get(level) {
|
||||
@@ -189,11 +208,9 @@ class Job(
|
||||
}
|
||||
}
|
||||
|
||||
this.config.getStrings("level-up-messages.$highestConfiguredLevel")
|
||||
.map {
|
||||
this.config.getStrings("level-up-messages.$highestConfiguredLevel").map {
|
||||
levelPlaceholders.format(it, level)
|
||||
}
|
||||
.map {
|
||||
}.map {
|
||||
" ".repeat(whitespace) + it
|
||||
}
|
||||
}
|
||||
@@ -210,11 +227,9 @@ class Job(
|
||||
}
|
||||
}
|
||||
|
||||
this.config.getStrings("effects-description.$highestConfiguredLevel")
|
||||
.map {
|
||||
this.config.getStrings("effects-description.$highestConfiguredLevel").map {
|
||||
levelPlaceholders.format(it, level)
|
||||
}
|
||||
.map {
|
||||
}.map {
|
||||
" ".repeat(whitespace) + it
|
||||
}
|
||||
}
|
||||
@@ -231,18 +246,27 @@ class Job(
|
||||
}
|
||||
}
|
||||
|
||||
this.config.getStrings("rewards-description.$highestConfiguredLevel")
|
||||
.map {
|
||||
this.config.getStrings("rewards-description.$highestConfiguredLevel").map {
|
||||
levelPlaceholders.format(it, level)
|
||||
}
|
||||
.map {
|
||||
}.map {
|
||||
" ".repeat(whitespace) + it
|
||||
}
|
||||
}
|
||||
|
||||
private fun getLeaveLore(level: Int, whitespace: Int = 0): List<String> = this.config.getStrings("leave-lore").map {
|
||||
levelPlaceholders.format(it, level)
|
||||
}.map {
|
||||
" ".repeat(whitespace) + it
|
||||
}
|
||||
|
||||
private fun getJoinLore(level: Int, whitespace: Int = 0): List<String> = this.config.getStrings("join-lore").map {
|
||||
levelPlaceholders.format(it, level)
|
||||
}.map {
|
||||
" ".repeat(whitespace) + it
|
||||
}
|
||||
|
||||
fun injectPlaceholdersInto(lore: List<String>, player: Player, forceLevel: Int? = null): List<String> {
|
||||
val withPlaceholders = lore
|
||||
.map {
|
||||
val withPlaceholders = lore.map {
|
||||
it.replace("%percentage_progress%", (player.getJobProgress(this) * 100).toNiceString())
|
||||
.replace("%current_xp%", player.getJobXP(this).toNiceString())
|
||||
.replace("%required_xp%", this.getExpForLevel(player.getJobLevel(this) + 1).let { req ->
|
||||
@@ -251,15 +275,12 @@ class Job(
|
||||
} else {
|
||||
req.toNiceString()
|
||||
}
|
||||
}
|
||||
)
|
||||
.replace("%description%", this.description)
|
||||
.replace("%job%", this.name)
|
||||
}).replace("%description%", this.description).replace("%job%", this.name)
|
||||
.replace("%level%", (forceLevel ?: player.getJobLevel(this)).toString())
|
||||
.replace("%join_price%", NumberUtils.format(this.joinPrice))
|
||||
.replace("%leave_price%", NumberUtils.format(this.leavePrice))
|
||||
}
|
||||
.toMutableList()
|
||||
.replace("%level_numeral%", NumberUtils.toNumeral(forceLevel ?: player.getJobLevel(this)))
|
||||
.replace("%join_price%", this.joinPrice.getDisplay(player))
|
||||
.replace("%leave_price%", this.leavePrice.getDisplay(player))
|
||||
}.toMutableList()
|
||||
|
||||
val processed = mutableListOf<List<String>>()
|
||||
|
||||
@@ -273,6 +294,10 @@ class Job(
|
||||
getRewardsDescription(forceLevel ?: player.getJobLevel(this), whitespace)
|
||||
} else if (s.contains("%level_up_messages%")) {
|
||||
getLevelUpMessages(forceLevel ?: player.getJobLevel(this), whitespace)
|
||||
} else if (s.contains("%leave_lore%")) {
|
||||
getLeaveLore(forceLevel ?: player.getJobLevel(this), whitespace)
|
||||
} else if (s.contains("%join_lore%")) {
|
||||
getJoinLore(forceLevel ?: player.getJobLevel(this), whitespace)
|
||||
} else {
|
||||
listOf(s)
|
||||
}
|
||||
@@ -286,34 +311,33 @@ class Job(
|
||||
val base = baseItem.clone()
|
||||
|
||||
val level = player.getJobLevel(this)
|
||||
val isActive = player.activeJob == this
|
||||
|
||||
return ItemStackBuilder(base)
|
||||
.setDisplayName(
|
||||
plugin.configYml.getFormattedString("gui.job-icon.name")
|
||||
.replace("%level%", level.toString())
|
||||
.replace("%job%", this.name)
|
||||
)
|
||||
.addLoreLines {
|
||||
injectPlaceholdersInto(plugin.configYml.getStrings("gui.job-icon.lore"), player) +
|
||||
if (isActive) plugin.configYml.getStrings("gui.job-icon.active-lore") else
|
||||
plugin.configYml.getStrings("gui.job-icon.not-active-lore")
|
||||
return ItemStackBuilder(base).setDisplayName(
|
||||
plugin.configYml.getFormattedString("gui.job-icon.name").replace("%level%", level.toString())
|
||||
.replace("%level_numeral%", NumberUtils.toNumeral(level)).replace("%job%", this.name)
|
||||
).addLoreLines {
|
||||
injectPlaceholdersInto(
|
||||
plugin.configYml.getStrings("gui.job-icon.lore"), player
|
||||
) + if (player.hasJobActive(this)) {
|
||||
plugin.configYml.getStrings("gui.job-icon.active-lore")
|
||||
} else if (player.canJoinJob(this)) {
|
||||
plugin.configYml.getStrings("gui.job-icon.join-lore")
|
||||
} else if (player.activeJobs.size == player.jobLimit) {
|
||||
plugin.configYml.getStrings("gui.job-icon.too-many-jobs-lore")
|
||||
} else {
|
||||
emptyList()
|
||||
}
|
||||
.build()
|
||||
}.build()
|
||||
}
|
||||
|
||||
fun getJobInfoIcon(player: Player): ItemStack {
|
||||
val base = baseItem.clone()
|
||||
return ItemStackBuilder(base)
|
||||
.setDisplayName(
|
||||
return ItemStackBuilder(base).setDisplayName(
|
||||
plugin.configYml.getFormattedString("gui.job-info.active.name")
|
||||
.replace("%level%", player.getJobLevel(this).toString())
|
||||
.replace("%job%", this.name)
|
||||
)
|
||||
.addLoreLines {
|
||||
.replace("%level%", player.getJobLevel(this).toString()).replace("%level_numeral%", NumberUtils.toNumeral(player.getJobLevel(this))).replace("%job%", this.name)
|
||||
).addLoreLines {
|
||||
injectPlaceholdersInto(plugin.configYml.getStrings("gui.job-info.active.lore"), player)
|
||||
}
|
||||
.build()
|
||||
}.build()
|
||||
}
|
||||
|
||||
fun getExpForLevel(level: Int): Int {
|
||||
@@ -336,6 +360,14 @@ class Job(
|
||||
return jobXpGains.sumOf { it.getCount(event) }
|
||||
}
|
||||
|
||||
fun getTop(place: Int): LeaderboardCacheEntry? {
|
||||
return topCache.get(place) {
|
||||
val players = Bukkit.getOfflinePlayers().sortedByDescending { it.getJobLevel(this) }
|
||||
val target = players.getOrNull(place-1) ?: return@get null
|
||||
return@get LeaderboardCacheEntry(target, target.getJobLevel(this))
|
||||
}
|
||||
}
|
||||
|
||||
override fun equals(other: Any?): Boolean {
|
||||
if (other !is Job) {
|
||||
return false
|
||||
@@ -350,12 +382,16 @@ class Job(
|
||||
}
|
||||
|
||||
private class LevelPlaceholder(
|
||||
val id: String,
|
||||
private val function: (Int) -> String
|
||||
val id: String, private val function: (Int) -> String
|
||||
) {
|
||||
operator fun invoke(level: Int) = function(level)
|
||||
}
|
||||
|
||||
data class LeaderboardCacheEntry(
|
||||
val player: OfflinePlayer,
|
||||
val amount: Int
|
||||
)
|
||||
|
||||
private fun Collection<LevelPlaceholder>.format(string: String, level: Int): String {
|
||||
var process = string
|
||||
for (placeholder in this) {
|
||||
@@ -364,85 +400,11 @@ private fun Collection<LevelPlaceholder>.format(string: String, level: Int): Str
|
||||
return process
|
||||
}
|
||||
|
||||
private val activeJobKey: PersistentDataKey<String> = PersistentDataKey(
|
||||
EcoJobsPlugin.instance.namespacedKeyFactory.create("active_job"),
|
||||
PersistentDataKeyType.STRING,
|
||||
""
|
||||
)
|
||||
fun OfflinePlayer.getJobLevelObject(job: Job): JobLevel = job.getLevel(this.getJobLevel(job))
|
||||
|
||||
var OfflinePlayer.activeJob: Job?
|
||||
get() = Jobs.getByID(this.profile.read(activeJobKey))
|
||||
set(job) {
|
||||
val oldJob = this.activeJob
|
||||
|
||||
if (oldJob != job) {
|
||||
// Have to check for oldJob too to have null safety
|
||||
if (job == null && oldJob != null) {
|
||||
val event = PlayerJobLeaveEvent(this, oldJob)
|
||||
Bukkit.getPluginManager().callEvent(event)
|
||||
|
||||
if (event.isCancelled) {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
// Not using else because null safety as well
|
||||
if (job != null) {
|
||||
val event = PlayerJobJoinEvent(this, job, oldJob)
|
||||
Bukkit.getPluginManager().callEvent(event)
|
||||
|
||||
if (event.isCancelled) {
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
this.profile.write(activeJobKey, job?.id ?: "")
|
||||
}
|
||||
|
||||
val OfflinePlayer.activeJobLevel: JobLevel?
|
||||
get() {
|
||||
val active = this.activeJob ?: return null
|
||||
return this.getJobLevelObject(active)
|
||||
}
|
||||
|
||||
fun OfflinePlayer.getJobLevel(job: Job): Int =
|
||||
this.profile.read(job.levelKey)
|
||||
|
||||
fun OfflinePlayer.setJobLevel(job: Job, level: Int) =
|
||||
this.profile.write(job.levelKey, level)
|
||||
|
||||
fun OfflinePlayer.resetJob(job: Job) {
|
||||
this.setJobLevel(job, 1)
|
||||
this.setJobXP(job, 0.0)
|
||||
}
|
||||
|
||||
fun OfflinePlayer.getJobProgress(job: Job): Double {
|
||||
val currentXP = this.getJobXP(job)
|
||||
val requiredXP = job.getExpForLevel(this.getJobLevel(job) + 1)
|
||||
return currentXP / requiredXP
|
||||
}
|
||||
|
||||
fun OfflinePlayer.getJobLevelObject(job: Job): JobLevel =
|
||||
job.getLevel(this.getJobLevel(job))
|
||||
|
||||
fun OfflinePlayer.hasJob(job: Job): Boolean =
|
||||
this.getJobLevel(job) > 0
|
||||
|
||||
fun OfflinePlayer.getJobXP(job: Job): Double =
|
||||
this.profile.read(job.xpKey)
|
||||
|
||||
fun OfflinePlayer.setJobXP(job: Job, xp: Double) =
|
||||
this.profile.write(job.xpKey, xp)
|
||||
|
||||
fun OfflinePlayer.getJobXPRequired(job: Job): Int =
|
||||
job.getExpForLevel(this.getJobLevel(job) + 1)
|
||||
|
||||
private val expMultiplierCache = Caffeine.newBuilder()
|
||||
.expireAfterWrite(10, TimeUnit.SECONDS)
|
||||
.build<Player, Double> {
|
||||
private val expMultiplierCache = Caffeine.newBuilder().expireAfterWrite(10, TimeUnit.SECONDS).build<Player, Double> {
|
||||
it.cacheJobExperienceMultiplier()
|
||||
}
|
||||
}
|
||||
|
||||
val Player.jobExperienceMultiplier: Double
|
||||
get() = expMultiplierCache.get(this)
|
||||
@@ -464,43 +426,19 @@ private fun Player.cacheJobExperienceMultiplier(): Double {
|
||||
return 1.5
|
||||
}
|
||||
|
||||
val prefix = "ecojobs.xpmultiplier."
|
||||
return 1 + getNumericalPermission("ecojobs.xpmultiplier", 0.0) / 100
|
||||
}
|
||||
|
||||
fun Player.getNumericalPermission(permission: String, default: Double): Double {
|
||||
var highest: Double? = null
|
||||
|
||||
for (permissionAttachmentInfo in this.effectivePermissions) {
|
||||
val permission = permissionAttachmentInfo.permission
|
||||
if (permission.startsWith(prefix)) {
|
||||
return ((permission.substring(permission.lastIndexOf(".") + 1).toDoubleOrNull() ?: 100.0) / 100) + 1
|
||||
val perm = permissionAttachmentInfo.permission
|
||||
if (perm.startsWith(permission)) {
|
||||
val found = perm.substring(perm.lastIndexOf(".") + 1).toDoubleOrNull() ?: continue
|
||||
highest = max(highest ?: Double.MIN_VALUE, found)
|
||||
}
|
||||
}
|
||||
|
||||
return 1.0
|
||||
}
|
||||
|
||||
fun Player.giveJobExperience(job: Job, experience: Double, noMultiply: Boolean = false) {
|
||||
val exp = abs(if (noMultiply) experience else experience * this.jobExperienceMultiplier)
|
||||
|
||||
val gainEvent = PlayerJobExpGainEvent(this, job, exp, !noMultiply)
|
||||
Bukkit.getPluginManager().callEvent(gainEvent)
|
||||
|
||||
if (gainEvent.isCancelled) {
|
||||
return
|
||||
}
|
||||
|
||||
this.giveExactJobExperience(job, gainEvent.amount)
|
||||
}
|
||||
|
||||
fun Player.giveExactJobExperience(job: Job, experience: Double) {
|
||||
val level = this.getJobLevel(job)
|
||||
|
||||
val progress = this.getJobXP(job) + experience
|
||||
|
||||
if (progress >= job.getExpForLevel(level + 1) && level + 1 <= job.maxLevel) {
|
||||
val overshoot = progress - job.getExpForLevel(level + 1)
|
||||
this.setJobXP(job, 0.0)
|
||||
this.setJobLevel(job, level + 1)
|
||||
val levelUpEvent = PlayerJobLevelUpEvent(this, job, level + 1)
|
||||
Bukkit.getPluginManager().callEvent(levelUpEvent)
|
||||
this.giveExactJobExperience(job, overshoot)
|
||||
} else {
|
||||
this.setJobXP(job, progress)
|
||||
}
|
||||
return highest ?: default
|
||||
}
|
||||
|
||||
@@ -0,0 +1,87 @@
|
||||
package com.willfp.ecojobs.jobs
|
||||
|
||||
import com.willfp.eco.core.EcoPlugin
|
||||
import com.willfp.eco.core.gui.menu
|
||||
import com.willfp.eco.core.gui.onLeftClick
|
||||
import com.willfp.eco.core.gui.slot
|
||||
import com.willfp.eco.core.gui.slot.FillerMask
|
||||
import com.willfp.eco.core.gui.slot.MaskItems
|
||||
import com.willfp.eco.core.items.Items
|
||||
import com.willfp.eco.core.items.builder.ItemStackBuilder
|
||||
import com.willfp.eco.util.formatEco
|
||||
import com.willfp.ecojobs.api.hasJobActive
|
||||
import com.willfp.ecojobs.api.leaveJob
|
||||
import org.bukkit.entity.Player
|
||||
|
||||
class JobLeaveGUI(
|
||||
plugin: EcoPlugin,
|
||||
job: Job
|
||||
) {
|
||||
private val menu = menu(plugin.configYml.getInt("leave-gui.rows")) {
|
||||
val maskPattern = plugin.configYml.getStrings("leave-gui.mask.pattern").toTypedArray()
|
||||
val maskItems = MaskItems.fromItemNames(plugin.configYml.getStrings("leave-gui.mask.materials"))
|
||||
|
||||
title = plugin.configYml.getString("leave-gui.title")
|
||||
.replace("%job%", job.name)
|
||||
.formatEco()
|
||||
|
||||
setMask(
|
||||
FillerMask(
|
||||
maskItems,
|
||||
*maskPattern
|
||||
)
|
||||
)
|
||||
|
||||
setSlot(
|
||||
plugin.configYml.getInt("leave-gui.cancel.location.row"),
|
||||
plugin.configYml.getInt("leave-gui.cancel.location.column"),
|
||||
slot({ player, _ ->
|
||||
ItemStackBuilder(Items.lookup(plugin.configYml.getString("leave-gui.cancel.item")))
|
||||
.setDisplayName(plugin.configYml.getString("leave-gui.cancel.name").replace("%job%", job.name))
|
||||
.addLoreLines(
|
||||
job.injectPlaceholdersInto(plugin.configYml.getStrings("leave-gui.cancel.lore"), player)
|
||||
)
|
||||
.build()
|
||||
}) {
|
||||
onLeftClick { player, _, _, _ ->
|
||||
JobsGUI.open(player)
|
||||
}
|
||||
}
|
||||
)
|
||||
|
||||
setSlot(
|
||||
plugin.configYml.getInt("leave-gui.confirm.location.row"),
|
||||
plugin.configYml.getInt("leave-gui.confirm.location.column"),
|
||||
slot({ player, _ ->
|
||||
ItemStackBuilder(Items.lookup(plugin.configYml.getString("leave-gui.confirm.item")))
|
||||
.setDisplayName(plugin.configYml.getString("leave-gui.confirm.name").replace("%job%", job.name))
|
||||
.addLoreLines(
|
||||
job.injectPlaceholdersInto(plugin.configYml.getStrings("leave-gui.confirm.lore"), player)
|
||||
)
|
||||
.build()
|
||||
}) {
|
||||
onLeftClick { player, _, _, _ ->
|
||||
player.leaveJob(job)
|
||||
|
||||
if (!player.hasJobActive(job)) {
|
||||
player.sendMessage(
|
||||
plugin.langYml.getMessage("left-job")
|
||||
.replace("%job%", job.name)
|
||||
)
|
||||
} else {
|
||||
player.sendMessage(
|
||||
plugin.langYml.getMessage("cant-leave-job")
|
||||
.replace("%job%", job.name)
|
||||
)
|
||||
}
|
||||
|
||||
JobsGUI.open(player)
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
fun open(player: Player) {
|
||||
menu.open(player)
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,9 @@ package com.willfp.ecojobs.jobs
|
||||
import com.willfp.eco.core.EcoPlugin
|
||||
import com.willfp.eco.core.gui.menu
|
||||
import com.willfp.eco.core.gui.menu.Menu
|
||||
import com.willfp.eco.core.gui.menu.MenuLayer
|
||||
import com.willfp.eco.core.gui.onLeftClick
|
||||
import com.willfp.eco.core.gui.page.PageChanger
|
||||
import com.willfp.eco.core.gui.slot
|
||||
import com.willfp.eco.core.gui.slot.ConfigSlot
|
||||
import com.willfp.eco.core.gui.slot.FillerMask
|
||||
@@ -10,63 +13,62 @@ import com.willfp.eco.core.gui.slot.MaskItems
|
||||
import com.willfp.eco.core.items.Items
|
||||
import com.willfp.eco.core.items.builder.ItemStackBuilder
|
||||
import com.willfp.eco.util.NumberUtils
|
||||
import org.bukkit.Material
|
||||
import com.willfp.ecojobs.api.getJobLevel
|
||||
import com.willfp.ecomponent.components.LevelComponent
|
||||
import com.willfp.ecomponent.components.LevelState
|
||||
import org.bukkit.entity.Player
|
||||
import org.bukkit.inventory.ItemStack
|
||||
import kotlin.math.ceil
|
||||
import kotlin.math.max
|
||||
import kotlin.math.min
|
||||
import kotlin.properties.Delegates
|
||||
|
||||
class JobLevelGUI(
|
||||
plugin: EcoPlugin,
|
||||
private val job: Job
|
||||
) {
|
||||
private val menu: Menu
|
||||
private val pageKey = "page"
|
||||
private var levelsPerPage by Delegates.notNull<Int>()
|
||||
private var pages by Delegates.notNull<Int>()
|
||||
|
||||
private fun getPage(menu: Menu, player: Player): Int {
|
||||
val page = menu.getState(player, pageKey) ?: 1
|
||||
|
||||
return min(pages, max(page, 1))
|
||||
}
|
||||
|
||||
init {
|
||||
val maskPattern = plugin.configYml.getStrings("level-gui.mask.pattern").toTypedArray()
|
||||
val maskItems = MaskItems.fromItemNames(plugin.configYml.getStrings("level-gui.mask.materials"))
|
||||
|
||||
val progressionOrder = "123456789abcdefghijklmnopqrstuvwxyz"
|
||||
val progressionPattern = plugin.configYml.getStrings("level-gui.progression-slots.pattern")
|
||||
|
||||
val progressionSlots = mutableMapOf<Int, Pair<Int, Int>>()
|
||||
val component = object : LevelComponent(progressionPattern, job.maxLevel) {
|
||||
override fun getLevelItem(player: Player, menu: Menu, level: Int, levelState: LevelState): ItemStack {
|
||||
val key = levelState.name.lowercase().replace("_", "-")
|
||||
|
||||
var x = 0
|
||||
for (row in progressionPattern) {
|
||||
x++
|
||||
var y = 0
|
||||
for (char in row) {
|
||||
y++
|
||||
if (char == '0') {
|
||||
continue
|
||||
return ItemStackBuilder(Items.lookup(plugin.configYml.getString("level-gui.progression-slots.$key.item")))
|
||||
.setDisplayName(
|
||||
plugin.configYml.getFormattedString("level-gui.progression-slots.$key.name")
|
||||
.replace("%job%", job.name)
|
||||
.replace("%level%", level.toString())
|
||||
.replace("%level_numeral%", NumberUtils.toNumeral(level))
|
||||
)
|
||||
.addLoreLines(
|
||||
job.injectPlaceholdersInto(
|
||||
plugin.configYml.getFormattedStrings("level-gui.progression-slots.$key.lore"),
|
||||
player,
|
||||
forceLevel = level
|
||||
)
|
||||
)
|
||||
.setAmount(
|
||||
if (plugin.configYml.getBool("level-gui.progression-slots.level-as-amount")) level else 1
|
||||
)
|
||||
.build()
|
||||
}
|
||||
|
||||
val pos = progressionOrder.indexOf(char)
|
||||
|
||||
if (pos == -1) {
|
||||
continue
|
||||
}
|
||||
|
||||
progressionSlots[pos + 1] = Pair(x, y)
|
||||
override fun getLevelState(player: Player, level: Int): LevelState {
|
||||
return when {
|
||||
level <= player.getJobLevel(job) -> LevelState.UNLOCKED
|
||||
level == player.getJobLevel(job) + 1 -> LevelState.IN_PROGRESS
|
||||
else -> LevelState.LOCKED
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
levelsPerPage = progressionSlots.size
|
||||
pages = ceil(job.maxLevel.toDouble() / levelsPerPage).toInt()
|
||||
|
||||
menu = menu(plugin.configYml.getInt("level-gui.rows")) {
|
||||
setTitle(job.name)
|
||||
title = job.name
|
||||
|
||||
maxPages(component.pages)
|
||||
|
||||
setMask(
|
||||
FillerMask(
|
||||
maskItems,
|
||||
@@ -74,58 +76,11 @@ class JobLevelGUI(
|
||||
)
|
||||
)
|
||||
|
||||
for ((level, value) in progressionSlots) {
|
||||
setSlot(
|
||||
value.first,
|
||||
value.second,
|
||||
slot(ItemStack(Material.BLACK_STAINED_GLASS_PANE)) {
|
||||
setUpdater { player, menu, _ ->
|
||||
val page = getPage(menu, player)
|
||||
addComponent(1, 1, component)
|
||||
|
||||
val slotLevel = ((page - 1) * levelsPerPage) + level
|
||||
|
||||
fun getItem(section: String) =
|
||||
ItemStackBuilder(Items.lookup(plugin.configYml.getString("level-gui.progression-slots.$section.item")))
|
||||
.setDisplayName(
|
||||
plugin.configYml.getFormattedString("level-gui.progression-slots.$section.name")
|
||||
.replace("%job%", job.name)
|
||||
.replace("%level%", slotLevel.toString())
|
||||
.replace("%level_numeral%", NumberUtils.toNumeral(slotLevel))
|
||||
)
|
||||
.addLoreLines(
|
||||
job.injectPlaceholdersInto(
|
||||
plugin.configYml.getFormattedStrings("level-gui.progression-slots.$section.lore"),
|
||||
player,
|
||||
forceLevel = slotLevel
|
||||
)
|
||||
)
|
||||
.build()
|
||||
|
||||
if (slotLevel > job.maxLevel) {
|
||||
maskItems.items[0].item
|
||||
} else {
|
||||
val item = when {
|
||||
slotLevel <= player.getJobLevel(job) -> {
|
||||
getItem("unlocked")
|
||||
}
|
||||
slotLevel == player.getJobLevel(job) + 1 -> {
|
||||
getItem("in-progress")
|
||||
}
|
||||
else -> {
|
||||
getItem("locked")
|
||||
}
|
||||
}
|
||||
|
||||
if (plugin.configYml.getBool("level-gui.progression-slots.level-as-amount")) {
|
||||
item.amount = slotLevel
|
||||
}
|
||||
item
|
||||
}
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
setSlot(
|
||||
// Instead of the page changer, this will show up when on the first page
|
||||
addComponent(
|
||||
MenuLayer.LOWER,
|
||||
plugin.configYml.getInt("level-gui.progression-slots.prev-page.location.row"),
|
||||
plugin.configYml.getInt("level-gui.progression-slots.prev-page.location.column"),
|
||||
slot(
|
||||
@@ -133,38 +88,30 @@ class JobLevelGUI(
|
||||
.setDisplayName(plugin.configYml.getString("level-gui.progression-slots.prev-page.name"))
|
||||
.build()
|
||||
) {
|
||||
onLeftClick { event, _, menu ->
|
||||
val player = event.whoClicked as Player
|
||||
val page = getPage(menu, player)
|
||||
|
||||
val newPage = max(0, page - 1)
|
||||
|
||||
if (newPage == 0) {
|
||||
JobsGUI.open(player)
|
||||
} else {
|
||||
menu.addState(player, pageKey, newPage)
|
||||
}
|
||||
}
|
||||
onLeftClick { player, _, _, _ -> JobsGUI.open(player) }
|
||||
}
|
||||
)
|
||||
setSlot(
|
||||
|
||||
addComponent(
|
||||
plugin.configYml.getInt("level-gui.progression-slots.prev-page.location.row"),
|
||||
plugin.configYml.getInt("level-gui.progression-slots.prev-page.location.column"),
|
||||
PageChanger(
|
||||
ItemStackBuilder(Items.lookup(plugin.configYml.getString("level-gui.progression-slots.prev-page.material")))
|
||||
.setDisplayName(plugin.configYml.getString("level-gui.progression-slots.prev-page.name"))
|
||||
.build(),
|
||||
PageChanger.Direction.BACKWARDS
|
||||
)
|
||||
)
|
||||
|
||||
addComponent(
|
||||
plugin.configYml.getInt("level-gui.progression-slots.next-page.location.row"),
|
||||
plugin.configYml.getInt("level-gui.progression-slots.next-page.location.column"),
|
||||
slot(
|
||||
PageChanger(
|
||||
ItemStackBuilder(Items.lookup(plugin.configYml.getString("level-gui.progression-slots.next-page.material")))
|
||||
.setDisplayName(plugin.configYml.getString("level-gui.progression-slots.next-page.name"))
|
||||
.build()
|
||||
) {
|
||||
onLeftClick { event, _, menu ->
|
||||
val player = event.whoClicked as Player
|
||||
|
||||
val page = getPage(menu, player)
|
||||
|
||||
val newPage = min(pages, page + 1)
|
||||
|
||||
menu.addState(player, pageKey, newPage)
|
||||
}
|
||||
}
|
||||
.build(),
|
||||
PageChanger.Direction.FORWARDS
|
||||
)
|
||||
)
|
||||
|
||||
setSlot(
|
||||
@@ -191,5 +138,7 @@ class JobLevelGUI(
|
||||
}
|
||||
}
|
||||
|
||||
fun open(player: Player) = menu.open(player)
|
||||
fun open(player: Player) {
|
||||
menu.open(player)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.willfp.ecojobs.jobs
|
||||
|
||||
import com.willfp.ecojobs.api.activeJobs
|
||||
import com.willfp.ecojobs.api.giveJobExperience
|
||||
import com.willfp.libreforge.events.TriggerPreProcessEvent
|
||||
import org.bukkit.event.EventHandler
|
||||
import org.bukkit.event.Listener
|
||||
@@ -9,14 +11,16 @@ object JobTriggerXPGainListener : Listener {
|
||||
fun handle(event: TriggerPreProcessEvent) {
|
||||
val player = event.player
|
||||
|
||||
val job = event.player.activeJob ?: return
|
||||
val jobs = event.player.activeJobs
|
||||
|
||||
for (job in jobs) {
|
||||
val amount = job.getXP(event)
|
||||
|
||||
if (amount <= 0.0) {
|
||||
return
|
||||
continue
|
||||
}
|
||||
|
||||
player.giveJobExperience(job, amount)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import com.google.common.collect.HashBiMap
|
||||
import com.google.common.collect.ImmutableList
|
||||
import com.willfp.eco.core.config.updating.ConfigUpdater
|
||||
import com.willfp.ecojobs.EcoJobsPlugin
|
||||
import com.willfp.ecojobs.api.getJobLevel
|
||||
import org.bukkit.OfflinePlayer
|
||||
|
||||
object Jobs {
|
||||
|
||||
@@ -3,18 +3,29 @@ package com.willfp.ecojobs.jobs
|
||||
import com.willfp.eco.core.config.updating.ConfigUpdater
|
||||
import com.willfp.eco.core.gui.menu
|
||||
import com.willfp.eco.core.gui.menu.Menu
|
||||
import com.willfp.eco.core.gui.onLeftClick
|
||||
import com.willfp.eco.core.gui.onRightClick
|
||||
import com.willfp.eco.core.gui.page.PageChanger
|
||||
import com.willfp.eco.core.gui.slot
|
||||
import com.willfp.eco.core.gui.slot.ConfigSlot
|
||||
import com.willfp.eco.core.gui.slot.FillerMask
|
||||
import com.willfp.eco.core.gui.slot.MaskItems
|
||||
import com.willfp.eco.core.items.Items
|
||||
import com.willfp.eco.core.items.builder.ItemStackBuilder
|
||||
import com.willfp.eco.core.items.builder.SkullBuilder
|
||||
import com.willfp.eco.util.formatEco
|
||||
import com.willfp.ecojobs.EcoJobsPlugin
|
||||
import com.willfp.ecojobs.api.activeJobs
|
||||
import com.willfp.ecojobs.api.canJoinJob
|
||||
import com.willfp.ecojobs.api.getJobLevel
|
||||
import com.willfp.ecojobs.api.hasJobActive
|
||||
import com.willfp.ecojobs.api.joinJob
|
||||
import com.willfp.ecojobs.jobs.Jobs.unlockedJobs
|
||||
import org.bukkit.Material
|
||||
import org.bukkit.Sound
|
||||
import org.bukkit.entity.Player
|
||||
import org.bukkit.inventory.ItemStack
|
||||
import org.bukkit.inventory.meta.SkullMeta
|
||||
import kotlin.math.ceil
|
||||
import kotlin.math.max
|
||||
import kotlin.math.min
|
||||
@@ -22,17 +33,6 @@ import kotlin.math.min
|
||||
object JobsGUI {
|
||||
private lateinit var menu: Menu
|
||||
private val jobAreaSlots = mutableListOf<Pair<Int, Int>>()
|
||||
private const val pageKey = "page"
|
||||
|
||||
private fun getPage(menu: Menu, player: Player): Int {
|
||||
val pages = ceil(Jobs.values()
|
||||
.filter { player.getJobLevel(it) > 0 }
|
||||
.size.toDouble() / jobAreaSlots.size).toInt()
|
||||
|
||||
val page = menu.getState(player, pageKey) ?: 1
|
||||
|
||||
return max(min(pages, page + 1), 1)
|
||||
}
|
||||
|
||||
@JvmStatic
|
||||
@ConfigUpdater
|
||||
@@ -53,21 +53,8 @@ object JobsGUI {
|
||||
}
|
||||
|
||||
private fun buildMenu(plugin: EcoJobsPlugin): Menu {
|
||||
val jobInfoItemBuilder = { player: Player, _: Menu ->
|
||||
val job = player.activeJob
|
||||
|
||||
if (job == null) {
|
||||
ItemStackBuilder(Items.lookup(plugin.configYml.getString("gui.job-info.no-active.item")))
|
||||
.setDisplayName(plugin.configYml.getFormattedString("gui.job-info.no-active.name"))
|
||||
.addLoreLines(plugin.configYml.getFormattedStrings("gui.job-info.no-active.lore"))
|
||||
.build()
|
||||
} else {
|
||||
job.getJobInfoIcon(player)
|
||||
}
|
||||
}
|
||||
|
||||
val jobIconBuilder = { player: Player, menu: Menu, index: Int ->
|
||||
val page = getPage(menu, player)
|
||||
val page = menu.getPage(player)
|
||||
|
||||
val unlockedJobs = player.unlockedJobs
|
||||
|
||||
@@ -78,7 +65,7 @@ object JobsGUI {
|
||||
}
|
||||
|
||||
return menu(plugin.configYml.getInt("gui.rows")) {
|
||||
setTitle(plugin.langYml.getString("menu.title"))
|
||||
title = plugin.langYml.getString("menu.title")
|
||||
|
||||
setMask(
|
||||
FillerMask(
|
||||
@@ -88,13 +75,46 @@ object JobsGUI {
|
||||
)
|
||||
|
||||
setSlot(
|
||||
plugin.configYml.getInt("gui.job-info.row"),
|
||||
plugin.configYml.getInt("gui.job-info.column"),
|
||||
slot(jobInfoItemBuilder) {
|
||||
onLeftClick { event, _, _ ->
|
||||
val player = event.whoClicked as Player
|
||||
player.activeJob?.levelGUI?.open(player)
|
||||
plugin.configYml.getInt("gui.player-info.row"),
|
||||
plugin.configYml.getInt("gui.player-info.column"),
|
||||
slot { player, _ ->
|
||||
val skullBuilder = SkullBuilder()
|
||||
.setDisplayName(
|
||||
plugin.configYml.getString("gui.player-info.name")
|
||||
.replace("%player%", player.displayName)
|
||||
.formatEco(player, true)
|
||||
)
|
||||
|
||||
if (player.activeJobs.isEmpty()) {
|
||||
skullBuilder.addLoreLines(
|
||||
plugin.configYml.getStrings("gui.player-info.no-jobs")
|
||||
.formatEco(player, true)
|
||||
)
|
||||
} else {
|
||||
skullBuilder.addLoreLines(
|
||||
plugin.configYml.getStrings("gui.player-info.has-jobs")
|
||||
.flatMap {
|
||||
if (it == "%jobs%") {
|
||||
player.activeJobs.flatMap { job ->
|
||||
job.injectPlaceholdersInto(
|
||||
plugin.configYml.getStrings("gui.player-info.job-line"),
|
||||
player
|
||||
)
|
||||
}
|
||||
} else {
|
||||
listOf(it)
|
||||
}
|
||||
}
|
||||
.formatEco(player, true)
|
||||
)
|
||||
}
|
||||
|
||||
val skull = skullBuilder.build()
|
||||
|
||||
val meta = skull.itemMeta as SkullMeta
|
||||
meta.owningPlayer = player
|
||||
skull.itemMeta = meta
|
||||
skull
|
||||
}
|
||||
)
|
||||
|
||||
@@ -102,14 +122,8 @@ object JobsGUI {
|
||||
val (row, column) = pair
|
||||
|
||||
setSlot(row, column, slot({ p, m -> jobIconBuilder(p, m, index) }) {
|
||||
setUpdater { p, m, _ ->
|
||||
jobIconBuilder(p, m, index)
|
||||
}
|
||||
|
||||
onLeftClick { event, _, _ ->
|
||||
val player = event.whoClicked as Player
|
||||
|
||||
val page = getPage(menu, player)
|
||||
onLeftClick { player, _, _, menu ->
|
||||
val page = menu.getPage(player)
|
||||
|
||||
val unlockedJobs = player.unlockedJobs
|
||||
|
||||
@@ -117,8 +131,22 @@ object JobsGUI {
|
||||
|
||||
val job = unlockedJobs.getOrNull(pagedIndex) ?: return@onLeftClick
|
||||
|
||||
if (player.activeJob != job) {
|
||||
player.activeJob = job
|
||||
if (player.hasJobActive(job)) {
|
||||
job.levelGUI.open(player)
|
||||
} else {
|
||||
if (player.canJoinJob(job)) {
|
||||
player.joinJob(job)
|
||||
|
||||
if (player.hasJobActive(job)) {
|
||||
player.sendMessage(
|
||||
plugin.langYml.getMessage("joined-job")
|
||||
.replace("%job%", job.name)
|
||||
)
|
||||
}
|
||||
} else {
|
||||
player.sendMessage(plugin.langYml.getMessage("cannot-join-job"))
|
||||
return@onLeftClick
|
||||
}
|
||||
}
|
||||
|
||||
player.playSound(
|
||||
@@ -128,51 +156,57 @@ object JobsGUI {
|
||||
plugin.configYml.getDouble("gui.job-icon.click.pitch").toFloat()
|
||||
)
|
||||
}
|
||||
|
||||
onRightClick { player, _, _, menu ->
|
||||
val page = menu.getPage(player)
|
||||
|
||||
val unlockedJobs = player.unlockedJobs
|
||||
|
||||
val pagedIndex = ((page - 1) * jobAreaSlots.size) + index
|
||||
|
||||
val job = unlockedJobs.getOrNull(pagedIndex) ?: return@onRightClick
|
||||
|
||||
if (player.hasJobActive(job)) {
|
||||
job.leaveGUI.open(player)
|
||||
|
||||
player.playSound(
|
||||
player.location,
|
||||
Sound.valueOf(plugin.configYml.getString("gui.job-icon.click.sound").uppercase()),
|
||||
1f,
|
||||
plugin.configYml.getDouble("gui.job-icon.click.pitch").toFloat()
|
||||
)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
setSlot(
|
||||
addComponent(
|
||||
plugin.configYml.getInt("gui.prev-page.location.row"),
|
||||
plugin.configYml.getInt("gui.prev-page.location.column"),
|
||||
slot(
|
||||
PageChanger(
|
||||
ItemStackBuilder(Items.lookup(plugin.configYml.getString("gui.prev-page.item")))
|
||||
.setDisplayName(plugin.configYml.getString("gui.prev-page.name"))
|
||||
.build()
|
||||
) {
|
||||
onLeftClick { event, _, menu ->
|
||||
val player = event.whoClicked as Player
|
||||
val page = getPage(menu, player)
|
||||
|
||||
val newPage = max(1, page - 1)
|
||||
|
||||
menu.addState(player, pageKey, newPage)
|
||||
}
|
||||
}
|
||||
.build(),
|
||||
PageChanger.Direction.BACKWARDS
|
||||
)
|
||||
)
|
||||
|
||||
setSlot(
|
||||
addComponent(
|
||||
plugin.configYml.getInt("gui.next-page.location.row"),
|
||||
plugin.configYml.getInt("gui.next-page.location.column"),
|
||||
slot(
|
||||
PageChanger(
|
||||
ItemStackBuilder(Items.lookup(plugin.configYml.getString("gui.next-page.item")))
|
||||
.setDisplayName(plugin.configYml.getString("gui.next-page.name"))
|
||||
.build()
|
||||
) {
|
||||
onLeftClick { event, _, menu ->
|
||||
val player = event.whoClicked as Player
|
||||
.build(),
|
||||
PageChanger.Direction.FORWARDS
|
||||
)
|
||||
)
|
||||
|
||||
val pages = ceil(Jobs.values()
|
||||
maxPages { player ->
|
||||
ceil(Jobs.values()
|
||||
.filter { player.getJobLevel(it) > 0 }
|
||||
.size.toDouble() / jobAreaSlots.size).toInt()
|
||||
|
||||
val page = getPage(menu, player)
|
||||
|
||||
val newPage = min(pages, page + 1)
|
||||
|
||||
menu.addState(player, pageKey, newPage)
|
||||
}
|
||||
}
|
||||
)
|
||||
|
||||
setSlot(plugin.configYml.getInt("gui.close.location.row"),
|
||||
plugin.configYml.getInt("gui.close.location.column"),
|
||||
@@ -185,20 +219,6 @@ object JobsGUI {
|
||||
}
|
||||
)
|
||||
|
||||
setSlot(plugin.configYml.getInt("gui.deactivate-job.location.row"),
|
||||
plugin.configYml.getInt("gui.deactivate-job.location.column"),
|
||||
slot(
|
||||
ItemStackBuilder(Items.lookup(plugin.configYml.getString("gui.deactivate-job.item")))
|
||||
.setDisplayName(plugin.configYml.getString("gui.deactivate-job.name"))
|
||||
.build()
|
||||
) {
|
||||
onLeftClick { event, _ ->
|
||||
val player = event.whoClicked as Player
|
||||
player.activeJob = null
|
||||
}
|
||||
}
|
||||
)
|
||||
|
||||
for (config in plugin.configYml.getSubsections("gui.custom-slots")) {
|
||||
setSlot(
|
||||
config.getInt("row"),
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.willfp.ecojobs.jobs
|
||||
|
||||
import com.willfp.eco.core.integrations.economy.balance
|
||||
import com.willfp.ecojobs.api.event.PlayerJobJoinEvent
|
||||
import com.willfp.ecojobs.api.event.PlayerJobLeaveEvent
|
||||
import org.bukkit.entity.Player
|
||||
import org.bukkit.event.EventHandler
|
||||
import org.bukkit.event.EventPriority
|
||||
import org.bukkit.event.Listener
|
||||
@@ -13,19 +13,16 @@ object PriceHandler : Listener {
|
||||
ignoreCancelled = true
|
||||
)
|
||||
fun onJoin(event: PlayerJobJoinEvent) {
|
||||
val player = event.player
|
||||
val player = event.player as? Player ?: return
|
||||
val job = event.job
|
||||
val price = job.joinPrice
|
||||
|
||||
if (price > 0) {
|
||||
val hasMoney = player.balance >= price
|
||||
|
||||
if (!hasMoney) {
|
||||
if (!price.canAfford(player)) {
|
||||
event.isCancelled = true
|
||||
return
|
||||
}
|
||||
|
||||
player.balance -= price
|
||||
}
|
||||
price.pay(player)
|
||||
}
|
||||
|
||||
@EventHandler(
|
||||
@@ -33,18 +30,15 @@ object PriceHandler : Listener {
|
||||
ignoreCancelled = true
|
||||
)
|
||||
fun onLeave(event: PlayerJobLeaveEvent) {
|
||||
val player = event.player
|
||||
val player = event.player as? Player ?: return
|
||||
val job = event.job
|
||||
val price = job.leavePrice
|
||||
|
||||
if (price > 0) {
|
||||
val hasMoney = player.balance >= price
|
||||
|
||||
if (!hasMoney) {
|
||||
if (!price.canAfford(player)) {
|
||||
event.isCancelled = true
|
||||
return
|
||||
}
|
||||
|
||||
player.balance -= price
|
||||
}
|
||||
price.pay(player)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.willfp.ecojobs.jobs
|
||||
|
||||
import com.willfp.ecojobs.api.event.PlayerJobLeaveEvent
|
||||
import com.willfp.ecojobs.api.resetJob
|
||||
import org.bukkit.event.EventHandler
|
||||
import org.bukkit.event.Listener
|
||||
|
||||
|
||||
@@ -3,6 +3,10 @@
|
||||
# by Auxilor
|
||||
#
|
||||
|
||||
jobs:
|
||||
limit: 3 # The most jobs a player can have at once.
|
||||
# You can set custom limits with the ecojobs.limit.<number> permission
|
||||
|
||||
gui:
|
||||
rows: 6
|
||||
|
||||
@@ -20,49 +24,43 @@ gui:
|
||||
materials:
|
||||
- black_stained_glass_pane
|
||||
pattern:
|
||||
- "111101111"
|
||||
- "111111111"
|
||||
- "101000001"
|
||||
- "111000001"
|
||||
- "101000001"
|
||||
- "111111111"
|
||||
- "111100011"
|
||||
- "100000001"
|
||||
- "100000001"
|
||||
- "100000001"
|
||||
- "111101111"
|
||||
|
||||
job-area:
|
||||
top-left:
|
||||
row: 2
|
||||
column: 4
|
||||
row: 3
|
||||
column: 2
|
||||
bottom-right:
|
||||
row: 4
|
||||
row: 5
|
||||
column: 8
|
||||
|
||||
job-info:
|
||||
row: 2
|
||||
column: 2
|
||||
player-info:
|
||||
row: 1
|
||||
column: 5
|
||||
|
||||
no-active:
|
||||
name: "&cNo Active Job"
|
||||
lore:
|
||||
name: "&r%player%&f's Jobs:"
|
||||
|
||||
no-jobs:
|
||||
- ""
|
||||
- "&cYou do not currently have a job active"
|
||||
- "&fPick one from the options below!"
|
||||
- ""
|
||||
item: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYmFkYzA0OGE3Y2U3OGY3ZGFkNzJhMDdkYTI3ZDg1YzA5MTY4ODFlNTUyMmVlZWQxZTNkYWYyMTdhMzhjMWEifX19
|
||||
|
||||
# %join_price% and %leave_price% are also available as placeholders
|
||||
|
||||
active:
|
||||
name: "%job% &fLvl. &a%level%"
|
||||
lore:
|
||||
- "%description%"
|
||||
- "&f"
|
||||
- "&fJob Rewards:"
|
||||
- "%effects%"
|
||||
- "&fYou can have up to &a%ecojobs_limit% &fjobs at once!"
|
||||
- ""
|
||||
- "&fProgress:"
|
||||
- "&8» &e%percentage_progress%%"
|
||||
- "&8» &e%current_xp%&8/&7%required_xp% &fXP"
|
||||
|
||||
has-jobs:
|
||||
- ""
|
||||
- "&eClick to view Level Progression!"
|
||||
- "%jobs%"
|
||||
- ""
|
||||
- "&fJob slots in use: &a%ecojobs_in_jobs%&8/&a%ecojobs_limit%"
|
||||
|
||||
job-line:
|
||||
- " %job% &fLvl. &a%level%"
|
||||
|
||||
job-icon:
|
||||
name: "%job% &fLvl. &a%level%"
|
||||
@@ -76,13 +74,20 @@ gui:
|
||||
- "&8» &e%percentage_progress%%"
|
||||
- "&8» &e%current_xp%&8/&7%required_xp% &fXP"
|
||||
|
||||
# %join_price% and %leave_price% are also available as placeholders
|
||||
|
||||
active-lore:
|
||||
- ""
|
||||
- "&cThis job is already active!"
|
||||
- "&eClick to view Level Progression!"
|
||||
- "&eRight-click to leave this job!"
|
||||
|
||||
not-active-lore:
|
||||
too-many-jobs-lore:
|
||||
- ""
|
||||
- "&eClick to activate this job!"
|
||||
- "&cYou have too many jobs already!"
|
||||
|
||||
join-lore:
|
||||
- ""
|
||||
- "&eClick to join this job!"
|
||||
|
||||
click:
|
||||
sound: ui_button_click
|
||||
@@ -93,31 +98,24 @@ gui:
|
||||
name: "&fPrevious Page"
|
||||
location:
|
||||
row: 6
|
||||
column: 5
|
||||
column: 4
|
||||
|
||||
next-page:
|
||||
item: arrow
|
||||
name: "&fNext Page"
|
||||
location:
|
||||
row: 6
|
||||
column: 7
|
||||
column: 6
|
||||
|
||||
close:
|
||||
item: barrier
|
||||
name: "&cClose"
|
||||
location:
|
||||
row: 6
|
||||
column: 6
|
||||
|
||||
deactivate-job:
|
||||
item: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTRiZDlhNDViOTY4MWNlYTViMjhjNzBmNzVhNjk1NmIxZjU5NGZlYzg0MGI5NjA3Nzk4ZmIxZTcwNzc2NDQzMCJ9fX0=
|
||||
name: "&cDeactivate Job"
|
||||
location:
|
||||
row: 4
|
||||
column: 2
|
||||
column: 5
|
||||
|
||||
# Custom GUI slots; see here for a how-to: https://plugins.auxilor.io/all-plugins/custom-gui-slots
|
||||
custom-slots: []
|
||||
custom-slots: [ ]
|
||||
|
||||
level-gui:
|
||||
rows: 6
|
||||
@@ -214,7 +212,54 @@ level-gui:
|
||||
column: 5
|
||||
|
||||
# Custom GUI slots; see here for a how-to: https://plugins.auxilor.io/all-plugins/custom-gui-slots
|
||||
custom-slots: []
|
||||
custom-slots: [ ]
|
||||
|
||||
leave-gui:
|
||||
rows: 3
|
||||
|
||||
title: "Confirm Leaving %job%"
|
||||
|
||||
mask:
|
||||
# The way the mask works is by having a list of materials
|
||||
# And then a pattern to use those materials.
|
||||
|
||||
# The pattern is the rows in the GUI
|
||||
# Each line must be 9 long, and the amount of rows should be the amount of rows in the GUI
|
||||
# A zero represents nothing
|
||||
# A 1 represents the first material
|
||||
# A 2 represents the second material
|
||||
# And so on, you can add up to 9.
|
||||
|
||||
materials:
|
||||
- black_stained_glass_pane
|
||||
pattern:
|
||||
- "111111111"
|
||||
- "110111011"
|
||||
- "111111111"
|
||||
|
||||
cancel:
|
||||
item: arrow
|
||||
name: "&eCancel"
|
||||
lore:
|
||||
- ""
|
||||
- "&fGo back to the Jobs menu"
|
||||
location:
|
||||
row: 2
|
||||
column: 3
|
||||
|
||||
confirm:
|
||||
item: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTRiZDlhNDViOTY4MWNlYTViMjhjNzBmNzVhNjk1NmIxZjU5NGZlYzg0MGI5NjA3Nzk4ZmIxZTcwNzc2NDQzMCJ9fX0=
|
||||
name: "&cLeave %job%"
|
||||
lore:
|
||||
- ""
|
||||
- "&cAre you sure?"
|
||||
- "%leave_lore%"
|
||||
location:
|
||||
row: 2
|
||||
column: 7
|
||||
|
||||
# Custom GUI slots; see here for a how-to: https://plugins.auxilor.io/all-plugins/custom-gui-slots
|
||||
custom-slots: [ ]
|
||||
|
||||
level-up:
|
||||
message:
|
||||
@@ -255,11 +300,19 @@ cannot-afford-type:
|
||||
sound: "BLOCK_NOTE_BLOCK_PLING"
|
||||
pitch: 0.5
|
||||
|
||||
cannot-afford-price:
|
||||
in-actionbar: true
|
||||
sound:
|
||||
enabled: true
|
||||
sound: "BLOCK_NOTE_BLOCK_PLING"
|
||||
pitch: 0.5
|
||||
|
||||
point-names: # If you have point names that look ugly (eg g_souls) then you can map them to nice names to be shown to players.
|
||||
example_point: "Nicely Formatted Point"
|
||||
|
||||
use-faster-move-trigger: true # Disable if you want move trigger to detect sub-1-block movements
|
||||
raytrace-distance: 80 # The distance that alt_click should check for a location
|
||||
leaderboard-cache-lifetime: 180 # How often will top placeholders update their cache (in seconds)
|
||||
|
||||
potions:
|
||||
icon:
|
||||
@@ -271,5 +324,3 @@ potions:
|
||||
particles:
|
||||
permanent: false
|
||||
triggered: true
|
||||
|
||||
share-configs: true # If your configs are allowed to be used to gather data and improve the plugin. Nothing identifying (IP, Name, etc) is shared.
|
||||
@@ -16,9 +16,28 @@ unlocked-by-default: true
|
||||
# If job progress should be reset when quitting
|
||||
reset-on-quit: false
|
||||
|
||||
# The price to join or leave this job (set to 0 to disable)
|
||||
join-price: 0
|
||||
leave-price: 0
|
||||
# The price to join this job (set to 0 to disable)
|
||||
# Read here for more: https://plugins.auxilor.io/all-plugins/prices
|
||||
join-price:
|
||||
value: 0
|
||||
type: coins
|
||||
display: "&a$%value%"
|
||||
|
||||
# Lore shown when clicking on the job icon to join it
|
||||
# Reference with %join_lore%
|
||||
join-lore: []
|
||||
|
||||
# The price to leave this job (set to 0 to disable)
|
||||
# Read here for more: https://plugins.auxilor.io/all-plugins/prices
|
||||
leave-price:
|
||||
value: 20000
|
||||
type: coins
|
||||
display: "&a$%value%"
|
||||
|
||||
# Lore shown on the confirm leave button
|
||||
# Reference with %leave_lore%
|
||||
leave-lore:
|
||||
- " &8» This will cost %leave_price%"
|
||||
|
||||
# The xp requirements for each job level - add new levels by adding more to this list
|
||||
level-xp-requirements:
|
||||
|
||||
123
eco-core/core-plugin/src/main/resources/jobs/beekeeper.yml
Normal file
123
eco-core/core-plugin/src/main/resources/jobs/beekeeper.yml
Normal file
@@ -0,0 +1,123 @@
|
||||
name: "&#FD9113Beekeeper"
|
||||
description: "&8&oLevelling up by breeding bees, but don't drink any honey!"
|
||||
|
||||
unlocked-by-default: true
|
||||
|
||||
reset-on-quit: false
|
||||
|
||||
join-price:
|
||||
value: 0
|
||||
type: coins
|
||||
display: "&a$%value%"
|
||||
|
||||
join-lore: []
|
||||
|
||||
leave-price:
|
||||
value: 0
|
||||
type: coins
|
||||
display: "&a$%value%"
|
||||
|
||||
leave-lore:
|
||||
- ""
|
||||
|
||||
level-xp-requirements:
|
||||
- 100
|
||||
- 120
|
||||
- 150
|
||||
- 180
|
||||
- 210
|
||||
- 250
|
||||
- 300
|
||||
- 360
|
||||
- 430
|
||||
- 520
|
||||
- 620
|
||||
- 740
|
||||
- 890
|
||||
- 1000
|
||||
- 1300
|
||||
- 1500
|
||||
- 1900
|
||||
- 2200
|
||||
- 2700
|
||||
- 3200
|
||||
- 3800
|
||||
- 4600
|
||||
- 5500
|
||||
- 6600
|
||||
- 7900
|
||||
- 9500
|
||||
- 11500
|
||||
- 14000
|
||||
- 17000
|
||||
- 19000
|
||||
- 24000
|
||||
- 29000
|
||||
- 34000
|
||||
- 41000
|
||||
- 50000
|
||||
- 60000
|
||||
- 70000
|
||||
- 85000
|
||||
- 100000
|
||||
- 120000
|
||||
- 150000
|
||||
- 180000
|
||||
- 210000
|
||||
- 250000
|
||||
- 300000
|
||||
- 360000
|
||||
- 440000
|
||||
- 580000
|
||||
- 750000
|
||||
|
||||
xp-gain-methods:
|
||||
- trigger: breed
|
||||
multiplier: 20.0
|
||||
filters:
|
||||
entities:
|
||||
- bee
|
||||
conditions: [ ]
|
||||
|
||||
level-placeholders:
|
||||
- id: "money"
|
||||
value: "%level% * 5"
|
||||
|
||||
effects-description:
|
||||
1:
|
||||
- "&8» &8Earn &a$%money%&8 for each bee you breed"
|
||||
|
||||
rewards-description:
|
||||
1:
|
||||
- "&8» &8Earn &a$%money%&8 for each bee you breed"
|
||||
|
||||
level-up-messages:
|
||||
1:
|
||||
- "&8» &8Earn &a$%money%&8 for each bee you breed"
|
||||
|
||||
level-commands: [ ]
|
||||
|
||||
effects:
|
||||
- id: give_money
|
||||
args:
|
||||
amount: "%v% * %level% * 2.0"
|
||||
triggers:
|
||||
- breed
|
||||
filters:
|
||||
entities:
|
||||
- bee
|
||||
|
||||
- id: take_money
|
||||
args:
|
||||
amount: "%v% * %level% * 5.0"
|
||||
triggers:
|
||||
- consume
|
||||
filters:
|
||||
items:
|
||||
- honey_bottle
|
||||
|
||||
|
||||
|
||||
conditions: [ ]
|
||||
|
||||
icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjY0MjgyZWQxOTc4NzQ4YjM5OTUwOTkxNDAwZjBiN2U0YTM5ZjJlN2Q5ZWNlNjA3NmFmNWQxMzUxYzExNzc3ZiJ9fX0=
|
||||
@@ -5,8 +5,20 @@ unlocked-by-default: true
|
||||
|
||||
reset-on-quit: false
|
||||
|
||||
join-price: 0
|
||||
leave-price: 0
|
||||
join-price:
|
||||
value: 0
|
||||
type: coins
|
||||
display: "&a$%value%"
|
||||
|
||||
join-lore: []
|
||||
|
||||
leave-price:
|
||||
value: 0
|
||||
type: coins
|
||||
display: "&a$%value%"
|
||||
|
||||
leave-lore:
|
||||
- ""
|
||||
|
||||
level-xp-requirements:
|
||||
- 100
|
||||
@@ -89,14 +101,6 @@ effects:
|
||||
args:
|
||||
every: "ceil(12 - %level% / 8)"
|
||||
amount: "1.2 * %level%"
|
||||
filters:
|
||||
items:
|
||||
- "*wooden_pickaxe"
|
||||
- "*stone_pickaxe"
|
||||
- "*iron_pickaxe"
|
||||
- "*golden_pickaxe"
|
||||
- "*diamond_pickaxe"
|
||||
- "*netherite_pickaxe"
|
||||
triggers:
|
||||
- place_block
|
||||
|
||||
|
||||
106
eco-core/core-plugin/src/main/resources/jobs/enchanter.yml
Normal file
106
eco-core/core-plugin/src/main/resources/jobs/enchanter.yml
Normal file
@@ -0,0 +1,106 @@
|
||||
name: "A54FBEnchanter"
|
||||
description: "&8&oLevel up by enchanting items"
|
||||
|
||||
unlocked-by-default: true
|
||||
|
||||
reset-on-quit: false
|
||||
|
||||
join-price:
|
||||
value: 0
|
||||
type: coins
|
||||
display: "&a$%value%"
|
||||
|
||||
join-lore: []
|
||||
|
||||
leave-price:
|
||||
value: 0
|
||||
type: coins
|
||||
display: "&a$%value%"
|
||||
|
||||
leave-lore:
|
||||
- ""
|
||||
|
||||
level-xp-requirements:
|
||||
- 100
|
||||
- 120
|
||||
- 150
|
||||
- 180
|
||||
- 210
|
||||
- 250
|
||||
- 300
|
||||
- 360
|
||||
- 430
|
||||
- 520
|
||||
- 620
|
||||
- 740
|
||||
- 890
|
||||
- 1000
|
||||
- 1300
|
||||
- 1500
|
||||
- 1900
|
||||
- 2200
|
||||
- 2700
|
||||
- 3200
|
||||
- 3800
|
||||
- 4600
|
||||
- 5500
|
||||
- 6600
|
||||
- 7900
|
||||
- 9500
|
||||
- 11500
|
||||
- 14000
|
||||
- 17000
|
||||
- 19000
|
||||
- 24000
|
||||
- 29000
|
||||
- 34000
|
||||
- 41000
|
||||
- 50000
|
||||
- 60000
|
||||
- 70000
|
||||
- 85000
|
||||
- 100000
|
||||
- 120000
|
||||
- 150000
|
||||
- 180000
|
||||
- 210000
|
||||
- 250000
|
||||
- 300000
|
||||
- 360000
|
||||
- 440000
|
||||
- 580000
|
||||
- 750000
|
||||
|
||||
xp-gain-methods:
|
||||
- trigger: enchant_item
|
||||
multiplier: 0.5
|
||||
conditions: [ ]
|
||||
|
||||
level-placeholders:
|
||||
- id: "money"
|
||||
value: "%level% * 0.25"
|
||||
|
||||
effects-description:
|
||||
1:
|
||||
- "&8» &8Earn &a$%money%&8 for each enchanted item"
|
||||
|
||||
rewards-description:
|
||||
1:
|
||||
- "&8» &8Earn &a$%money%&8 for each enchanted item"
|
||||
|
||||
level-up-messages:
|
||||
1:
|
||||
- "&8» &8Earn &a$%money%&8 for each enchanted item"
|
||||
|
||||
level-commands: [ ]
|
||||
|
||||
effects:
|
||||
- id: give_money
|
||||
args:
|
||||
amount: "%level% * 0.25"
|
||||
triggers:
|
||||
- enchant_item
|
||||
|
||||
conditions: [ ]
|
||||
|
||||
icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDJjOGU3NmZjZGRlOWExNWFlMzkyOWI4NGJmNmZmYTRjMTc3N2IxZTI2YjdkNmQ4OTM4ZjBlZjA0ZTg0ODc0YyJ9fX0=
|
||||
@@ -5,8 +5,20 @@ unlocked-by-default: true
|
||||
|
||||
reset-on-quit: false
|
||||
|
||||
join-price: 0
|
||||
leave-price: 0
|
||||
join-price:
|
||||
value: 0
|
||||
type: coins
|
||||
display: "&a$%value%"
|
||||
|
||||
join-lore: []
|
||||
|
||||
leave-price:
|
||||
value: 0
|
||||
type: coins
|
||||
display: "&a$%value%"
|
||||
|
||||
leave-lore:
|
||||
- ""
|
||||
|
||||
level-xp-requirements:
|
||||
- 100
|
||||
@@ -85,15 +97,15 @@ level-placeholders:
|
||||
|
||||
effects-description:
|
||||
1:
|
||||
- "&8» &8Earn &a$%money%&8 for each crop you farm"
|
||||
- "&8» &8Earn &a$%money%&8 for each crop farmed"
|
||||
|
||||
rewards-description:
|
||||
1:
|
||||
- "&8» &8Earn &a$%money%&8 for each crop you farm"
|
||||
- "&8» &8Earn &a$%money%&8 for each crop farmed"
|
||||
|
||||
level-up-messages:
|
||||
1:
|
||||
- "&8» &8Earn &a$%money%&8 for each crop you farm"
|
||||
- "&8» &8Earn &a$%money%&8 for each crop farmed"
|
||||
|
||||
level-commands: [ ]
|
||||
|
||||
|
||||
106
eco-core/core-plugin/src/main/resources/jobs/fisherman.yml
Normal file
106
eco-core/core-plugin/src/main/resources/jobs/fisherman.yml
Normal file
@@ -0,0 +1,106 @@
|
||||
name: "&#adf3fdFisherman"
|
||||
description: "&8&oLevel up by fishing"
|
||||
|
||||
unlocked-by-default: true
|
||||
|
||||
reset-on-quit: false
|
||||
|
||||
join-price:
|
||||
value: 0
|
||||
type: coins
|
||||
display: "&a$%value%"
|
||||
|
||||
join-lore: []
|
||||
|
||||
leave-price:
|
||||
value: 0
|
||||
type: coins
|
||||
display: "&a$%value%"
|
||||
|
||||
leave-lore:
|
||||
- ""
|
||||
|
||||
level-xp-requirements:
|
||||
- 100
|
||||
- 120
|
||||
- 150
|
||||
- 180
|
||||
- 210
|
||||
- 250
|
||||
- 300
|
||||
- 360
|
||||
- 430
|
||||
- 520
|
||||
- 620
|
||||
- 740
|
||||
- 890
|
||||
- 1000
|
||||
- 1300
|
||||
- 1500
|
||||
- 1900
|
||||
- 2200
|
||||
- 2700
|
||||
- 3200
|
||||
- 3800
|
||||
- 4600
|
||||
- 5500
|
||||
- 6600
|
||||
- 7900
|
||||
- 9500
|
||||
- 11500
|
||||
- 14000
|
||||
- 17000
|
||||
- 19000
|
||||
- 24000
|
||||
- 29000
|
||||
- 34000
|
||||
- 41000
|
||||
- 50000
|
||||
- 60000
|
||||
- 70000
|
||||
- 85000
|
||||
- 100000
|
||||
- 120000
|
||||
- 150000
|
||||
- 180000
|
||||
- 210000
|
||||
- 250000
|
||||
- 300000
|
||||
- 360000
|
||||
- 440000
|
||||
- 580000
|
||||
- 750000
|
||||
|
||||
xp-gain-methods:
|
||||
- trigger: catch_fish
|
||||
multiplier: 20.0
|
||||
conditions: [ ]
|
||||
|
||||
level-placeholders:
|
||||
- id: "money"
|
||||
value: "%level% * 5"
|
||||
|
||||
effects-description:
|
||||
1:
|
||||
- "&8» &8Earn &a$%money%&8 for each fish caught"
|
||||
|
||||
rewards-description:
|
||||
1:
|
||||
- "&8» &8Earn &a$%money%&8 for each fish caught"
|
||||
|
||||
level-up-messages:
|
||||
1:
|
||||
- "&8» &8Earn &a$%money%&8 for each fish caught"
|
||||
|
||||
level-commands: [ ]
|
||||
|
||||
effects:
|
||||
- id: give_money
|
||||
args:
|
||||
amount: "%v% * %level% * 2.0"
|
||||
triggers:
|
||||
- catch_fish
|
||||
|
||||
conditions: [ ]
|
||||
|
||||
icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZDgwNGU0MmVjOWIwN2ZjZTFjZTAwNThiNzhkZjU3NjNmNmU0MTBkOWNlODJlZjFlYmI5NTk3YTE1MmI2ZDRjOCJ9fX0=
|
||||
130
eco-core/core-plugin/src/main/resources/jobs/lumberjack.yml
Normal file
130
eco-core/core-plugin/src/main/resources/jobs/lumberjack.yml
Normal file
@@ -0,0 +1,130 @@
|
||||
name: "&#FD9113Lumberjack"
|
||||
description: "&7&oLevel up by chopping wood"
|
||||
|
||||
unlocked-by-default: true
|
||||
|
||||
reset-on-quit: false
|
||||
|
||||
join-price:
|
||||
value: 0
|
||||
type: coins
|
||||
display: "&a$%value%"
|
||||
|
||||
join-lore: []
|
||||
|
||||
leave-price:
|
||||
value: 0
|
||||
type: coins
|
||||
display: "&a$%value%"
|
||||
|
||||
leave-lore:
|
||||
- ""
|
||||
|
||||
level-xp-requirements:
|
||||
- 100
|
||||
- 120
|
||||
- 150
|
||||
- 180
|
||||
- 210
|
||||
- 250
|
||||
- 300
|
||||
- 360
|
||||
- 430
|
||||
- 520
|
||||
- 620
|
||||
- 740
|
||||
- 890
|
||||
- 1000
|
||||
- 1300
|
||||
- 1500
|
||||
- 1900
|
||||
- 2200
|
||||
- 2700
|
||||
- 3200
|
||||
- 3800
|
||||
- 4600
|
||||
- 5500
|
||||
- 6600
|
||||
- 7900
|
||||
- 9500
|
||||
- 11500
|
||||
- 14000
|
||||
- 17000
|
||||
- 19000
|
||||
- 24000
|
||||
- 29000
|
||||
- 34000
|
||||
- 41000
|
||||
- 50000
|
||||
- 60000
|
||||
- 70000
|
||||
- 85000
|
||||
- 100000
|
||||
- 120000
|
||||
- 150000
|
||||
- 180000
|
||||
- 210000
|
||||
- 250000
|
||||
- 300000
|
||||
- 360000
|
||||
- 440000
|
||||
- 580000
|
||||
- 750000
|
||||
|
||||
xp-gain-methods:
|
||||
- trigger: mine_block
|
||||
multiplier: 0.5
|
||||
filters:
|
||||
blocks:
|
||||
- oak_log
|
||||
- spruce_log
|
||||
- birch_log
|
||||
- jungle_log
|
||||
- acacia_log
|
||||
- dark_oak_log
|
||||
- mangrove_log
|
||||
- crimson_stem
|
||||
- warped_stem
|
||||
player_placed: false
|
||||
conditions: [ ]
|
||||
|
||||
level-placeholders:
|
||||
- id: "money"
|
||||
value: "%level% * 3.0"
|
||||
|
||||
effects-description:
|
||||
1:
|
||||
- "&8» &7Earn &a$%money%&7 for each log chopped."
|
||||
|
||||
rewards-description:
|
||||
1:
|
||||
- "&8» &7Earn &a$%money%&7 for each log chopped."
|
||||
|
||||
level-up-messages:
|
||||
1:
|
||||
- "&8» &7Earn &a$%money%&7 for each log chopped."
|
||||
|
||||
level-commands: [ ]
|
||||
|
||||
effects:
|
||||
- id: give_money
|
||||
args:
|
||||
amount: "%level% * 3.0"
|
||||
triggers:
|
||||
- mine_block
|
||||
filters:
|
||||
blocks:
|
||||
- oak_log
|
||||
- spruce_log
|
||||
- birch_log
|
||||
- jungle_log
|
||||
- acacia_log
|
||||
- dark_oak_log
|
||||
- mangrove_log
|
||||
- crimson_stem
|
||||
- warped_stem
|
||||
player_placed: false
|
||||
|
||||
conditions: [ ]
|
||||
|
||||
icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjk4NWEwNWQyYTMzOWExYzFiZDdlMmE3OWFlMDAyNWI5YTEwZTg0ZGI5OWFkZjQzNThkNmViZTgzNThhZDJkOCJ9fX0=
|
||||
@@ -5,8 +5,20 @@ unlocked-by-default: true
|
||||
|
||||
reset-on-quit: false
|
||||
|
||||
join-price: 0
|
||||
leave-price: 0
|
||||
join-price:
|
||||
value: 0
|
||||
type: coins
|
||||
display: "&a$%value%"
|
||||
|
||||
join-lore: []
|
||||
|
||||
leave-price:
|
||||
value: 0
|
||||
type: coins
|
||||
display: "&a$%value%"
|
||||
|
||||
leave-lore:
|
||||
- ""
|
||||
|
||||
level-xp-requirements:
|
||||
- 100
|
||||
|
||||
@@ -5,8 +5,20 @@ unlocked-by-default: true
|
||||
|
||||
reset-on-quit: false
|
||||
|
||||
join-price: 0
|
||||
leave-price: 0
|
||||
join-price:
|
||||
value: 0
|
||||
type: coins
|
||||
display: "&a$%value%"
|
||||
|
||||
join-lore: []
|
||||
|
||||
leave-price:
|
||||
value: 0
|
||||
type: coins
|
||||
display: "&a$%value%"
|
||||
|
||||
leave-lore:
|
||||
- ""
|
||||
|
||||
level-xp-requirements:
|
||||
- 100
|
||||
|
||||
106
eco-core/core-plugin/src/main/resources/jobs/smelter.yml
Normal file
106
eco-core/core-plugin/src/main/resources/jobs/smelter.yml
Normal file
@@ -0,0 +1,106 @@
|
||||
name: "B4736Smelter"
|
||||
description: "&8&oLevel up by smelting items"
|
||||
|
||||
unlocked-by-default: true
|
||||
|
||||
reset-on-quit: false
|
||||
|
||||
join-price:
|
||||
value: 0
|
||||
type: coins
|
||||
display: "&a$%value%"
|
||||
|
||||
join-lore: []
|
||||
|
||||
leave-price:
|
||||
value: 0
|
||||
type: coins
|
||||
display: "&a$%value%"
|
||||
|
||||
leave-lore:
|
||||
- ""
|
||||
|
||||
level-xp-requirements:
|
||||
- 100
|
||||
- 120
|
||||
- 150
|
||||
- 180
|
||||
- 210
|
||||
- 250
|
||||
- 300
|
||||
- 360
|
||||
- 430
|
||||
- 520
|
||||
- 620
|
||||
- 740
|
||||
- 890
|
||||
- 1000
|
||||
- 1300
|
||||
- 1500
|
||||
- 1900
|
||||
- 2200
|
||||
- 2700
|
||||
- 3200
|
||||
- 3800
|
||||
- 4600
|
||||
- 5500
|
||||
- 6600
|
||||
- 7900
|
||||
- 9500
|
||||
- 11500
|
||||
- 14000
|
||||
- 17000
|
||||
- 19000
|
||||
- 24000
|
||||
- 29000
|
||||
- 34000
|
||||
- 41000
|
||||
- 50000
|
||||
- 60000
|
||||
- 70000
|
||||
- 85000
|
||||
- 100000
|
||||
- 120000
|
||||
- 150000
|
||||
- 180000
|
||||
- 210000
|
||||
- 250000
|
||||
- 300000
|
||||
- 360000
|
||||
- 440000
|
||||
- 580000
|
||||
- 750000
|
||||
|
||||
xp-gain-methods:
|
||||
- trigger: smelt
|
||||
multiplier: 0.5
|
||||
conditions: [ ]
|
||||
|
||||
level-placeholders:
|
||||
- id: "money"
|
||||
value: "%level% * 0.25"
|
||||
|
||||
effects-description:
|
||||
1:
|
||||
- "&8» &8Earn &a$%money%&8 for each smelted item"
|
||||
|
||||
rewards-description:
|
||||
1:
|
||||
- "&8» &8Earn &a$%money%&8 for each smelted item"
|
||||
|
||||
level-up-messages:
|
||||
1:
|
||||
- "&8» &8Earn &a$%money%&8 for each smelted item"
|
||||
|
||||
level-commands: [ ]
|
||||
|
||||
effects:
|
||||
- id: give_money
|
||||
args:
|
||||
amount: "%level% * 0.25"
|
||||
triggers:
|
||||
- smelt
|
||||
|
||||
conditions: [ ]
|
||||
|
||||
icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODdjMDc0ODM2MmU5YTYzZTA3YWEyYjA4YjVmN2QxMDFlNTM5NWFhMjE1MzJhNDc2NzIyZGJkZDk4YzJmMiJ9fX0=
|
||||
180
eco-core/core-plugin/src/main/resources/jobs/toolsmith.yml
Normal file
180
eco-core/core-plugin/src/main/resources/jobs/toolsmith.yml
Normal file
@@ -0,0 +1,180 @@
|
||||
# The ID of the job is the name of the .yml file,
|
||||
# for example miner.yml has the ID of miner
|
||||
# You can place jobs anywhere in this folder,
|
||||
# including in subfolders if you want to organize your job configs
|
||||
# _example.yml is not loaded.
|
||||
|
||||
# The display name of the job
|
||||
name: "/b3Toolsmith"
|
||||
|
||||
description: "&8&oLevel up by crafting tools"
|
||||
|
||||
unlocked-by-default: true
|
||||
|
||||
reset-on-quit: false
|
||||
|
||||
join-price:
|
||||
value: 0
|
||||
type: coins
|
||||
display: "&a$%value%"
|
||||
|
||||
join-lore: []
|
||||
|
||||
leave-price:
|
||||
value: 0
|
||||
type: coins
|
||||
display: "&a$%value%"
|
||||
|
||||
leave-lore:
|
||||
- ""
|
||||
|
||||
level-xp-requirements:
|
||||
- 100
|
||||
- 120
|
||||
- 150
|
||||
- 180
|
||||
- 210
|
||||
- 250
|
||||
- 300
|
||||
- 360
|
||||
- 430
|
||||
- 520
|
||||
- 620
|
||||
- 740
|
||||
- 890
|
||||
- 1000
|
||||
- 1300
|
||||
- 1500
|
||||
- 1900
|
||||
- 2200
|
||||
- 2700
|
||||
- 3200
|
||||
- 3800
|
||||
- 4600
|
||||
- 5500
|
||||
- 6600
|
||||
- 7900
|
||||
- 9500
|
||||
- 11500
|
||||
- 14000
|
||||
- 17000
|
||||
- 19000
|
||||
- 24000
|
||||
- 29000
|
||||
- 34000
|
||||
- 41000
|
||||
- 50000
|
||||
- 60000
|
||||
- 70000
|
||||
- 85000
|
||||
- 100000
|
||||
- 120000
|
||||
- 150000
|
||||
- 180000
|
||||
- 210000
|
||||
- 250000
|
||||
- 300000
|
||||
- 360000
|
||||
- 440000
|
||||
- 580000
|
||||
- 750000
|
||||
|
||||
xp-gain-methods:
|
||||
- trigger: craft
|
||||
multiplier: 2
|
||||
conditions: [ ]
|
||||
filters:
|
||||
items:
|
||||
- "*wooden_pickaxe"
|
||||
- "*stone_pickaxe"
|
||||
- "*iron_pickaxe"
|
||||
- "*golden_pickaxe"
|
||||
- "*diamond_pickaxe"
|
||||
- "*netherite_pickaxe"
|
||||
- "*wooden_axe"
|
||||
- "*stone_axe"
|
||||
- "*iron_axe"
|
||||
- "*golden_axe"
|
||||
- "*diamond_axe"
|
||||
- "*netherite_axe"
|
||||
- "*wooden_shovel"
|
||||
- "*stone_shovel"
|
||||
- "*iron_shovel"
|
||||
- "*golden_shovel"
|
||||
- "*diamond_shovel"
|
||||
- "*netherite_shovel"
|
||||
- "*wooden_hoe"
|
||||
- "*stone_hoe"
|
||||
- "*iron_hoe"
|
||||
- "*golden_hoe"
|
||||
- "*diamond_hoe"
|
||||
- "*netherite_hoe"
|
||||
- "*fishing_rod"
|
||||
- "*flint_and_steel"
|
||||
- "*clock"
|
||||
- "*compass"
|
||||
- "*lead"
|
||||
- "*shears"
|
||||
- "*spyglass"
|
||||
|
||||
level-placeholders:
|
||||
- id: "money"
|
||||
value: "%level% * 2"
|
||||
|
||||
effects-description:
|
||||
1:
|
||||
- "&8» &8Earn &a$%money%&8 for each tool crafted"
|
||||
|
||||
rewards-description:
|
||||
1:
|
||||
- "&8» &8Earn &a$%money%&8 for each tool crafted"
|
||||
|
||||
level-up-messages:
|
||||
1:
|
||||
- "&8» &8Earn &a$%money%&8 for each tool crafted"
|
||||
|
||||
level-commands: [ ]
|
||||
|
||||
effects:
|
||||
- id: give_money
|
||||
args:
|
||||
amount: "2 * %level%"
|
||||
filters:
|
||||
items:
|
||||
- "*wooden_pickaxe"
|
||||
- "*stone_pickaxe"
|
||||
- "*iron_pickaxe"
|
||||
- "*golden_pickaxe"
|
||||
- "*diamond_pickaxe"
|
||||
- "*netherite_pickaxe"
|
||||
- "*wooden_axe"
|
||||
- "*stone_axe"
|
||||
- "*iron_axe"
|
||||
- "*golden_axe"
|
||||
- "*diamond_axe"
|
||||
- "*netherite_axe"
|
||||
- "*wooden_shovel"
|
||||
- "*stone_shovel"
|
||||
- "*iron_shovel"
|
||||
- "*golden_shovel"
|
||||
- "*diamond_shovel"
|
||||
- "*netherite_shovel"
|
||||
- "*wooden_hoe"
|
||||
- "*stone_hoe"
|
||||
- "*iron_hoe"
|
||||
- "*golden_hoe"
|
||||
- "*diamond_hoe"
|
||||
- "*netherite_hoe"
|
||||
- "*fishing_rod"
|
||||
- "*flint_and_steel"
|
||||
- "*clock"
|
||||
- "*compass"
|
||||
- "*lead"
|
||||
- "*shears"
|
||||
- "*spyglass"
|
||||
triggers:
|
||||
- craft
|
||||
|
||||
conditions: [ ]
|
||||
|
||||
icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODk2ZDRjODM4YTE2MDZhYzc1Nzc1NDIzMjA4NjE0OTcwOGI3OWFiYTAxYmU5NTNjNjUzOTkxMDFlODk0M2RhZiJ9fX0=
|
||||
@@ -6,8 +6,17 @@ messages:
|
||||
reloaded: "Reloaded!"
|
||||
cannot-afford: "&cYou can't afford to do this! &fCost: &a$$%cost%"
|
||||
cannot-afford-type: "&cYou can't afford to do this! &fCost: &a%cost% %type%"
|
||||
cannot-afford-price: "&cYou can't afford to do this! &fPrice: %price%"
|
||||
on-cooldown: "&cThis effect is on cooldown! &fTime left: &a%seconds% seconds"
|
||||
cannot-transmit: "&cYou can't transmit here!"
|
||||
must-specify-lrcdb-id: "&cYou must specify the ID of the config to download! Not sure what this means? Go to &alrcdb.auxilor.io"
|
||||
lrcdb-import-error: "&cError importing config: &f%message%"
|
||||
lrcdb-import-success: "&fImported &a%name%&f! Reload the plugin to install it"
|
||||
must-specify-config-name: "&cYou must specify the config name!"
|
||||
invalid-config-name: "&cInvalid config name!"
|
||||
lrcdb-export-error: "&cError exporting config: &f%message%"
|
||||
lrcdb-export-success: "&fExported &a%name%&f! View it on &alrcdb.auxilor.io&f, or share your config ID: &f%id%"
|
||||
|
||||
needs-player: "&cYou must specify a player!"
|
||||
gave-xp: "&fYou have given &a%xp% &fXP to %player%&f's %job%&f!"
|
||||
reset-xp: "&fYou have reset %player%&f's %job%&f XP!"
|
||||
@@ -24,8 +33,16 @@ messages:
|
||||
joined-job: "&fYou have joined the %job%&f job!"
|
||||
left-job: "&fYou have left the %job%&f job!"
|
||||
job-already-joined: "&cYou already have this job!"
|
||||
cannot-join-job: "&cYou are already in too many jobs, please leave one!"
|
||||
cant-leave-job: "&cYou can't leave the %job%&f job!"
|
||||
dont-have-job: "&cYou don't have this job unlocked!"
|
||||
not-in-job: "&cYou are not in this job!"
|
||||
|
||||
menu:
|
||||
title: "Jobs"
|
||||
|
||||
infinity: "∞"
|
||||
|
||||
top:
|
||||
name-empty: "&cEmpty"
|
||||
amount-empty: "0"
|
||||
|
||||
19
eco-core/core-plugin/src/main/resources/lrcdb.yml
Normal file
19
eco-core/core-plugin/src/main/resources/lrcdb.yml
Normal file
@@ -0,0 +1,19 @@
|
||||
# Options for lrcdb (https://lrcdb.auxilor.io), a website to share configs
|
||||
# with other server owners, so you can get more configs without making them
|
||||
# yourself!
|
||||
|
||||
author: "Unknown Author" # The name attached to configs you export
|
||||
|
||||
# Options about automatically sharing configs you create
|
||||
share-configs:
|
||||
# If you want all your configs to automatically be publicly available,
|
||||
# set this to true. This really helps out other users!
|
||||
publicly: false
|
||||
|
||||
# If you don't want your configs to be usable to gather information about
|
||||
# plugin usage or to improve the plugins in the future, disable this.
|
||||
# Nothing identifying is shared.
|
||||
enabled: true
|
||||
|
||||
# If you disable share-configs, you can still share select configs publicly
|
||||
# with /ecojobs export <config>.
|
||||
@@ -7,8 +7,6 @@ website: willfp.com
|
||||
load: STARTUP
|
||||
depend:
|
||||
- eco
|
||||
- ProtocolLib
|
||||
- PlaceholderAPI
|
||||
softdepend:
|
||||
- AureliumSkills
|
||||
- Vault
|
||||
@@ -52,6 +50,8 @@ permissions:
|
||||
ecojobs.command.join: true
|
||||
ecojobs.command.leave: true
|
||||
ecojobs.command.reset: true
|
||||
ecojobs.command.import: true
|
||||
ecojobs.command.export: true
|
||||
|
||||
ecojobs.command.reload:
|
||||
description: Allows reloading the config
|
||||
@@ -71,6 +71,12 @@ permissions:
|
||||
ecojobs.command.reset:
|
||||
description: Allows the use of /ecojobs reset.
|
||||
default: op
|
||||
ecojobs.command.import:
|
||||
description: Allows the use of /ecojobs import.
|
||||
default: op
|
||||
ecojobs.command.export:
|
||||
description: Allows the use of /ecojobs export.
|
||||
default: op
|
||||
ecojobs.command.join:
|
||||
description: Allows the use of /jobs join.
|
||||
default: true
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#libreforge-updater
|
||||
#Wed Sep 28 17:52:31 BST 2022
|
||||
version=1.11.0
|
||||
#Mon Mar 13 13:38:53 GMT 2023
|
||||
version=2.1.4
|
||||
plugin-name=EcoJobs
|
||||
|
||||
Reference in New Issue
Block a user