9
0
mirror of https://github.com/Auxilor/EcoJobs.git synced 2025-12-20 15:39:26 +00:00

Compare commits

...

71 Commits

Author SHA1 Message Date
Auxilor
2a72f7d6ce libreforge-updater 2022-12-09 17:00:49 +00:00
Auxilor
762a871354 libreforge-updater 2022-12-05 10:49:59 +00:00
Auxilor
b101e23a86 libreforge-updater 2022-11-30 17:37:48 +00:00
Auxilor
07e1cb7797 libreforge-updater 2022-11-27 21:43:56 +00:00
Auxilor
409a84aea8 libreforge-updater 2022-11-26 19:19:52 +00:00
Auxilor
886b2e0c06 libreforge-updater 2022-11-24 14:29:42 +00:00
Auxilor
0ff5dcf670 libreforge-updater 2022-11-23 17:24:43 +00:00
Auxilor
1b93969d3b libreforge-updater 2022-11-21 16:02:22 +00:00
Auxilor
af5f5cfba6 Updated to 1.26.2 2022-11-21 12:59:11 +00:00
Auxilor
2c726fd9ac Fixed jumberjack 2022-11-21 12:59:03 +00:00
Auxilor
8dbe453bc5 Fix 2022-11-21 12:57:23 +00:00
Auxilor
768d2218d0 Fix 2022-11-21 11:45:20 +00:00
Auxilor
e212762951 Fix 2022-11-21 11:45:05 +00:00
Auxilor
c5d7e07d49 Updated to 1.26.1 2022-11-21 11:41:54 +00:00
Auxilor
88d118cdd7 Added /jobs <job> 2022-11-21 11:41:46 +00:00
Auxilor
b08616b01e libreforge-updater 2022-11-17 08:37:53 +00:00
Auxilor
3811e46fac libreforge-updater 2022-11-12 17:33:55 +00:00
Auxilor
b16905e435 Improved default config 2022-11-07 12:49:10 +00:00
Auxilor
e0084d61f7 Added %join_lore% and %leave_lore% 2022-11-07 12:47:15 +00:00
Auxilor
3606d5f12b Updated to 1.24.0 2022-11-07 12:36:37 +00:00
Auxilor
599b2800d8 Added confirmation GUI, improved prices 2022-11-07 12:36:28 +00:00
Auxilor
e4af959945 libreforge-updater 2022-11-06 19:51:41 +00:00
Auxilor
d1af2e25e7 Reworked Level GUI to use ecomponent 2022-11-06 15:29:38 +00:00
Auxilor
1eb0bdb639 libreforge-updater 2022-11-01 16:22:52 +00:00
Will FP
85e117ba78 Merge pull request #12 from 0ft3n/master
/jobs join tabcompletion fix (hardest fix in my life)
2022-11-01 16:18:08 +00:00
_OfTeN_
e27077dd71 Hardest fix in my life 2022-10-29 15:49:50 +03:00
Auxilor
17f471228d libreforge-updater 2022-10-28 11:34:14 +01:00
Auxilor
14d0997690 libreforge-updater 2022-10-26 22:10:07 +01:00
Auxilor
0f449aa7cb libreforge-updater 2022-10-26 22:09:18 +01:00
Auxilor
5ad4401762 Fix 2022-10-24 17:24:16 +01:00
Auxilor
e54712c960 Fix 2022-10-24 17:07:54 +01:00
Auxilor
72aa54a9e3 libreforge-updater 2022-10-24 17:04:52 +01:00
Auxilor
d9487300d7 Merge branch 'Kristopherrr_master'
# Conflicts:
#	build.gradle
#	eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/EcoJobsPlugin.kt
2022-10-24 17:02:44 +01:00
Auxilor
9911244f34 PR Cleanup 2022-10-24 17:02:25 +01:00
Auxilor
2447dc0279 Lots of cleanup 2022-10-24 17:01:43 +01:00
Will FP
3b949c0119 Merge pull request #8
Added placeholder to get total number of players with specific job
2022-10-24 16:50:12 +01:00
Auxilor
a8f11ffb44 libreforge-updater 2022-10-21 19:25:32 +01:00
Auxilor
3829e326ba libreforge-updater 2022-10-19 20:43:19 +01:00
Auxilor
26d44fb2d9 libreforge-updater 2022-10-18 14:12:39 +01:00
Auxilor
5cba64d19f libreforge-updater 2022-10-16 23:26:32 +01:00
Auxilor
52f3230307 libreforge-updater 2022-10-13 20:11:59 +01:00
ItsMeKrisK
ad16872efd Job Changes n Additions
Added Enchanter/ Lumberjack/ Smelter job and fixed some things in beekeeper
2022-10-11 19:25:54 +03:00
ItsMeKrisK
21ab58b425 Placeholder for the total levels of player's jobs
**The placeholder:** 😉
• `%ecojobs_total_jobs_level%`
2022-10-11 03:11:24 +03:00
Bruno de Araujo Alves
c80dd2371c Added placeholder to get total number of players with specific job
- %ecojobs_<id>_total_players%
2022-10-10 18:50:05 -03:00
Auxilor
e0b2ae4f40 libreforge-updater 2022-10-10 21:03:58 +01:00
Auxilor
b9f7d6db42 libreforge-updater 2022-10-09 15:02:04 +01:00
Will FP
f62476c1d4 Merge pull request #7 from badomensurvival/master
Job level placeholder
2022-10-09 14:50:32 +01:00
Will FP
ca25f78c60 Merge pull request #6 from 0ft3n/master
Fixed default builder.yml
2022-10-09 14:50:17 +01:00
devbaraus
765d7ee7e2 Job level placeholder 2022-10-09 10:26:34 -03:00
0ft3n
850e1ec888 Fixed default builder.yml 2022-10-09 01:26:47 +03:00
Auxilor
fe29bb611f libreforge-updater 2022-10-07 19:50:42 +01:00
Auxilor
87c8c6755a Updated to 1.14.1 2022-10-06 14:09:00 +01:00
Auxilor
964d668713 Added more default jobs 2022-10-06 14:08:52 +01:00
Auxilor
d8113c3819 libreforge-updater 2022-10-06 12:02:41 +01:00
Auxilor
2e655ffbb8 libreforge-updater 2022-10-04 15:52:50 +01:00
Auxilor
88a44777e1 libreforge-updater 2022-10-03 18:28:56 +01:00
Auxilor
bd7305fae1 libreforge-updater 2022-10-02 14:57:36 +01:00
Auxilor
25b78106ee libreforge-updater 2022-09-28 17:52:31 +01:00
Auxilor
1b75ba0098 Updated to 1.10.0 2022-09-28 12:41:01 +01:00
Auxilor
b4b235f1b5 Added custom GUI slots 2022-09-28 12:40:05 +01:00
Auxilor
c7ec273747 Updated to 1.9.0 2022-09-28 09:09:05 +01:00
Auxilor
9991f9b683 Added /jobs join and /jobs leave 2022-09-28 09:08:51 +01:00
Auxilor
921f086f49 libreforge-updater 2022-09-26 18:27:06 +01:00
Auxilor
b0c882dc21 libreforge-updater 2022-09-26 14:41:23 +01:00
Auxilor
59a528689d libreforge-updater 2022-09-26 10:51:36 +01:00
Auxilor
16be3a8b69 libreforge-updater 2022-09-22 17:30:04 +01:00
Auxilor
8e1200f293 Fixed version 2022-09-21 15:41:13 +01:00
Auxilor
301b4d35f3 libreforge-updater 2022-09-21 15:28:18 +01:00
Auxilor
ff84afdc7d libreforge-updater 2022-09-20 10:39:39 +01:00
Auxilor
0239447b61 libreforge-updater 2022-09-17 15:45:43 +01:00
Auxilor
8b0b2f861f libreforge-updater 2022-09-15 12:16:24 +01:00
33 changed files with 1378 additions and 396 deletions

