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

Compare commits

..

9 Commits

Author SHA1 Message Date
Will FP
e67717cf84 Removed ConfigUpdater import 2025-10-26 13:38:50 +00:00
Will FP
16798df570 Fixed GUI 2025-10-26 13:38:27 +00:00
Will FP
d0eaee3ad0 Updated to 3.77.1 2025-10-06 10:44:46 +01:00
Will FP
4e076680aa Hotfix 2025-10-06 10:44:38 +01:00
Will FP
4257c45920 libreforge-updater 2025-10-06 08:56:29 +01:00
Will FP
8a05885940 Merge remote-tracking branch 'origin/develop' 2025-09-26 16:16:04 +01:00
Will FP
42033f31b6 libreforge-updater 2025-09-11 09:57:55 +01:00
Will FP
d5eea9549f libreforge-updater 2025-08-01 10:03:49 +01:00
Will FP
744f5bf4b0 Merge pull request #37 from Exanthiax/master
Update Job.kt
2025-08-01 09:40:03 +01:00
7 changed files with 50 additions and 36 deletions

View File

@@ -39,14 +39,14 @@ allprojects {
}
dependencies {
compileOnly("com.willfp:eco:6.56.0")
compileOnly("com.willfp:eco:6.77.0")
compileOnly("org.jetbrains:annotations:23.0.0")
compileOnly("org.jetbrains.kotlin:kotlin-stdlib:2.1.0")
}
java {
withSourcesJar()
toolchain.languageVersion.set(JavaLanguageVersion.of(17))
toolchain.languageVersion.set(JavaLanguageVersion.of(21))
}
tasks {
@@ -57,7 +57,7 @@ allprojects {
compileKotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
jvmTarget.set(JvmTarget.JVM_21)
}
}

View File

@@ -13,6 +13,7 @@ import com.willfp.ecojobs.commands.CommandJobs
import com.willfp.ecojobs.jobs.EcoJobsJobTopPlaceholder
import com.willfp.ecojobs.jobs.JobLevelListener
import com.willfp.ecojobs.jobs.Jobs
import com.willfp.ecojobs.jobs.JobsGUI
import com.willfp.ecojobs.jobs.PriceHandler
import com.willfp.ecojobs.jobs.ResetOnQuitListener
import com.willfp.ecojobs.libreforge.ConditionHasActiveJob
@@ -89,6 +90,10 @@ class EcoJobsPlugin : LibreforgePlugin() {
}.register()
}
override fun handleReload() {
JobsGUI.update(this)
}
override fun loadPluginCommands(): List<PluginCommand> {
return listOf(
CommandEcoJobs(this),

View File

@@ -27,6 +27,7 @@ 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.ecojobs.util.LeaderboardCacheEntry
import com.willfp.ecojobs.util.LevelInjectable
import com.willfp.libreforge.ViolationContext
import com.willfp.libreforge.conditions.ConditionList

View File

@@ -1,5 +1,6 @@
package com.willfp.ecojobs.jobs
import com.willfp.eco.util.SoundUtils
import com.willfp.ecojobs.EcoJobsPlugin
import com.willfp.ecojobs.api.event.PlayerJobLevelUpEvent
import com.willfp.libreforge.toDispatcher
@@ -21,15 +22,17 @@ class JobLevelListener(
job.executeLevelCommands(player, level)
if (this.plugin.configYml.getBool("level-up.sound.enabled")) {
val sound = Sound.valueOf(this.plugin.configYml.getString("level-up.sound.id").uppercase())
val sound = SoundUtils.getSound(this.plugin.configYml.getString("level-up.sound.id"))
val pitch = this.plugin.configYml.getDouble("level-up.sound.pitch")
player.playSound(
player.location,
sound,
100f,
pitch.toFloat()
)
if (sound != null) {
player.playSound(
player.location,
sound,
100f,
pitch.toFloat()
)
}
}
if (this.plugin.configYml.getBool("level-up.message.enabled")) {

View File

@@ -2,7 +2,6 @@ package com.willfp.ecojobs.jobs
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

View File

@@ -1,6 +1,5 @@
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
@@ -13,6 +12,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.core.items.builder.SkullBuilder
import com.willfp.eco.util.SoundUtils
import com.willfp.eco.util.formatEco
import com.willfp.ecojobs.EcoJobsPlugin
import com.willfp.ecojobs.api.activeJobs
@@ -27,16 +27,12 @@ import org.bukkit.entity.Player
import org.bukkit.inventory.ItemStack
import org.bukkit.inventory.meta.SkullMeta
import kotlin.math.ceil
import kotlin.math.max
import kotlin.math.min
object JobsGUI {
private lateinit var menu: Menu
private val jobAreaSlots = mutableListOf<Pair<Int, Int>>()
@JvmStatic
@ConfigUpdater
fun update(plugin: EcoJobsPlugin) {
internal fun update(plugin: EcoJobsPlugin) {
val topLeftRow = plugin.configYml.getInt("gui.job-area.top-left.row")
val topLeftColumn = plugin.configYml.getInt("gui.job-area.top-left.column")
val bottomRightRow = plugin.configYml.getInt("gui.job-area.bottom-right.row")
@@ -150,12 +146,16 @@ object JobsGUI {
}
}
player.playSound(
player.location,
Sound.valueOf(plugin.configYml.getString("gui.job-icon.click.sound").uppercase()),
1f,
plugin.configYml.getDouble("gui.job-icon.click.pitch").toFloat()
)
val sound = SoundUtils.getSound(plugin.configYml.getString("gui.job-icon.click.sound"))
if (sound != null) {
player.playSound(
player.location,
sound,
1f,
plugin.configYml.getDouble("gui.job-icon.click.pitch").toFloat()
)
}
}
onRightClick { player, _, _, menu ->
@@ -170,12 +170,16 @@ object JobsGUI {
if (player.hasJobActive(job)) {
job.leaveGUI.open(player)
player.playSound(
player.location,
Sound.valueOf(plugin.configYml.getString("gui.job-icon.click.sound").uppercase()),
1f,
plugin.configYml.getDouble("gui.job-icon.click.pitch").toFloat()
)
val sound = SoundUtils.getSound(plugin.configYml.getString("gui.job-icon.click.sound"))
if (sound != null) {
player.playSound(
player.location,
sound,
1f,
plugin.configYml.getDouble("gui.job-icon.click.pitch").toFloat()
)
}
}
}
})
@@ -204,12 +208,14 @@ object JobsGUI {
)
maxPages { player ->
ceil(Jobs.values()
.filter { player.getJobLevel(it) > 0 }
.size.toDouble() / jobAreaSlots.size).toInt()
ceil(
Jobs.values()
.filter { player.getJobLevel(it) > 0 }
.size.toDouble() / jobAreaSlots.size).toInt()
}
setSlot(plugin.configYml.getInt("gui.close.location.row"),
setSlot(
plugin.configYml.getInt("gui.close.location.row"),
plugin.configYml.getInt("gui.close.location.column"),
slot(
ItemStackBuilder(Items.lookup(plugin.configYml.getString("gui.close.item")))

View File

@@ -1,5 +1,5 @@
#libreforge-updater
#Sat Jul 05 16:44:53 BST 2025
#Mon Oct 06 08:56:29 BST 2025
kotlin.code.style=official
libreforge-version=4.76.1
version=3.74.1
libreforge-version=4.79.0
version=3.77.2