diff --git a/build.gradle b/build.gradle deleted file mode 100644 index e22eec3..0000000 --- a/build.gradle +++ /dev/null @@ -1,123 +0,0 @@ -buildscript { - repositories { - mavenCentral() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10" - } -} - -plugins { - id 'java-library' - id 'com.github.johnrengelman.shadow' version '7.0.0' - id 'maven-publish' - id 'java' -} - -dependencies { - implementation project(":eco-core").getSubprojects() -} - -allprojects { - apply plugin: 'java' - apply plugin: 'kotlin' - apply plugin: 'maven-publish' - apply plugin: 'com.github.johnrengelman.shadow' - - repositories { - mavenCentral() - mavenLocal() - maven { url 'https://jitpack.io' } - maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' } - maven { url 'https://repo.codemc.org/repository/nms/' } - maven { url 'https://repo.codemc.io/repository/maven-public/' } - maven { url 'https://repo.dmulloy2.net/repository/public/' } - maven { url 'https://repo.essentialsx.net/releases/' } - } - - jar { - onlyIf { !sourceSets.main.allSource.files.isEmpty() } - } - - 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.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' - - compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.7.10' - } - - tasks.withType(JavaCompile) { - options.deprecation = true - options.encoding = 'UTF-8' - } - - processResources { - filesNotMatching(["**/*.png", "**/models/**", "**/textures/**", "**/jobs/**", "**lang.yml"]) { - expand projectVersion: project.version - } - } - - tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) { - kotlinOptions { - jvmTarget = "17" - freeCompilerArgs = ['-Xjvm-default=all'] - } - } - - java.sourceCompatibility = JavaVersion.VERSION_17 - java.targetCompatibility = JavaVersion.VERSION_17 - - compileJava.options.encoding = 'UTF-8' - compileJava.dependsOn clean - - build.dependsOn shadowJar -} - -tasks.withType(Jar) { - destinationDirectory = file("$rootDir/bin/") -} - -clean.doLast { - file("${rootDir}/bin").deleteDir() -} - -shadowJar { - archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + ".jar" -} - -jar { - archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + " " + "unshaded" + ".jar" -} - -group = 'com.willfp' -archivesBaseName = project.name -version = findProperty("version") - -compileJava.options.encoding = 'UTF-8' - - -build.dependsOn shadowJar -build.dependsOn publishToMavenLocal - -task buyThePlugins { - dependsOn subprojects.build - - doLast { - println 'If you like the plugin, please consider buying it on Spigot or Polymart!' - println 'Spigot: https://www.spigotmc.org/resources/authors/auxilor.507394/' - println 'Polymart: https://polymart.org/user/auxilor.1107/' - println 'Buying gives you access to support and the plugin auto-updater, and it allows me to keep developing plugins.' - } -} -build.finalizedBy buyThePlugins diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..ce7b3d5 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,82 @@ +plugins { + java + `java-library` + `maven-publish` + kotlin("jvm") version "1.7.10" + id("com.github.johnrengelman.shadow") version "8.0.0" + id("com.willfp.libreforge.gradle") version "1.0.0" +} + +group = "com.willfp" +version = findProperty("version")!! +val libreforgeVersion = findProperty("libreforge-version") + +base { + archivesName.set(project.name) +} + +dependencies { + project(":eco-core").dependencyProject.subprojects { + implementation(this) + } +} + +allprojects { + apply(plugin = "java") + apply(plugin = "kotlin") + apply(plugin = "maven-publish") + apply(plugin = "com.github.johnrengelman.shadow") + + repositories { + mavenLocal() + mavenCentral() + + maven("https://repo.papermc.io/repository/maven-public/") + maven("https://jitpack.io") + } + + dependencies { + compileOnly("com.willfp:eco:6.53.0") + compileOnly("org.jetbrains:annotations:23.0.0") + compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.7.10") + } + + java { + withSourcesJar() + toolchain.languageVersion.set(JavaLanguageVersion.of(17)) + } + + tasks { + shadowJar { + relocate("com.willfp.libreforge.loader", "com.willfp.ecopets.libreforge.loader") + relocate("com.willfp.ecomponent", "com.willfp.ecopets.ecomponent") + } + + compileKotlin { + kotlinOptions { + jvmTarget = "17" + } + } + + compileJava { + options.isDeprecation = true + options.encoding = "UTF-8" + + dependsOn(clean) + } + + processResources { + filesMatching(listOf("**plugin.yml", "**eco.yml")) { + expand( + "version" to project.version, + "libreforgeVersion" to libreforgeVersion, + "pluginName" to rootProject.name + ) + } + } + + build { + dependsOn(shadowJar) + } + } +} diff --git a/eco-core/build.gradle b/eco-core/build.gradle deleted file mode 100644 index 2f7415f..0000000 --- a/eco-core/build.gradle +++ /dev/null @@ -1,2 +0,0 @@ -group 'com.willfp' -version rootProject.version diff --git a/eco-core/build.gradle.kts b/eco-core/build.gradle.kts new file mode 100644 index 0000000..5f8f296 --- /dev/null +++ b/eco-core/build.gradle.kts @@ -0,0 +1,2 @@ +group = "com.willfp" +version = rootProject.version diff --git a/eco-core/core-plugin/build.gradle b/eco-core/core-plugin/build.gradle deleted file mode 100644 index be19ded..0000000 --- a/eco-core/core-plugin/build.gradle +++ /dev/null @@ -1,20 +0,0 @@ -group 'com.willfp' -version rootProject.version - -dependencies { - compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT' - compileOnly 'com.comphenix.protocol:ProtocolLib:4.7.0' - compileOnly 'net.kyori:adventure-api:4.10.1' - compileOnly 'net.essentialsx:EssentialsX:2.19.0' - compileOnly 'com.github.ben-manes.caffeine:caffeine:3.0.6' -} - -build.dependsOn publishToMavenLocal - -publishing { - publications { - maven(MavenPublication) { - from(components.java) - } - } -} diff --git a/eco-core/core-plugin/build.gradle.kts b/eco-core/core-plugin/build.gradle.kts new file mode 100644 index 0000000..bb8f8d2 --- /dev/null +++ b/eco-core/core-plugin/build.gradle.kts @@ -0,0 +1,22 @@ +group = "com.willfp" +version = rootProject.version + +dependencies { + compileOnly("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT") + compileOnly("com.github.ben-manes.caffeine:caffeine:3.0.5") + compileOnly("com.willfp:ecomponent:1.3.0") +} + +publishing { + publications { + register("maven", MavenPublication::class) { + from(components["java"]) + } + } +} + +tasks { + build { + dependsOn(publishToMavenLocal) + } +} diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/EcoJobsPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/EcoJobsPlugin.kt index 3e5eb1a..928cefe 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/EcoJobsPlugin.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/EcoJobsPlugin.kt @@ -8,28 +8,36 @@ 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.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.libreforge.LibReforgePlugin +import com.willfp.libreforge.SimpleProvidedHolder +import com.willfp.libreforge.loader.LibreforgePlugin +import com.willfp.libreforge.loader.configs.ConfigCategory +import com.willfp.libreforge.registerHolderProvider import org.bukkit.event.Listener import java.util.regex.Pattern -class EcoJobsPlugin : LibReforgePlugin() { +class EcoJobsPlugin : LibreforgePlugin() { init { instance = this registerHolderProvider { player -> - player.activeJobs.map { it.getLevel(player.getJobLevel(it)) } + player.activeJobs.map { it.getLevel(player.getJobLevel(it)) }.map { + SimpleProvidedHolder(it) + } } } - override fun handleEnableAdditional() { - this.copyConfigs("jobs") + override fun loadConfigCategories(): List { + return listOf( + Jobs + ) + } + override fun handleEnable() { PlayerPlaceholder( this, "limit" @@ -62,11 +70,13 @@ class EcoJobsPlugin : LibReforgePlugin() { 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) { + 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() @@ -74,7 +84,7 @@ class EcoJobsPlugin : LibReforgePlugin() { override fun loadPluginCommands(): List { return listOf( - CommandEcojobs(this), + CommandEcoJobs(this), CommandJobs(this) ) } @@ -82,7 +92,6 @@ class EcoJobsPlugin : LibReforgePlugin() { override fun loadListeners(): List { return listOf( JobLevelListener(this), - JobTriggerXPGainListener, ResetOnQuitListener, PriceHandler ) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/commands/CommandEcoJobs.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/commands/CommandEcoJobs.kt new file mode 100644 index 0000000..a59dd50 --- /dev/null +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/commands/CommandEcoJobs.kt @@ -0,0 +1,20 @@ +package com.willfp.ecojobs.commands + +import com.willfp.eco.core.EcoPlugin +import com.willfp.eco.core.command.impl.PluginCommand +import org.bukkit.command.CommandSender + +class CommandEcoJobs(plugin: EcoPlugin) : PluginCommand(plugin, "ecojobs", "ecojobs.command.ecojobs", false) { + init { + this.addSubcommand(CommandReload(plugin)) + .addSubcommand(CommandUnlock(plugin)) + .addSubcommand(CommandGiveXP(plugin)) + .addSubcommand(CommandReset(plugin)) + } + + override fun onExecute(sender: CommandSender, args: List) { + sender.sendMessage( + plugin.langYml.getMessage("invalid-command") + ) + } +} diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/commands/CommandEcojobs.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/commands/CommandEcojobs.kt deleted file mode 100644 index 72edd3e..0000000 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/commands/CommandEcojobs.kt +++ /dev/null @@ -1,34 +0,0 @@ -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: 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) { - sender.sendMessage( - plugin.langYml.getMessage("invalid-command") - ) - } -} diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/Job.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/Job.kt index 4af2b05..775628d 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/Job.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/Job.kt @@ -4,7 +4,6 @@ import com.github.benmanes.caffeine.cache.Caffeine import com.willfp.eco.core.config.interfaces.Config 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.eco.core.items.Items import com.willfp.eco.core.items.builder.ItemStackBuilder import com.willfp.eco.core.placeholder.PlayerPlaceholder @@ -12,42 +11,39 @@ 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.core.registry.Registrable 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.ViolationContext +import com.willfp.libreforge.conditions.ConditionList import com.willfp.libreforge.conditions.Conditions -import com.willfp.libreforge.conditions.ConfiguredCondition -import com.willfp.libreforge.effects.ConfiguredEffect +import com.willfp.libreforge.counters.Counters +import com.willfp.libreforge.effects.EffectList import com.willfp.libreforge.effects.Effects -import com.willfp.libreforge.events.TriggerPreProcessEvent -import com.willfp.libreforge.triggers.Counters import org.bukkit.Bukkit import org.bukkit.OfflinePlayer import org.bukkit.entity.Player import org.bukkit.inventory.ItemStack 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 +) : Registrable { private val topCache = Caffeine.newBuilder() .expireAfterWrite(Duration.ofSeconds(plugin.configYml.getInt("leaderboard-cache-lifetime").toLong())) .build() @@ -85,8 +81,8 @@ class Job( private val baseItem: ItemStack = Items.lookup(config.getString("icon")).item - private val effects: Set - private val conditions: Set + private val effects: EffectList + private val conditions: ConditionList private val levels = Caffeine.newBuilder().build() private val effectsDescription = Caffeine.newBuilder().build>() @@ -106,7 +102,7 @@ class Job( } private val jobXpGains = config.getSubsections("xp-gain-methods").mapNotNull { - Counters.compile(it, "Job $id") + Counters.compile(it, ViolationContext(plugin, "Job $id")) } init { @@ -116,13 +112,15 @@ class Job( p.getJobLevel(this).toString() }) - effects = config.getSubsections("effects").mapNotNull { - Effects.compile(it, "Job $id") - }.toSet() + effects = Effects.compile( + config.getSubsections("effects"), + ViolationContext(plugin, "Job $id") + ) - conditions = config.getSubsections("conditions").mapNotNull { - Conditions.compile(it, "Job $id") - }.toSet() + conditions = Conditions.compile( + config.getSubsections("conditions"), + ViolationContext(plugin, "Job $id") + ) for (string in config.getStrings("level-commands")) { val split = string.split(":") @@ -192,8 +190,16 @@ class Job( }.register() } + override fun onRegister() { + jobXpGains.forEach { it.bind(JobXPAccumulator(this)) } + } + + override fun onRemove() { + jobXpGains.forEach { it.unbind() } + } + fun getLevel(level: Int): JobLevel = levels.get(level) { - JobLevel(this, it, effects, conditions) + JobLevel(plugin, this, it, effects, conditions) } private fun getLevelUpMessages(level: Int, whitespace: Int = 0): List = levelUpMessages.get(level) { @@ -334,7 +340,8 @@ class Job( val base = baseItem.clone() return ItemStackBuilder(base).setDisplayName( plugin.configYml.getFormattedString("gui.job-info.active.name") - .replace("%level%", player.getJobLevel(this).toString()).replace("%level_numeral%", NumberUtils.toNumeral(player.getJobLevel(this))).replace("%job%", this.name) + .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() @@ -356,18 +363,18 @@ class Job( } } - fun getXP(event: TriggerPreProcessEvent): Double { - 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 + val target = players.getOrNull(place - 1) ?: return@get null return@get LeaderboardCacheEntry(target, target.getJobLevel(this)) } } + override fun getID(): String { + return this.id + } + override fun equals(other: Any?): Boolean { if (other !is Job) { return false diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/JobLevel.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/JobLevel.kt index d87e027..01584b4 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/JobLevel.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/JobLevel.kt @@ -1,14 +1,16 @@ package com.willfp.ecojobs.jobs +import com.willfp.eco.core.EcoPlugin import com.willfp.libreforge.Holder -import com.willfp.libreforge.conditions.ConfiguredCondition -import com.willfp.libreforge.effects.ConfiguredEffect +import com.willfp.libreforge.conditions.ConditionList +import com.willfp.libreforge.effects.EffectList class JobLevel( + plugin: EcoPlugin, val job: Job, val level: Int, - override val effects: Set, - override val conditions: Set -): Holder { - override val id = "${job.id}_$level" + override val effects: EffectList, + override val conditions: ConditionList +) : Holder { + override val id = plugin.createNamespacedKey("${job.id}_$level") } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/JobTriggerXPGainListener.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/JobTriggerXPGainListener.kt deleted file mode 100644 index 6c4ea45..0000000 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/JobTriggerXPGainListener.kt +++ /dev/null @@ -1,26 +0,0 @@ -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 - -object JobTriggerXPGainListener : Listener { - @EventHandler(ignoreCancelled = true) - fun handle(event: TriggerPreProcessEvent) { - val player = event.player - - val jobs = event.player.activeJobs - - for (job in jobs) { - val amount = job.getXP(event) - - if (amount <= 0.0) { - continue - } - - player.giveJobExperience(job, amount) - } - } -} diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/JobXPAccumulator.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/JobXPAccumulator.kt new file mode 100644 index 0000000..01d7f6d --- /dev/null +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/JobXPAccumulator.kt @@ -0,0 +1,13 @@ +package com.willfp.ecojobs.jobs + +import com.willfp.ecojobs.api.giveJobExperience +import com.willfp.libreforge.counters.Accumulator +import org.bukkit.entity.Player + +class JobXPAccumulator( + private val job: Job +) : Accumulator { + override fun accept(player: Player, count: Double) { + player.giveJobExperience(job, count) + } +} diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/Jobs.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/Jobs.kt index 320354b..b907d67 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/Jobs.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/Jobs.kt @@ -1,15 +1,17 @@ package com.willfp.ecojobs.jobs -import com.google.common.collect.BiMap -import com.google.common.collect.HashBiMap import com.google.common.collect.ImmutableList +import com.willfp.eco.core.config.interfaces.Config import com.willfp.eco.core.config.updating.ConfigUpdater +import com.willfp.eco.core.registry.Registry import com.willfp.ecojobs.EcoJobsPlugin import com.willfp.ecojobs.api.getJobLevel +import com.willfp.libreforge.loader.LibreforgePlugin +import com.willfp.libreforge.loader.configs.ConfigCategory import org.bukkit.OfflinePlayer -object Jobs { - private val BY_ID: BiMap = HashBiMap.create() +object Jobs : ConfigCategory("job", "jobs") { + private val registry = Registry() /** * Get all registered [Job]s. @@ -18,7 +20,7 @@ object Jobs { */ @JvmStatic fun values(): List { - return ImmutableList.copyOf(BY_ID.values) + return ImmutableList.copyOf(registry.values()) } /** @@ -29,45 +31,15 @@ object Jobs { */ @JvmStatic fun getByID(name: String): Job? { - return BY_ID[name] + return registry[name] } - /** - * Update all [Job]s. - * - * @param plugin Instance of EcoJobs. - */ - @ConfigUpdater - @JvmStatic - fun update(plugin: EcoJobsPlugin) { - for (job in values()) { - removeJob(job) - } - - for ((id, jobConfig) in plugin.fetchConfigs("jobs")) { - addNewJob(Job(id, jobConfig, plugin)) - } + override fun clear(plugin: LibreforgePlugin) { + registry.clear() } - /** - * Add new [Job] to EcoJobs. - * - * @param job The [Job] to add. - */ - @JvmStatic - fun addNewJob(job: Job) { - BY_ID.remove(job.id) - BY_ID[job.id] = job - } - - /** - * Remove [Job] from EcoJobs. - * - * @param job The [Job] to remove. - */ - @JvmStatic - fun removeJob(job: Job) { - BY_ID.remove(job.id) + override fun acceptConfig(plugin: LibreforgePlugin, id: String, config: Config) { + registry.register(Job(id, config, plugin as EcoJobsPlugin)) } /** diff --git a/eco-core/core-plugin/src/main/resources/chains.yml b/eco-core/core-plugin/src/main/resources/chains.yml deleted file mode 100644 index e882918..0000000 --- a/eco-core/core-plugin/src/main/resources/chains.yml +++ /dev/null @@ -1,21 +0,0 @@ -# Read more about chains: https://plugins.auxilor.io/effects/configuring-an-effect#effect-chains - -chains: - - id: example_chain - effects: - - id: teleport - - id: potion_effect - args: - effect: blindness - level: 3 - duration: 30 - apply_to_player: true - - id: send_message - args: - message: "&fYou have been teleported!" - action_bar: true - - id: play_sound - args: - sound: entity_dragon_fireball_explode - pitch: 1.5 - volume: 4 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/config.yml b/eco-core/core-plugin/src/main/resources/config.yml index ae6b936..909f1a0 100644 --- a/eco-core/core-plugin/src/main/resources/config.yml +++ b/eco-core/core-plugin/src/main/resources/config.yml @@ -278,49 +278,3 @@ level-up: id: entity_player_levelup # Pitch between 0.5 and 2 pitch: 1.3 - -cannot-afford: - in-actionbar: true - sound: - enabled: true - sound: "BLOCK_NOTE_BLOCK_PLING" - pitch: 0.5 - -cooldown: - in-actionbar: true - sound: - enabled: true - sound: "BLOCK_NOTE_BLOCK_PLING" - pitch: 0.5 - -cannot-afford-type: - in-actionbar: true - sound: - enabled: true - 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: - permanent: true - triggered: true - ambient: - permanent: false - triggered: true - particles: - permanent: false - triggered: true \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/eco.yml b/eco-core/core-plugin/src/main/resources/eco.yml index 88887b8..77aaeaf 100644 --- a/eco-core/core-plugin/src/main/resources/eco.yml +++ b/eco-core/core-plugin/src/main/resources/eco.yml @@ -1,3 +1,8 @@ -resource-id: 2857 -bstats-id: 16394 -color: "τB00" \ No newline at end of file +environment: + - name: libreforge version + value: ${libreforgeVersion} + +options: + resource-id: 2857 + bstats-id: 16394 + color: "τB00" diff --git a/eco-core/core-plugin/src/main/resources/lang.yml b/eco-core/core-plugin/src/main/resources/lang.yml index 95ae2bf..65a5e26 100644 --- a/eco-core/core-plugin/src/main/resources/lang.yml +++ b/eco-core/core-plugin/src/main/resources/lang.yml @@ -4,18 +4,6 @@ messages: not-player: "&cThis command must be run by a player" invalid-command: "&cUnknown subcommand!" 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!" diff --git a/eco-core/core-plugin/src/main/resources/lrcdb.yml b/eco-core/core-plugin/src/main/resources/lrcdb.yml deleted file mode 100644 index bd9b840..0000000 --- a/eco-core/core-plugin/src/main/resources/lrcdb.yml +++ /dev/null @@ -1,19 +0,0 @@ -# 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 . \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/paper-plugin.yml b/eco-core/core-plugin/src/main/resources/paper-plugin.yml new file mode 100644 index 0000000..8516707 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/paper-plugin.yml @@ -0,0 +1,17 @@ +name: ${pluginName} +version: ${version} +main: com.willfp.ecopets.EcoPetsPlugin +api-version: 1.19 + +dependencies: + - name: eco + required: true + bootstrap: false + + - name: libreforge + required: false + bootstrap: false + +load-after: + - name: eco + bootstrap: false diff --git a/eco-core/core-plugin/src/main/resources/plugin.yml b/eco-core/core-plugin/src/main/resources/plugin.yml index a1c47ac..2f953df 100644 --- a/eco-core/core-plugin/src/main/resources/plugin.yml +++ b/eco-core/core-plugin/src/main/resources/plugin.yml @@ -1,25 +1,13 @@ -name: EcoJobs -version: ${projectVersion} -main: com.willfp.ecojobs.EcoJobsPlugin +name: ${pluginName} +version: ${version} +main: com.willfp.ecopets.EcoPetsPlugin api-version: 1.17 authors: [ Auxilor ] website: willfp.com depend: - eco softdepend: - - AureliumSkills - - Vault - - mcMMO - - Jobs - - TMMobcoins - - EcoEnchants - - EcoBosses - - Talismans - - EcoArmor - - EcoItems - - Boosters - - EcoSkills - - Reforges + - libreforge commands: ecojobs: description: Base Command @@ -49,8 +37,6 @@ 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 @@ -70,12 +56,6 @@ 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 diff --git a/gradle.properties b/gradle.properties index faaaacb..102e5d4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,5 @@ #libreforge-updater -#Mon Mar 13 13:38:53 GMT 2023 -version=2.1.5 -plugin-name=EcoJobs +#Mon Mar 13 13:39:16 GMT 2023 +kotlin.code.style=official +libreforge-version=4.0.0 +version=3.0.0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..41d9927 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e750102..e1bef7e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index c6beebd..0000000 --- a/settings.gradle +++ /dev/null @@ -1,5 +0,0 @@ -rootProject.name = 'EcoJobs' - -// Core -include ':eco-core' -include ':eco-core:core-plugin' diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..9713e8a --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,14 @@ +pluginManagement { + repositories { + gradlePluginPortal() + mavenLocal() + maven("https://repo.jpenilla.xyz/snapshots/") + maven("https://jitpack.io") + } +} + +rootProject.name = "EcoJobs" + +// Core +include(":eco-core") +include(":eco-core:core-plugin")