View File

@@ -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.37.1'
implementation 'com.willfp:libreforge:3.101.0'
compileOnly 'com.willfp:eco:6.46.0'
implementation 'com.willfp:libreforge:3.126.0'
implementation 'com.willfp:ecomponent:1.0.0'
implementation 'org.joml:joml:1.10.4'
compileOnly 'org.jetbrains:annotations:23.0.0'

View File

@@ -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>

View File

@@ -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>

View File

@@ -7,10 +7,12 @@ 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.ecojobs.jobs.getJobLevel
import com.willfp.libreforge.LibReforgePlugin
import org.bukkit.event.Listener
@@ -28,10 +30,26 @@ class EcoJobsPlugin : LibReforgePlugin() {
"job"
) { it.activeJob?.name ?: "" }.register()
PlayerPlaceholder(
this,
"job_level"
) { it.activeJobLevel?.level?.toString() ?: "" }.register()
PlayerPlaceholder(
this,
"job_id"
) { it.activeJob?.id ?: "" }.register()
PlayerPlaceholder(
this,
"total_job_level"
) {
var level = 0
for (job in Jobs.values()) {
level += it.getJobLevel(job)
}
level.toString()
}.register()
}
override fun loadPluginCommands(): List<PluginCommand> {

View File

@@ -2,11 +2,9 @@ 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,

View File

@@ -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>) {

View File

@@ -7,7 +7,6 @@ import com.willfp.eco.util.savedDisplayName
import com.willfp.eco.util.toNiceString
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

View File

@@ -2,13 +2,56 @@ 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.ecojobs.jobs.JobsGUI
import org.bukkit.command.CommandSender
import com.willfp.ecojobs.jobs.hasJob
import org.bukkit.entity.Player
import org.bukkit.util.StringUtil
class CommandJobs(plugin: EcoPlugin) : PluginCommand(plugin, "jobs", "ecojobs.command.jobs", true) {
override fun onExecute(player: CommandSender, args: List<String>) {
player as Player
JobsGUI.open(player)
init {
this.addSubcommand(CommandJoin(plugin))
.addSubcommand(CommandLeave(plugin))
}
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()
}
}

View File

@@ -0,0 +1,69 @@
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.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
class CommandJoin(plugin: EcoPlugin) : Subcommand(plugin, "join", "ecojobs.command.join", true) {
override fun onExecute(player: CommandSender, args: List<String>) {
player as Player
if (args.isEmpty()) {
player.sendMessage(plugin.langYml.getMessage("needs-job"))
return
}
val id = args[0]
val job = Jobs.getByID(id)
if (job == null || !player.hasJob(job)) {
player.sendMessage(plugin.langYml.getMessage("invalid-job"))
return
}
if (player.activeJob == job) {
player.sendMessage(plugin.langYml.getMessage("job-already-joined"))
return
}
if (player.activeJob != null) {
player.sendMessage(plugin.langYml.getMessage("leave-current-job"))
return
}
player.sendMessage(
plugin.langYml.getMessage("joined-job", StringUtils.FormatOption.WITHOUT_PLACEHOLDERS)
.replace("%job%", job.name)
)
player.activeJob = job
}
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.hasJob(it) }.map { it.id }
}
if (args.size == 1) {
StringUtil.copyPartialMatches(
args[0],
Jobs.values().filter { sender.hasJob(it) }.map { it.id },
completions
)
return completions
}
return emptyList()
}
}

