From f315251c5cc7eda2c29393644f18f53e7516eaf4 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 19 Nov 2021 18:08:39 +0000 Subject: [PATCH] Updated to libreforge 0.2.1 --- build.gradle | 2 +- .../com/willfp/reforges/ReforgesPlugin.java | 6 ++--- .../reforges/util/ReforgeEnableListeners.java | 4 ++-- .../reforges/reforges/util/ReforgeLookup.java | 2 +- .../reforges/display/ReforgesDisplay.kt | 6 ++++- .../com/willfp/reforges/reforges/Reforge.kt | 24 ++++++++----------- .../src/main/resources/reforges.json | 8 +++++-- 7 files changed, 28 insertions(+), 24 deletions(-) diff --git a/build.gradle b/build.gradle index f480c06..525c7d7 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ allprojects { dependencies { compileOnly 'com.willfp:eco:6.13.8' - implementation 'com.willfp:libreforge:0.1.2' + implementation 'com.willfp:libreforge:0.2.1' compileOnly 'org.jetbrains:annotations:23.0.0' diff --git a/eco-core/core-plugin/src/main/java/com/willfp/reforges/ReforgesPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/reforges/ReforgesPlugin.java index 7f8aea2..fd86b99 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/reforges/ReforgesPlugin.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/reforges/ReforgesPlugin.java @@ -5,9 +5,9 @@ import com.willfp.eco.core.command.impl.PluginCommand; import com.willfp.eco.core.display.DisplayModule; import com.willfp.eco.core.integrations.IntegrationLoader; import com.willfp.eco.core.items.Items; -import com.willfp.libreforge.api.LibReforge; -import com.willfp.libreforge.api.LibReforgeUtils; -import com.willfp.libreforge.api.effects.ConfiguredEffect; +import com.willfp.libreforge.LibReforge; +import com.willfp.libreforge.LibReforgeUtils; +import com.willfp.libreforge.effects.ConfiguredEffect; import com.willfp.reforges.commands.CommandReforge; import com.willfp.reforges.commands.CommandReforges; import com.willfp.reforges.config.ReforgesJson; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeEnableListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeEnableListeners.java index a32a586..0c84c1f 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeEnableListeners.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeEnableListeners.java @@ -3,8 +3,8 @@ package com.willfp.reforges.reforges.util; import com.willfp.eco.core.EcoPlugin; import com.willfp.eco.core.PluginDependent; import com.willfp.eco.core.events.ArmorChangeEvent; -import com.willfp.libreforge.api.LibReforgeUtils; -import com.willfp.libreforge.api.effects.ConfiguredEffect; +import com.willfp.libreforge.LibReforgeUtils; +import com.willfp.libreforge.effects.ConfiguredEffect; import com.willfp.reforges.reforges.Reforge; import com.willfp.reforges.reforges.Reforges; import com.willfp.reforges.reforges.meta.ReforgeTarget; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeLookup.java b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeLookup.java index 1e97791..b2f6d41 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeLookup.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeLookup.java @@ -1,7 +1,7 @@ package com.willfp.reforges.reforges.util; import com.willfp.eco.core.EcoPlugin; -import com.willfp.libreforge.api.LibReforge; +import com.willfp.libreforge.LibReforge; import com.willfp.reforges.ReforgesPlugin; import com.willfp.reforges.reforges.Reforge; import com.willfp.reforges.reforges.meta.ReforgeTarget; diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/display/ReforgesDisplay.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/display/ReforgesDisplay.kt index 43b27a4..6ed25d4 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/display/ReforgesDisplay.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/display/ReforgesDisplay.kt @@ -69,7 +69,11 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin val stoneTexture = SkullUtils.getSkullTexture(stoneMeta) if (stoneTexture != null) { - SkullUtils.setSkullTexture(meta as SkullMeta, stoneTexture) + try { + SkullUtils.setSkullTexture(meta as SkullMeta, stoneTexture) + } catch (e: StringIndexOutOfBoundsException) { + // Do nothing + } } } itemStack.itemMeta = meta diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/Reforge.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/Reforge.kt index e89c861..e7fcc6a 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/Reforge.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/Reforge.kt @@ -6,16 +6,14 @@ import com.willfp.eco.core.items.CustomItem import com.willfp.eco.core.items.Items import com.willfp.eco.core.items.builder.ItemStackBuilder import com.willfp.eco.core.recipe.Recipes -import com.willfp.libreforge.api.conditions.Conditions -import com.willfp.libreforge.api.conditions.ConfiguredCondition -import com.willfp.libreforge.api.effects.ConfiguredEffect -import com.willfp.libreforge.api.effects.Effects -import com.willfp.libreforge.api.provider.Holder +import com.willfp.libreforge.Holder +import com.willfp.libreforge.conditions.Conditions +import com.willfp.libreforge.effects.Effects import com.willfp.reforges.ReforgesPlugin import com.willfp.reforges.reforges.meta.ReforgeTarget import com.willfp.reforges.reforges.util.ReforgeUtils import org.bukkit.inventory.ItemStack -import java.util.Objects +import java.util.* @Suppress("DEPRECATION") class Reforge( @@ -30,15 +28,13 @@ class Reforge( val targets = config.getStrings("targets").map { ReforgeTarget.getByName(it) }.toSet() - override val effects = config.getSubsections("effects").map { - val effect = Effects.getByID(it.getString("id")) ?: return@map null - ConfiguredEffect(effect, it) - }.filterNotNull().toSet() + override val effects = config.getSubsections("effects").mapNotNull { + Effects.compile(it, "Reforge ID $id") + }.toSet() - override val conditions = config.getSubsections("conditions").map { - val condition = Conditions.getByID(it.getString("id")) ?: return@map null - ConfiguredCondition(condition, it) - }.filterNotNull().toSet() + override val conditions = config.getSubsections("conditions").mapNotNull { + Conditions.compile(it, "Reforge ID $id") + }.toSet() val requiresStone = config.getBool("stone.enabled") diff --git a/eco-core/core-plugin/src/main/resources/reforges.json b/eco-core/core-plugin/src/main/resources/reforges.json index 69a1c01..3201e1c 100644 --- a/eco-core/core-plugin/src/main/resources/reforges.json +++ b/eco-core/core-plugin/src/main/resources/reforges.json @@ -20,8 +20,12 @@ "effects": [ { "id": "damage_multiplier", - "multiplier": 3, - "chance": 2 + "args": { + "multiplier": 3 + }, + "triggers": [ + "melee_attack" + ] } ], "conditions": []