libreforge-updater

Fixed TargetYml#getSlot

.github/workflows/publish-release.yml

@@ -15,11 +15,11 @@ jobs:
       - name: Checkout latest code
         uses: actions/checkout@v2
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Change wrapper permissions
         run: chmod +x ./gradlew

build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
     `java-library`
     `maven-publish`
     kotlin("jvm") version "1.9.20"
-    id("com.github.johnrengelman.shadow") version "8.0.0"
+    id("io.github.goooler.shadow") version "8.1.7"
     id("com.willfp.libreforge-gradle-plugin") version "1.0.0"
 }
 
@@ -25,7 +25,7 @@ allprojects {
     apply(plugin = "java")
     apply(plugin = "kotlin")
     apply(plugin = "maven-publish")
-    apply(plugin = "com.github.johnrengelman.shadow")
+    apply(plugin = "io.github.goooler.shadow")
 
     repositories {
         mavenLocal()
@@ -37,7 +37,7 @@ allprojects {
     }
 
     dependencies {
-        compileOnly("com.willfp:eco:6.56.0")
+        compileOnly("com.willfp:eco:6.73.0")
         compileOnly("org.jetbrains:annotations:23.0.0")
         compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.9.20")
     }

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/ReforgesPlugin.kt

@@ -3,6 +3,7 @@ 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
@@ -11,13 +12,23 @@ import com.willfp.reforges.commands.CommandReforge
 import com.willfp.reforges.commands.CommandReforges
 import com.willfp.reforges.config.TargetYml
 import com.willfp.reforges.display.ReforgesDisplay
+import com.willfp.reforges.gui.ReforgeGUI
 import com.willfp.reforges.libreforge.ConditionHasReforge
+import com.willfp.reforges.reforges.PriceMultipliers
 import com.willfp.reforges.reforges.ReforgeFinder
+import com.willfp.reforges.reforges.ReforgeStoneTag
+import com.willfp.reforges.reforges.ReforgeTargets
+import com.willfp.reforges.reforges.ReforgedTag
 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 =
@@ -38,9 +49,18 @@ class ReforgesPlugin : LibreforgePlugin() {
 
         Items.registerArgParser(ReforgeArgParser)
 
+        Items.registerTag(ReforgedTag(this))
+        Items.registerTag(ReforgeStoneTag(this))
+
         registerHolderProvider(ReforgeFinder.toHolderProvider())
     }
 
+    override fun handleReload() {
+        ReforgeTargets.update(this)
+        PriceMultipliers.update(this)
+        ReforgeGUI.update(this)
+    }
+
     override fun loadListeners(): List<Listener> {
         return listOf(
             DiscoverRecipeListener(this),
@@ -55,8 +75,10 @@ class ReforgesPlugin : LibreforgePlugin() {
         )
     }
 
-    override fun createDisplayModule(): DisplayModule {
-        return ReforgesDisplay(this)
+    override fun loadDisplayModules(): List<DisplayModule> {
+        return listOf(
+            ReforgesDisplay(this)
+        )
     }
 
     companion object {

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/gui/ReforgeGUI.kt

@@ -192,14 +192,11 @@ object ReforgeGUI {
 
     private lateinit var defaultPrice: ConfiguredPrice
 
-    @JvmStatic
     fun open(player: Player) {
         menu.open(player)
     }
 
-    @JvmStatic
-    @ConfigUpdater
-    fun update(plugin: EcoPlugin) {
+    internal fun update(plugin: EcoPlugin) {
         itemToReforge = CaptiveItem()
         reforgeStone = CaptiveItem()
 

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/PriceMultipliers.kt

@@ -1,7 +1,6 @@
 package com.willfp.reforges.reforges
 
 import com.willfp.eco.core.EcoPlugin
-import com.willfp.eco.core.config.updating.ConfigUpdater
 import org.bukkit.entity.Player
 
 @Suppress("UNUSED")
@@ -9,13 +8,6 @@ object PriceMultipliers {
     private val REGISTRY = mutableListOf<PriceMultiplier>()
     private val NO_MULTIPLIER = PriceMultiplier("none", 1.0, 0)
 
-    /**
-     * Get the permission multiplier for a given player.
-     *
-     * @param player The player.
-     * @return The multiplier.
-     */
-    @JvmStatic
     fun getForPlayer(player: Player): PriceMultiplier {
         var current = NO_MULTIPLIER
 
@@ -38,19 +30,11 @@ object PriceMultipliers {
     val Player.reforgePriceMultiplier: Double
         get() = getForPlayer(this).multiplier
 
-    /**
-     * List of all registered multipliers.
-     *
-     * @return The multipliers.
-     */
-    @JvmStatic
     fun values(): List<PriceMultiplier> {
         return REGISTRY.toList()
     }
 
-    @ConfigUpdater
-    @JvmStatic
-    fun update(plugin: EcoPlugin) {
+    internal fun update(plugin: EcoPlugin) {
         REGISTRY.clear()
 
         for (config in plugin.configYml.getSubsections("price-multipliers")) {

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/ReforgeFinder.kt

@@ -11,6 +11,6 @@ object ReforgeFinder : ItemHolderFinder<Reforge>() {
     }
 
     override fun isValidInSlot(holder: Reforge, slot: SlotType): Boolean {
-        return slot in holder.targets.map { it.slot }.toSet()
+        return holder.targets.map { it.slot }.any { it.isOrContains(slot) }
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/ReforgeStoneTag.kt

@@ -0,0 +1,16 @@
+package com.willfp.reforges.reforges
+
+import com.willfp.eco.core.EcoPlugin
+import com.willfp.eco.core.items.tag.CustomItemTag
+import com.willfp.reforges.util.reforgeStone
+import org.bukkit.inventory.ItemStack
+
+class ReforgeStoneTag(plugin: EcoPlugin): CustomItemTag(plugin.createNamespacedKey("stone")) {
+    override fun matches(p0: ItemStack): Boolean {
+        return p0.reforgeStone != null
+    }
+
+    override fun getExampleItem(): ItemStack {
+        return Reforges.values().random().stone
+    }
+}

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/ReforgeTargets.kt

@@ -1,7 +1,6 @@
 package com.willfp.reforges.reforges
 
 import com.google.common.collect.ImmutableSet
-import com.willfp.eco.core.config.updating.ConfigUpdater
 import com.willfp.libreforge.slot.impl.SlotTypeAny
 import com.willfp.reforges.ReforgesPlugin
 import org.bukkit.inventory.ItemStack
@@ -16,24 +15,10 @@ object ReforgeTargets {
         update(ReforgesPlugin.instance)
     }
 
-    /**
-     * Get ReforgeTarget matching name.
-     *
-     * @param name The name to search for.
-     * @return The matching ReforgeTarget, or null if not found.
-     */
-    @JvmStatic
     fun getByName(name: String): ReforgeTarget? {
         return registered[name]
     }
 
-    /**
-     * Get target from item.
-     *
-     * @param item The item.
-     * @return The target.
-     */
-    @JvmStatic
     fun getForItem(item: ItemStack?): List<ReforgeTarget> {
         if (item == null) {
             return emptyList()
@@ -44,14 +29,7 @@ object ReforgeTargets {
             .filter { it.matches(item) }
     }
 
-    /**
-     * Update all targets.
-     *
-     * @param plugin Instance of Reforges.
-     */
-    @ConfigUpdater
-    @JvmStatic
-    fun update(plugin: ReforgesPlugin) {
+    internal fun update(plugin: ReforgesPlugin) {
         ALL.items.clear()
         for (id in ArrayList(registered.keys)) {
             if (id.equals("all", ignoreCase = true)) {
@@ -70,12 +48,6 @@ object ReforgeTargets {
         }
     }
 
-    /**
-     * Get all targets.
-     *
-     * @return A set of all targets.
-     */
-    @JvmStatic
     fun values(): Set<ReforgeTarget> {
         return ImmutableSet.copyOf(registered.values)
     }

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/ReforgedTag.kt

@@ -0,0 +1,13 @@
+package com.willfp.reforges.reforges
+
+import com.willfp.eco.core.EcoPlugin
+import com.willfp.eco.core.items.tag.CustomItemTag
+import com.willfp.reforges.util.reforge
+import com.willfp.reforges.util.reforgeStone
+import org.bukkit.inventory.ItemStack
+
+class ReforgedTag(plugin: EcoPlugin): CustomItemTag(plugin.createNamespacedKey("reforged")) {
+    override fun matches(p0: ItemStack): Boolean {
+        return p0.reforge != null
+    }
+}

eco-core/core-plugin/src/main/resources/eco.yml

@@ -6,3 +6,4 @@ options:
   resource-id: 1330
   bstats-id: 12412
   color: "&3"
+  uses-reflective-reload: false

gradle.properties

@@ -1,5 +1,5 @@
 #libreforge-updater
-#Tue Jan 16 13:28:38 GMT 2024
+#Wed Aug 21 18:59:03 BST 2024
 kotlin.code.style=official
-libreforge-version=4.55.1
-version=6.54.2
+libreforge-version=4.71.2
+version=6.70.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

jitpack.yml

@@ -1,6 +0,0 @@
-jdk: openjdk17
-before_install:
-  - source "$HOME/.sdkman/bin/sdkman-init.sh"
-  - sdk update
-  - sdk install java 17.0.1-tem
-  - sdk use java 17.0.1-tem

settings.gradle.kts

@@ -2,12 +2,14 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         mavenLocal()
-        maven("https://repo.jpenilla.xyz/snapshots/")
         maven("https://repo.auxilor.io/repository/maven-public/")
+        maven("https://repo.papermc.io/repository/maven-public/")
     }
 }
 
-rootProject.name = "Reforges"
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
 
 // Core
 include(":eco-core")