View File

@@ -0,0 +1,34 @@
package com.willfp.ecojobs.commands
import com.willfp.eco.core.EcoPlugin
import com.willfp.eco.core.command.impl.Subcommand
import com.willfp.ecojobs.jobs.activeJob
import org.bukkit.command.CommandSender
import org.bukkit.entity.Player
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) {
player.sendMessage(plugin.langYml.getMessage("no-job"))
return
}
val job = player.activeJob ?: return
player.activeJob = null
if (player.activeJob == null) {
player.sendMessage(
plugin.langYml.getMessage("left-job")
.replace("%job%", job.name)
)
} else {
player.sendMessage(
plugin.langYml.getMessage("cant-leave-job")
.replace("%job%", job.name)
)
}
}
}

View File

@@ -8,8 +8,6 @@ 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

View File

@@ -10,6 +10,8 @@ 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
@@ -28,7 +30,7 @@ import org.bukkit.Bukkit
import org.bukkit.OfflinePlayer
import org.bukkit.entity.Player
import org.bukkit.inventory.ItemStack
import java.util.*
import java.util.Objects
import java.util.concurrent.TimeUnit
import kotlin.math.abs
@@ -41,8 +43,16 @@ class Job(
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"),
@@ -62,6 +72,8 @@ 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>
@@ -171,6 +183,13 @@ class Job(
) {
it.getJobLevel(this).toString()
}.register()
PlayerPlaceholder(
plugin,
"${id}_total_players"
) {
Bukkit.getOfflinePlayers().count { it.activeJob == this }.toString()
}.register()
}
fun getLevel(level: Int): JobLevel = levels.get(level) {
@@ -240,6 +259,24 @@ class Job(
}
}
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 {
@@ -256,8 +293,8 @@ class Job(
.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))
.replace("%join_price%", this.joinPrice.getDisplay(player))
.replace("%leave_price%", this.leavePrice.getDisplay(player))
}
.toMutableList()
@@ -273,6 +310,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,7 +327,6 @@ class Job(
val base = baseItem.clone()
val level = player.getJobLevel(this)
val isActive = player.activeJob == this
return ItemStackBuilder(base)
.setDisplayName(
@@ -296,8 +336,11 @@ class Job(
)
.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")
when (player.activeJob) {
this -> plugin.configYml.getStrings("gui.job-icon.active-lore")
null -> plugin.configYml.getStrings("gui.job-icon.join-lore")
else -> emptyList()
}
}
.build()
}

