From d54e4bbea4440df0e3374cfc68ed52d42db5c8f2 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Wed, 26 Oct 2022 21:53:04 +0100 Subject: [PATCH] oops --- build.gradle | 2 +- .../kotlin/com/willfp/ecoitems/items/EcoItems.kt | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 79c28d1..792cdef 100644 --- a/build.gradle +++ b/build.gradle @@ -61,7 +61,7 @@ allprojects { dependencies { compileOnly 'com.willfp:eco:6.44.0' - implementation 'com.willfp:libreforge:3.115.0' + implementation 'com.willfp:libreforge:3.115.1' implementation 'org.joml:joml:1.10.4' compileOnly 'org.jetbrains:annotations:23.0.0' diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoitems/items/EcoItems.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoitems/items/EcoItems.kt index 9736441..09b908d 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoitems/items/EcoItems.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoitems/items/EcoItems.kt @@ -10,6 +10,7 @@ import com.willfp.eco.core.config.updating.ConfigUpdater import com.willfp.eco.core.items.Items import com.willfp.eco.core.recipe.Recipes import com.willfp.ecoitems.EcoItemsPlugin +import com.willfp.libreforge.separatorAmbivalent import java.io.File import java.util.Objects @@ -49,21 +50,21 @@ object EcoItems { BY_ID.clear() for ((id, config) in plugin.fetchConfigs("items")) { - addNewItem(EcoItem(id, config, plugin)) + addNewItem(EcoItem(id, config.separatorAmbivalent(), plugin)) } for ((id, config) in plugin.fetchConfigs("recipes", dontShare = true)) { - addNewRecipeFromConfig(id, config) + addNewRecipeFromConfig(id, config.separatorAmbivalent()) } val itemsYml = File(plugin.dataFolder, "items.yml").readConfig(ConfigType.YAML) // Legacy - for (setConfig in itemsYml.getSubsections("items")) { - addNewItem(EcoItem(setConfig.getString("id"), setConfig, plugin)) + for (config in itemsYml.getSubsections("items")) { + addNewItem(EcoItem(config.getString("id"), config.separatorAmbivalent(), plugin)) } - for (recipeConfig in itemsYml.getSubsections("recipes")) { - addNewRecipeFromConfig(Objects.hash(recipeConfig.getStrings("recipe")).toString(), recipeConfig) + for (config in itemsYml.getSubsections("recipes")) { + addNewRecipeFromConfig(Objects.hash(config.getStrings("recipe")).toString(), config.separatorAmbivalent()) } } @@ -76,7 +77,7 @@ object EcoItems { fun addNewRecipeFromConfig(id: String, config: Config) { val result = Items.lookup(config.getString("result")) val item = result.item - item.amount = config.getInt("recipeGiveAmount") // Legacy + item.amount = config.getInt("recipe-give-amount") // Legacy EcoItemsPlugin.instance.scheduler.run { Recipes.createAndRegisterRecipe( EcoItemsPlugin.instance,