Repo-Mirror/EcoSkills
9
0
Fork 0
mirror of https://github.com/Auxilor/EcoSkills.git synced 2026-01-06 15:51:52 +00:00
Code Issues Releases 1 Activity

More PR cleanups and changes

Browse Source
This commit is contained in:
Auxilor
2023-06-18 12:30:08 +02:00
parent 6ca881714b
commit abb4ffcc60
15 changed files with 47 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/components/SkillIcon.kt
View File

@@ -18,8 +18,6 @@ class SkillIcon(
config: Config,
plugin: EcoPlugin
) : PositionedComponent {
private val hideBeforeLevel1 = plugin.configYml.getBool("skills.hide-before-level-1")
val baseIcon = Items.lookup(config.getString("icon")).item
get() = field.clone()
@@ -63,7 +61,7 @@ class SkillIcon(
override val column = config.getInt("position.column")
override fun getSlotAt(row: Int, column: Int, player: Player, menu: Menu): Slot {
return if (player.getSkillLevel(skill) > 0 || !hideBeforeLevel1) {
return if (player.getSkillLevel(skill) > 0 || !skill.isHiddenBeforeLevel1) {
slot
} else {
unknownSlot

2
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt
View File

@@ -87,6 +87,8 @@ class Skill(
val icon = SkillIcon(this, config.getSubsection("gui"), plugin)
val isHiddenBeforeLevel1 = config.getBool("hide-before-level-1")
init {
if (xpFormula == null && requirements == null) {
throw InvalidConfigurationException("Skill $id has no requirements or xp formula")

14
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/display/GainXPDisplay.kt
View File

@@ -38,8 +38,6 @@ val Player.isXPGainSoundEnabled: Boolean
class GainXPDisplay(
private val plugin: EcoPlugin
) : Listener {
private val hideBeforeLevel1 = plugin.configYml.getBool("skills.hide-before-level-1")
private val sound = if (plugin.configYml.getBool("skills.gain-xp.sound.enabled")) {
PlayableSound.create(
plugin.configYml.getSubsection("skills.gain-xp.sound")
@@ -98,15 +96,17 @@ class GainXPDisplay(
private fun String.formatMessage(event: PlayerSkillXPGainEvent): String =
this.replace(
"%skill%",
if (event.player.getSkillLevel(event.skill) > 0 || !hideBeforeLevel1) event.skill.name else plugin.langYml.getString(
if (event.player.getSkillLevel(event.skill) > 0 || !event.skill.isHiddenBeforeLevel1) event.skill.name else plugin.langYml.getString(
"learning-skill"
)
)
.replace("%current_xp%", event.player.getSkillXP(event.skill).toNiceString())
.replace("%required_xp%", event.player.getFormattedRequiredXP(event.skill))
.replace("%gained_xp%", event.gainedXP.toNiceString())
.formatEco(placeholderContext(
event.player,
injectable = ActionBarHandler.PlayerHealthInjectable
))
.formatEco(
placeholderContext(
event.player,
injectable = ActionBarHandler.PlayerHealthInjectable
)
)
}

18
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/display/LevelUpDisplay.kt
View File

@@ -46,15 +46,17 @@ class LevelUpDisplay(
level = level
)
player.showTitle(Title.title(
formatted[0].toComponent(),
formatted[1].toComponent(),
Title.Times.times(
Duration.ofSeconds((plugin.configYml.getInt("skills.level-up.title.fade-in")/20).toLong()),
Duration.ofSeconds((plugin.configYml.getInt("skills.level-up.title.stay")/20).toLong()),
Duration.ofSeconds((plugin.configYml.getInt("skills.level-up.title.fade-out")/20).toLong())
player.showTitle(
Title.title(
formatted[0].toComponent(),
formatted[1].toComponent(),
Title.Times.times(
Duration.ofMillis((plugin.configYml.getDouble("skills.level-up.title.fade-in") * 1000).toLong()),
Duration.ofMillis((plugin.configYml.getDouble("skills.level-up.title.stay") * 1000).toLong()),
Duration.ofMillis((plugin.configYml.getDouble("skills.level-up.title.fade-out") * 1000).toLong())
)
)
))
)
}
sound?.playTo(player)

12
eco-core/core-plugin/src/main/resources/config.yml
View File

@@ -277,7 +277,6 @@ damage-indicators:
skills:
prevent-levelling-while-afk: true # If the player is AFK then don't give xp
hide-before-level-1: true # If skills should be hidden before level 1
# Ways to tell the player about skill xp gain
gain-xp:
@@ -318,10 +317,13 @@ skills:
- "%rewards%"
- "&f"
title:
enabled: true
fade-in: 10
stay: 40
fade-out: 10
enabled: false
# Durations are in seconds
fade-in: 0.5
stay: 2
fade-out: 0.5
title: "&a%skill% &6levelled up!"
subtitle: "&6%level_previous_numeral% &8» &6%level_numeral%"
sound:

2
eco-core/core-plugin/src/main/resources/skills/_example.yml
View File

@@ -31,6 +31,8 @@ gui:
row: 3
column: 3
hide-before-level-1: true # If this skill should be hidden before level 1
# There are two ways to specify level XP requirements:
# 1. A formula to calculate for infinite levels

2
eco-core/core-plugin/src/main/resources/skills/alchemy.yml
View File

@@ -21,6 +21,8 @@ gui:
row: 4
column: 4
hide-before-level-1: true
xp-requirements:
- 5
- 10

2
eco-core/core-plugin/src/main/resources/skills/armory.yml
View File

@@ -21,6 +21,8 @@ gui:
row: 4
column: 6
hide-before-level-1: true
xp-requirements:
- 50
- 125

2
eco-core/core-plugin/src/main/resources/skills/combat.yml
View File

@@ -23,6 +23,8 @@ gui:
row: 3
column: 4
hide-before-level-1: true
xp-requirements:
- 50
- 125

2
eco-core/core-plugin/src/main/resources/skills/enchanting.yml
View File

@@ -21,6 +21,8 @@ gui:
row: 3
column: 5
hide-before-level-1: true
xp-requirements:
- 10
- 15

2
eco-core/core-plugin/src/main/resources/skills/exploration.yml
View File

@@ -21,6 +21,8 @@ gui:
row: 4
column: 7
hide-before-level-1: true
xp-requirements:
- 25
- 60

2
eco-core/core-plugin/src/main/resources/skills/farming.yml
View File

@@ -21,6 +21,8 @@ gui:
row: 3
column: 6
hide-before-level-1: true
xp-requirements:
- 50
- 125

2
eco-core/core-plugin/src/main/resources/skills/fishing.yml
View File

@@ -19,6 +19,8 @@ gui:
row: 4
column: 3
hide-before-level-1: true
xp-requirements:
- 5
- 10

2
eco-core/core-plugin/src/main/resources/skills/mining.yml
View File

@@ -21,6 +21,8 @@ gui:
row: 3
column: 3
hide-before-level-1: true
xp-requirements:
- 50
- 125

2
eco-core/core-plugin/src/main/resources/skills/woodcutting.yml
View File

@@ -19,6 +19,8 @@ gui:
row: 3
column: 7
hide-before-level-1: true
xp-requirements:
- 50
- 125