View File

@@ -0,0 +1,85 @@
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 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.activeJob = null
if (player.activeJob == null) {
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)
}
}

View File

@@ -3,69 +3,71 @@ 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
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.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()
}
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
}
val pos = progressionOrder.indexOf(char)
if (pos == -1) {
continue
}
progressionSlots[pos + 1] = Pair(x, y)
}
}
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,
@@ -73,58 +75,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(
@@ -132,39 +87,32 @@ 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(
plugin.configYml.getInt("level-gui.progression-slots.close.location.row"),
plugin.configYml.getInt("level-gui.progression-slots.close.location.column"),
@@ -178,8 +126,18 @@ class JobLevelGUI(
}
}
)
for (config in plugin.configYml.getSubsections("level-gui.custom-slots")) {
setSlot(
config.getInt("row"),
config.getInt("column"),
ConfigSlot(config)
)
}
}
}
fun open(player: Player) = menu.open(player)
fun open(player: Player) {
menu.open(player)
}
}

View File

@@ -3,7 +3,9 @@ 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.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
@@ -55,14 +57,11 @@ object JobsGUI {
val jobInfoItemBuilder = { player: Player, _: Menu ->
val job = player.activeJob
if (job == null) {
ItemStackBuilder(Items.lookup(plugin.configYml.getString("gui.job-info.no-active.item")))
job?.getJobInfoIcon(player)
?: 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 ->
@@ -77,7 +76,7 @@ object JobsGUI {
}
return menu(plugin.configYml.getInt("gui.rows")) {
setTitle(plugin.langYml.getString("menu.title"))
title = plugin.langYml.getString("menu.title")
setMask(
FillerMask(
@@ -101,10 +100,6 @@ 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
@@ -116,8 +111,10 @@ object JobsGUI {
val job = unlockedJobs.getOrNull(pagedIndex) ?: return@onLeftClick
if (player.activeJob != job) {
if (player.activeJob == null) {
player.activeJob = job
} else {
player.sendMessage(plugin.langYml.getMessage("leave-current-job"))
}
player.playSound(
@@ -144,7 +141,7 @@ object JobsGUI {
val newPage = max(1, page - 1)
menu.addState(player, pageKey, newPage)
menu.setState(player, pageKey, newPage)
}
}
)
@@ -168,7 +165,7 @@ object JobsGUI {
val newPage = min(pages, page + 1)
menu.addState(player, pageKey, newPage)
menu.setState(player, pageKey, newPage)
}
}
)
@@ -191,12 +188,19 @@ object JobsGUI {
.setDisplayName(plugin.configYml.getString("gui.deactivate-job.name"))
.build()
) {
onLeftClick { event, _ ->
val player = event.whoClicked as Player
player.activeJob = null
onLeftClick { player, _, _, _ ->
player.activeJob?.leaveGUI?.open(player)
}
}
)
for (config in plugin.configYml.getSubsections("gui.custom-slots")) {
setSlot(
config.getInt("row"),
config.getInt("column"),
ConfigSlot(config)
)
}
}
}

View File

@@ -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) {
event.isCancelled = true
}
player.balance -= price
if (!price.canAfford(player)) {
event.isCancelled = true
return
}
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) {
event.isCancelled = true
}
player.balance -= price
if (!price.canAfford(player)) {
event.isCancelled = true
return
}
price.pay(player)
}
}

