From f2b52cddb356c195294d225d571941dba3d882a8 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 28 Mar 2023 19:17:36 +0100 Subject: [PATCH] Moved integration --- .../com/willfp/reforges/ReforgesPlugin.kt | 4 ++++ .../libreforge/ConditionHasReforge.kt | 24 +++++++++++++++++++ gradle.properties | 2 +- 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/libreforge/ConditionHasReforge.kt diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/ReforgesPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/ReforgesPlugin.kt index 80b5400..f2ec39a 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/ReforgesPlugin.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/ReforgesPlugin.kt @@ -4,6 +4,7 @@ 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.conditions.Conditions import com.willfp.libreforge.loader.LibreforgePlugin import com.willfp.libreforge.loader.configs.ConfigCategory import com.willfp.libreforge.registerHolderProvider @@ -13,6 +14,7 @@ import com.willfp.reforges.commands.CommandReforges import com.willfp.reforges.config.TargetYml import com.willfp.reforges.display.ReforgesDisplay import com.willfp.reforges.integrations.talismans.TalismansIntegration +import com.willfp.reforges.libreforge.ConditionHasReforge import com.willfp.reforges.reforges.Reforges import com.willfp.reforges.reforges.util.ReforgeArgParser import com.willfp.reforges.util.AntiPlaceListener @@ -35,6 +37,8 @@ class ReforgesPlugin : LibreforgePlugin() { } override fun handleEnable() { + Conditions.register(ConditionHasReforge) + Items.registerArgParser(ReforgeArgParser) registerHolderProvider { ReforgeLookup.provideReforges(it) } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/libreforge/ConditionHasReforge.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/libreforge/ConditionHasReforge.kt new file mode 100644 index 0000000..4191952 --- /dev/null +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/libreforge/ConditionHasReforge.kt @@ -0,0 +1,24 @@ +package com.willfp.reforges.libreforge + +import com.willfp.eco.core.config.interfaces.Config +import com.willfp.eco.util.containsIgnoreCase +import com.willfp.libreforge.NoCompileData +import com.willfp.libreforge.arguments +import com.willfp.libreforge.conditions.Condition +import com.willfp.reforges.reforges.Reforge +import com.willfp.reforges.util.ReforgeLookup +import org.bukkit.entity.Player + +object ConditionHasReforge : Condition("has_reforge") { + override val arguments = arguments { + require("reforge", "You must specify the reforge!") + } + + override fun isMet(player: Player, config: Config, compileData: NoCompileData): Boolean { + return ReforgeLookup.provideReforges(player) + .map { it.holder } + .filterIsInstance() + .map { it.id.key } + .containsIgnoreCase(config.getString("reforge")) + } +} diff --git a/gradle.properties b/gradle.properties index 539c52d..8b99824 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ #libreforge-updater -#Tue Mar 28 16:07:54 BST 2023 +#Tue Mar 28 18:28:24 BST 2023 kotlin.code.style=official libreforge-version=4.0.0 version=6.0.0