From 2bd9f98828324bae409f2a6319ca867884e11d1d Mon Sep 17 00:00:00 2001 From: Will FP Date: Sun, 5 Oct 2025 16:04:18 +0100 Subject: [PATCH] Updated to use tags in targets to add copper support --- build.gradle.kts | 4 +- eco-core/core-plugin/build.gradle.kts | 2 +- .../com/willfp/reforges/ReforgesPlugin.kt | 6 -- .../com/willfp/reforges/gui/ReforgeGUI.kt | 2 - .../core-plugin/src/main/resources/target.yml | 63 ++++--------------- gradle.properties | 4 +- 6 files changed, 16 insertions(+), 65 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 252b0ee..345f49a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -46,7 +46,7 @@ allprojects { java { withSourcesJar() - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) + toolchain.languageVersion.set(JavaLanguageVersion.of(21)) } tasks { @@ -57,7 +57,7 @@ allprojects { compileKotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_17) + jvmTarget.set(JvmTarget.JVM_21) } } diff --git a/eco-core/core-plugin/build.gradle.kts b/eco-core/core-plugin/build.gradle.kts index 4142e1b..ab2dd2e 100644 --- a/eco-core/core-plugin/build.gradle.kts +++ b/eco-core/core-plugin/build.gradle.kts @@ -2,7 +2,7 @@ group = "com.willfp" version = rootProject.version dependencies { - compileOnly("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT") + compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT") compileOnly("com.willfp:Talismans:6.0.0") compileOnly("com.github.ben-manes.caffeine:caffeine:3.0.2") 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 fff7276..7a3d14c 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 @@ -3,7 +3,6 @@ package com.willfp.reforges import com.willfp.eco.core.command.impl.PluginCommand import com.willfp.eco.core.display.DisplayModule import com.willfp.eco.core.items.Items -import com.willfp.eco.core.items.tag.CustomItemTag import com.willfp.libreforge.conditions.Conditions import com.willfp.libreforge.loader.LibreforgePlugin import com.willfp.libreforge.loader.configs.ConfigCategory @@ -23,12 +22,7 @@ import com.willfp.reforges.reforges.Reforges import com.willfp.reforges.reforges.util.ReforgeArgParser import com.willfp.reforges.util.AntiPlaceListener import com.willfp.reforges.util.DiscoverRecipeListener -import com.willfp.reforges.util.reforge -import com.willfp.reforges.util.reforgeStone -import com.willfp.talismans.talismans.Talismans -import com.willfp.talismans.talismans.util.TalismanChecks import org.bukkit.event.Listener -import org.bukkit.inventory.ItemStack class ReforgesPlugin : LibreforgePlugin() { val targetYml: TargetYml = diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/gui/ReforgeGUI.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/gui/ReforgeGUI.kt index 6b00188..19673b5 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/gui/ReforgeGUI.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/gui/ReforgeGUI.kt @@ -2,7 +2,6 @@ package com.willfp.reforges.gui import com.willfp.eco.core.EcoPlugin import com.willfp.eco.core.config.emptyConfig -import com.willfp.eco.core.config.updating.ConfigUpdater import com.willfp.eco.core.drops.DropQueue import com.willfp.eco.core.gui.captiveSlot import com.willfp.eco.core.gui.menu @@ -24,7 +23,6 @@ import com.willfp.ecomponent.CaptiveItem import com.willfp.ecomponent.menuStateVar import com.willfp.ecomponent.setSlot import com.willfp.libreforge.LibreforgeSpigotPlugin -import com.willfp.reforges.reforges.PriceMultipliers import com.willfp.reforges.reforges.PriceMultipliers.reforgePriceMultiplier import com.willfp.reforges.reforges.Reforge import com.willfp.reforges.reforges.ReforgeTarget diff --git a/eco-core/core-plugin/src/main/resources/target.yml b/eco-core/core-plugin/src/main/resources/target.yml index bb3d259..4a73d8f 100644 --- a/eco-core/core-plugin/src/main/resources/target.yml +++ b/eco-core/core-plugin/src/main/resources/target.yml @@ -9,36 +9,19 @@ pickaxe: slot: hands items: - - wooden_pickaxe - - stone_pickaxe - - iron_pickaxe - - golden_pickaxe - - diamond_pickaxe - - netherite_pickaxe + - "#items_pickaxes" + axe: slot: hands items: - - wooden_axe - - stone_axe - - iron_axe - - golden_axe - - diamond_axe - - netherite_axe + - "#items_axes" + melee: slot: hands items: - - wooden_axe - - stone_axe - - iron_axe - - golden_axe - - diamond_axe - - netherite_axe - - wooden_sword - - stone_sword - - iron_sword - - golden_sword - - diamond_sword - - netherite_sword + - "#items_axes" + - "#items_swords" + trident: slot: hands items: @@ -51,31 +34,7 @@ bow: armor: slot: armor items: - - turtle_helmet - - leather_helmet - - chainmail_helmet - - iron_helmet - - golden_helmet - - diamond_helmet - - netherite_helmet - - - leather_chestplate - - chainmail_chestplate - - iron_chestplate - - golden_chestplate - - diamond_chestplate - - netherite_chestplate - - - leather_leggings - - chainmail_leggings - - iron_leggings - - golden_leggings - - diamond_leggings - - netherite_leggings - - - leather_boots - - chainmail_boots - - iron_boots - - golden_boots - - diamond_boots - - netherite_boots \ No newline at end of file + - "#items_head_armor" + - "#items_chest_armor" + - "#items_leg_armor" + - "#items_foot_armor" diff --git a/gradle.properties b/gradle.properties index 4ea9dab..77ef63d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ #libreforge-updater -#Thu Sep 11 09:58:17 BST 2025 +#Sun Oct 05 13:11:32 BST 2025 kotlin.code.style=official -libreforge-version=4.78.0 +libreforge-version=4.79.0 version=6.77.0