View File

@@ -78,11 +78,11 @@ gui:
active-lore:
- ""
- "&cThis job is already active!"
- "&cYou've already joined this job!"
not-active-lore:
join-lore:
- ""
- "&eClick to activate this job!"
- "&eClick to join this job!"
click:
sound: ui_button_click
@@ -116,6 +116,9 @@ gui:
row: 4
column: 2
# Custom GUI slots; see here for a how-to: https://plugins.auxilor.io/all-plugins/custom-gui-slots
custom-slots: [ ]
level-gui:
rows: 6
@@ -210,6 +213,56 @@ level-gui:
row: 6
column: 5
# Custom GUI slots; see here for a how-to: https://plugins.auxilor.io/all-plugins/custom-gui-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:
enabled: true
@@ -249,6 +302,13 @@ 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"
@@ -265,5 +325,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.

View File

@@ -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:

View 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=

View File

@@ -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

View File

@@ -0,0 +1,106 @@
name: "&#7A54FBEnchanter"
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=

View File

@@ -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: [ ]

View 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=

View 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=

View File

@@ -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

View File

@@ -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

View File

@@ -0,0 +1,106 @@
name: "&#4B4736Smelter"
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=

View 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: "&#0047b3Toolsmith"
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=

View File

@@ -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!"
@@ -20,6 +29,13 @@ messages:
unlocked-job: "&fSuccessfully unlocked the %job%&f job for %player%!"
cannot-spawn-job: "&cYou already have this job unlocked!"
invalid-amount: "&cInvalid amount!"
no-job: "&cYou don't have a job!"
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!"
leave-current-job: "&cYou must leave your current job before joining a new one!"
cant-leave-job: "&cYou can't leave the %job%&f job!"
dont-have-job: "&cYou don't have this job unlocked!"
menu:
title: "Jobs"

View 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>.

View File

@@ -49,7 +49,11 @@ permissions:
ecojobs.command.jobs: true
ecojobs.command.unlock: true
ecojobs.command.givexp: true
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
@@ -69,6 +73,18 @@ 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
ecojobs.command.leave:
description: Allows the use of /jobs leave.
default: true
ecojobs.xpmultiplier.50percent:
description: Gives the player 50% more job experience

View File

@@ -1,4 +1,4 @@
#libreforge-updater
#Thu Sep 15 12:10:05 BST 2022
version=1.5.0
#Fri Dec 09 17:00:49 GMT 2022
version=1.32.0
plugin-name=EcoJobs

0
gradlew vendored Normal file → Executable file
View File