libreforge-updater

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @WillFP

.github/workflows/publish-release.yml

@@ -15,11 +15,11 @@ jobs:
       - name: Checkout latest code
         uses: actions/checkout@v2
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Change wrapper permissions
         run: chmod +x ./gradlew

build.gradle.kts

@@ -2,8 +2,8 @@ plugins {
     java
     `java-library`
     `maven-publish`
-    kotlin("jvm") version "1.7.10"
-    id("com.github.johnrengelman.shadow") version "8.0.0"
+    kotlin("jvm") version "1.9.20"
+    id("io.github.goooler.shadow") version "8.1.7"
     id("com.willfp.libreforge-gradle-plugin") version "1.0.0"
 }
 
@@ -25,7 +25,7 @@ allprojects {
     apply(plugin = "java")
     apply(plugin = "kotlin")
     apply(plugin = "maven-publish")
-    apply(plugin = "com.github.johnrengelman.shadow")
+    apply(plugin = "io.github.goooler.shadow")
 
     repositories {
         mavenLocal()
@@ -39,7 +39,7 @@ allprojects {
     dependencies {
         compileOnly("com.willfp:eco:6.55.0")
         compileOnly("org.jetbrains:annotations:23.0.0")
-        compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.7.10")
+        compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.9.20")
     }
 
     java {

eco-core/core-plugin/build.gradle.kts

@@ -10,9 +10,12 @@ dependencies {
 
 publishing {
     publications {
-        register("maven", MavenPublication::class) {
-            from(components["java"])
+        register<MavenPublication>("maven") {
+            groupId = project.group.toString()
+            version = project.version.toString()
             artifactId = rootProject.name
+
+            artifact(rootProject.tasks.shadowJar.get().archiveFile)
         }
     }
 

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/EcoJobsPlugin.kt

@@ -30,7 +30,9 @@ import com.willfp.libreforge.filters.Filters
 import com.willfp.libreforge.loader.LibreforgePlugin
 import com.willfp.libreforge.loader.configs.ConfigCategory
 import com.willfp.libreforge.registerHolderProvider
+import com.willfp.libreforge.registerSpecificHolderProvider
 import com.willfp.libreforge.triggers.Triggers
+import org.bukkit.entity.Player
 import org.bukkit.event.Listener
 import java.util.regex.Pattern
 
@@ -56,7 +58,7 @@ class EcoJobsPlugin : LibreforgePlugin() {
         Triggers.register(TriggerLeaveJob)
         Filters.register(FilterJob)
         
-        registerHolderProvider { player ->
+        registerSpecificHolderProvider<Player> { player ->
             player.activeJobs.map { it.getLevel(player.getJobLevel(it)) }.map {
                 SimpleProvidedHolder(it)
             }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/JobLevelGUI.kt

@@ -13,6 +13,7 @@ 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 com.willfp.eco.util.formatEco
 import com.willfp.ecojobs.api.getJobLevel
 import com.willfp.ecomponent.components.LevelComponent
 import com.willfp.ecomponent.components.LevelState
@@ -65,7 +66,9 @@ class JobLevelGUI(
         }
 
         menu = menu(plugin.configYml.getInt("level-gui.rows")) {
-            title = job.name
+            title = plugin.configYml.getString("level-gui.title")
+                .replace("%job%", job.name)
+                .formatEco()
 
             maxPages(component.pages)
 

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/libreforge/ConditionHasActiveJob.kt

@@ -2,9 +2,12 @@ package com.willfp.ecojobs.libreforge
 
 import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.ecojobs.api.activeJobs
+import com.willfp.libreforge.Dispatcher
 import com.willfp.libreforge.NoCompileData
+import com.willfp.libreforge.ProvidedHolder
 import com.willfp.libreforge.arguments
 import com.willfp.libreforge.conditions.Condition
+import com.willfp.libreforge.get
 import org.bukkit.entity.Player
 
 object ConditionHasActiveJob : Condition<NoCompileData>("has_active_job") {
@@ -12,7 +15,14 @@ object ConditionHasActiveJob : Condition<NoCompileData>("has_active_job") {
         require("job", "You must specify the job!")
     }
 
-    override fun isMet(player: Player, config: Config, compileData: NoCompileData): Boolean {
+    override fun isMet(
+        dispatcher: Dispatcher<*>,
+        config: Config,
+        holder: ProvidedHolder,
+        compileData: NoCompileData
+    ): Boolean {
+        val player = dispatcher.get<Player>() ?: return false
+
         return player.activeJobs.any { it.id == config.getString("job").lowercase() }
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/libreforge/ConditionHasJobLevel.kt

@@ -4,9 +4,13 @@ import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.ecojobs.api.event.PlayerJobLevelUpEvent
 import com.willfp.ecojobs.api.getJobLevel
 import com.willfp.ecojobs.jobs.Jobs
+import com.willfp.libreforge.Dispatcher
 import com.willfp.libreforge.NoCompileData
+import com.willfp.libreforge.ProvidedHolder
 import com.willfp.libreforge.arguments
 import com.willfp.libreforge.conditions.Condition
+import com.willfp.libreforge.get
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.updateEffects
 import org.bukkit.entity.Player
 import org.bukkit.event.EventHandler
@@ -18,7 +22,14 @@ object ConditionHasJobLevel : Condition<NoCompileData>("has_job_level") {
         require("level", "You must specify the level!")
     }
 
-    override fun isMet(player: Player, config: Config, compileData: NoCompileData): Boolean {
+    override fun isMet(
+        dispatcher: Dispatcher<*>,
+        config: Config,
+        holder: ProvidedHolder,
+        compileData: NoCompileData
+    ): Boolean {
+        val player = dispatcher.get<Player>() ?: return false
+
         return player.getJobLevel(
             Jobs.getByID(config.getString("job").lowercase()) ?: return false
         ) >= config.getIntFromExpression("level", player)
@@ -26,6 +37,6 @@ object ConditionHasJobLevel : Condition<NoCompileData>("has_job_level") {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     fun handle(event: PlayerJobLevelUpEvent) {
-        event.player.updateEffects()
+        event.player.toDispatcher().updateEffects()
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/libreforge/EffectJobXpMultiplier.kt

@@ -4,6 +4,7 @@ import com.willfp.ecojobs.api.event.PlayerJobExpGainEvent
 import com.willfp.ecojobs.jobs.Job
 import com.willfp.ecojobs.jobs.Jobs
 import com.willfp.libreforge.effects.templates.MultiMultiplierEffect
+import com.willfp.libreforge.toDispatcher
 import org.bukkit.event.EventHandler
 
 object EffectJobXpMultiplier : MultiMultiplierEffect<Job>("job_xp_multiplier") {
@@ -19,6 +20,6 @@ object EffectJobXpMultiplier : MultiMultiplierEffect<Job>("job_xp_multiplier") {
 
     @EventHandler(ignoreCancelled = true)
     fun handle(event: PlayerJobExpGainEvent) {
-        event.amount *= getMultiplier(event.player, event.job)
+        event.amount *= getMultiplier(event.player.toDispatcher(), event.job)
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/libreforge/TriggerGainJobXp.kt

@@ -1,6 +1,7 @@
 package com.willfp.ecojobs.libreforge
 
 import com.willfp.ecojobs.api.event.PlayerJobExpGainEvent
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.triggers.Trigger
 import com.willfp.libreforge.triggers.TriggerData
 import com.willfp.libreforge.triggers.TriggerParameter
@@ -18,7 +19,7 @@ object TriggerGainJobXp : Trigger("gain_job_xp") {
         val player = event.player
 
         this.dispatch(
-            player,
+            player.toDispatcher(),
             TriggerData(
                 player = player,
                 location = player.location,

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/libreforge/TriggerJoinJob.kt

@@ -2,6 +2,7 @@ package com.willfp.ecojobs.libreforge
 
 import com.willfp.ecojobs.api.event.PlayerJobJoinEvent
 import com.willfp.ecojobs.api.getJobLevel
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.triggers.Trigger
 import com.willfp.libreforge.triggers.TriggerData
 import com.willfp.libreforge.triggers.TriggerParameter
@@ -20,7 +21,7 @@ object TriggerJoinJob : Trigger("join_job") {
         val player = event.player as? Player ?: return
 
         this.dispatch(
-            player,
+            player.toDispatcher(),
             TriggerData(
                 player = player,
                 location = player.location,

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/libreforge/TriggerLeaveJob.kt

@@ -2,6 +2,7 @@ package com.willfp.ecojobs.libreforge
 
 import com.willfp.ecojobs.api.event.PlayerJobLeaveEvent
 import com.willfp.ecojobs.api.getJobLevel
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.triggers.Trigger
 import com.willfp.libreforge.triggers.TriggerData
 import com.willfp.libreforge.triggers.TriggerParameter
@@ -19,7 +20,7 @@ object TriggerLeaveJob : Trigger("leave_job") {
         val player = event.player as? Player ?: return
 
         this.dispatch(
-            player,
+            player.toDispatcher(),
             TriggerData(
                 player = player,
                 location = player.location,

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/libreforge/TriggerLevelUpJob.kt

@@ -1,6 +1,7 @@
 package com.willfp.ecojobs.libreforge
 
 import com.willfp.ecojobs.api.event.PlayerJobLevelUpEvent
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.triggers.Trigger
 import com.willfp.libreforge.triggers.TriggerData
 import com.willfp.libreforge.triggers.TriggerParameter
@@ -18,7 +19,7 @@ object TriggerLevelUpJob : Trigger("level_up_job") {
         val player = event.player
 
         this.dispatch(
-            player,
+            player.toDispatcher(),
             TriggerData(
                 player = player,
                 location = player.location,

eco-core/core-plugin/src/main/resources/config.yml

@@ -3,6 +3,11 @@
 # by Auxilor
 #
 
+# Even if eco is set up to use a database, you can
+# force EcoJobs to save to local storage to disable
+# cross-server sync.
+use-local-storage: false
+
 jobs:
   limit: 3 # The most jobs a player can have at once.
   # You can set custom limits with the ecojobs.limit.<number> permission
@@ -119,6 +124,7 @@ gui:
 
 level-gui:
   rows: 6
+  title: "%job%"
 
   mask:
     # The way the mask works is by having a list of materials

eco-core/core-plugin/src/main/resources/paper-plugin.yml

@@ -1,75 +0,0 @@
-name: ${pluginName}
-version: ${version}
-main: com.willfp.ecojobs.EcoJobsPlugin
-api-version: 1.19
-
-dependencies:
-  - name: eco
-    required: true
-    bootstrap: false
-
-  - name: libreforge
-    required: false
-    bootstrap: false
-
-load-after:
-  - name: eco
-    bootstrap: false
-
-
-permissions:
-  ecojobs.*:
-    description: All EcoJobs permissions
-    default: op
-    children:
-      ecojobs.command.*: true
-  ecojobs.command.*:
-    description: All commands
-    default: op
-    children:
-      ecojobs.command.ecojobs: true
-      ecojobs.command.reload: true
-      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.reload:
-    description: Allows reloading the config
-    default: op
-  ecojobs.command.ecojobs:
-    description: Allows the use of /ecojobs.
-    default: true
-  ecojobs.command.jobs:
-    description: Allows the use of /jobs.
-    default: true
-  ecojobs.command.unlock:
-    description: Allows the use of /ecojobs unlock.
-    default: op
-  ecojobs.command.givexp:
-    description: Allows the use of /ecojobs givexp.
-    default: op
-  ecojobs.command.reset:
-    description: Allows the use of /ecojobs reset.
-    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
-    default: false
-  ecojobs.xpmultiplier.double:
-    description: Gives the player 2x job experience
-    default: false
-  ecojobs.xpmultiplier.triple:
-    description: Gives the player 3x job experience
-    default: false
-  ecojobs.xpmultiplier.quadruple:
-    description: Gives the player 4x job experience
-    default: false

gradle.properties

@@ -1,5 +1,5 @@
 #libreforge-updater
-#Tue Apr 25 13:12:41 BST 2023
+#Fri Jul 19 20:28:24 BST 2024
 kotlin.code.style=official
-libreforge-version=4.5.0
-version=3.5.0
+libreforge-version=4.68.0
+version=3.66.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

jitpack.yml

@@ -1,6 +0,0 @@
-jdk: openjdk17
-before_install:
-  - source "$HOME/.sdkman/bin/sdkman-init.sh"
-  - sdk update
-  - sdk install java 17.0.1-tem
-  - sdk use java 17.0.1-tem

settings.gradle.kts

@@ -2,11 +2,15 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         mavenLocal()
-        maven("https://repo.jpenilla.xyz/snapshots/")
         maven("https://repo.auxilor.io/repository/maven-public/")
+        maven("https://repo.papermc.io/repository/maven-public/")
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 rootProject.name = "EcoJobs"
 
 // Core