Repo-Mirror/EcoCrates
9
0
Fork 0
Code Issues Releases Activity

Updated eco

Browse Source
This commit is contained in:
Auxilor
2022-03-27 13:24:09 +01:00
parent 9dc19f7e7a
commit 13bffd4c41
7 changed files with 6 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -57,7 +57,7 @@ allprojects {
}
dependencies {
compileOnly 'com.willfp:eco:6.30.0'
compileOnly 'com.willfp:eco:6.31.0'
compileOnly 'org.jetbrains:annotations:23.0.0'
compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.6.10'

2
eco-core/core-plugin/src/main/kotlin/com/willfp/ecocrates/EcoCratesPlugin.kt
View File

@@ -70,7 +70,7 @@ class EcoCratesPlugin : EcoPlugin() {
}
override fun getMinimumEcoVersion(): String {
return "6.30.0"
return "6.31.0"
}
companion object {

2
eco-core/core-plugin/src/main/kotlin/com/willfp/ecocrates/converters/impl/CrateReloadedConverter.kt
View File

@@ -5,10 +5,10 @@ import com.hazebyte.crate.api.crate.reward.Reward
import com.willfp.eco.core.config.BuildableConfig
import com.willfp.eco.core.config.TransientConfig
import com.willfp.eco.core.config.interfaces.Config
import com.willfp.eco.core.items.toLookupString
import com.willfp.ecocrates.EcoCratesPlugin
import com.willfp.ecocrates.converters.Converter
import com.willfp.ecocrates.converters.util.ConversionHelpers
import com.willfp.ecocrates.converters.util.toLookupString
import com.willfp.ecocrates.crate.Crates
import com.willfp.ecocrates.crate.placed.PlacedCrates
import com.willfp.ecocrates.crate.roll.Rolls

2
eco-core/core-plugin/src/main/kotlin/com/willfp/ecocrates/converters/impl/CrazyCratesConverter.kt
View File

@@ -5,10 +5,10 @@ import com.badbones69.crazycrates.api.objects.Crate
import com.badbones69.crazycrates.api.objects.Prize
import com.willfp.eco.core.config.BuildableConfig
import com.willfp.eco.core.config.interfaces.Config
import com.willfp.eco.core.items.toLookupString
import com.willfp.ecocrates.EcoCratesPlugin
import com.willfp.ecocrates.converters.Converter
import com.willfp.ecocrates.converters.util.ConversionHelpers
import com.willfp.ecocrates.converters.util.toLookupString
import com.willfp.ecocrates.crate.Crates
import com.willfp.ecocrates.crate.placed.PlacedCrates

2
eco-core/core-plugin/src/main/kotlin/com/willfp/ecocrates/converters/impl/ExcellentCratesConverter.kt
View File

@@ -2,10 +2,10 @@ package com.willfp.ecocrates.converters.impl
import com.willfp.eco.core.config.BuildableConfig
import com.willfp.eco.core.config.interfaces.Config
import com.willfp.eco.core.items.toLookupString
import com.willfp.ecocrates.EcoCratesPlugin
import com.willfp.ecocrates.converters.Converter
import com.willfp.ecocrates.converters.util.ConversionHelpers
import com.willfp.ecocrates.converters.util.toLookupString
import com.willfp.ecocrates.crate.Crates
import com.willfp.ecocrates.crate.placed.PlacedCrates
import org.bukkit.Location

2
eco-core/core-plugin/src/main/kotlin/com/willfp/ecocrates/converters/impl/SpecializedCratesConverter.kt
View File

@@ -2,10 +2,10 @@ package com.willfp.ecocrates.converters.impl
import com.willfp.eco.core.config.BuildableConfig
import com.willfp.eco.core.config.interfaces.Config
import com.willfp.eco.core.items.toLookupString
import com.willfp.ecocrates.EcoCratesPlugin
import com.willfp.ecocrates.converters.Converter
import com.willfp.ecocrates.converters.util.ConversionHelpers
import com.willfp.ecocrates.converters.util.toLookupString
import com.willfp.ecocrates.crate.Crates
import me.PM2.customcrates.crates.Crate
import me.PM2.customcrates.crates.PlacedCrate

31
eco-core/core-plugin/src/main/kotlin/com/willfp/ecocrates/converters/util/ConversionHelpers.kt
View File

@@ -2,8 +2,6 @@ package com.willfp.ecocrates.converters.util
import com.willfp.eco.core.config.TransientConfig
import com.willfp.eco.core.config.interfaces.Config
import com.willfp.eco.core.items.Items
import org.bukkit.inventory.ItemStack
object ConversionHelpers {
fun createEmptyReward(): Config {
@@ -142,32 +140,3 @@ object ConversionHelpers {
return result
}
}
fun ItemStack.toLookupString(): String {
val custom = Items.getCustomItem(this)
if (custom != null) {
return "${custom.key.namespace}:${custom.key.key} ${this.amount}"
}
var result = "${this.type.name.lowercase()} ${this.amount}"
val meta = this.itemMeta ?: return result
meta.enchants.forEach { (enchant, level) ->
result += " ${enchant.key.key}:${level}"
}
if (meta.hasDisplayName()) {
result += " name:\"${meta.displayName}\""
}
if (meta.hasCustomModelData()) {
result += " custom-model-data:${meta.customModelData}"
}
meta.itemFlags.forEach {
result += " ${it.name.lowercase()}"
}
return result
}