Updated to libreforge 4

build.gradle

@@ -1,137 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
-    }
-}
-
-plugins {
-    id 'java-library'
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
-    id 'maven-publish'
-    id 'java'
-}
-
-dependencies {
-    implementation project(":eco-core").getSubprojects()
-}
-
-allprojects {
-    apply plugin: 'java'
-    apply plugin: 'kotlin'
-    apply plugin: 'maven-publish'
-    apply plugin: 'com.github.johnrengelman.shadow'
-
-    repositories {
-        mavenCentral()
-        mavenLocal()
-        maven { url 'https://jitpack.io' }
-        maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
-        maven { url 'https://repo.codemc.org/repository/nms/' }
-        maven { url 'https://repo.codemc.org/repository/maven-public' }
-        maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
-        maven { url 'https://oss.sonatype.org/content/groups/public/' }
-        maven { url 'https://maven.enginehub.org/repo/' }
-        maven { url 'https://ci.ender.zone/plugin/repository/project/' }
-        maven { url 'https://ci.ender.zone/plugin/repository/everything/' }
-        maven { url 'https://repo.md-5.net/content/repositories/snapshots/' }
-        maven { url 'https://repo.dmulloy2.net/nexus/repository/public/' }
-        maven { url 'https://papermc.io/repo/repository/maven-public/' }
-        maven { url 'https://repo.maven.apache.org/maven2/' }
-        maven { url 'https://repo.dustplanet.de/artifactory/ext-release-local/' }
-        maven { url 'https://maven.seyfahni.de/repository/snapshots/' }
-        maven { url 'https://libraries.minecraft.net/' }
-        maven { url 'https://repo.spongepowered.org/maven/' }
-        maven { url 'https://org.kitteh.pastegg' }
-        maven { url 'https://repo.mikeprimm.com/' }
-        maven { url 'https://maven.sk89q.com/repo/' }
-        maven { url 'https://github.com/factions-site/repo/raw/public/' }
-        maven { url 'https://repo.extendedclip.com/content/repositories/placeholderapi/' }
-    }
-
-    jar {
-        onlyIf { !sourceSets.main.allSource.files.isEmpty() }
-    }
-
-    shadowJar {
-        relocate('com.willfp.libreforge', 'com.willfp.talismans.libreforge')
-        relocate('org.joml', 'com.willfp.talismans.libreforge.joml')
-        relocate('com.willfp.ecomponent', 'com.willfp.talismans.ecomponent')
-    }
-
-    dependencies {
-        compileOnly 'com.willfp:eco:6.48.0'
-        implementation 'com.willfp:libreforge:3.129.5'
-        implementation 'org.joml:joml:1.10.4'
-        implementation 'com.willfp:ecomponent:1.3.0'
-
-        compileOnly 'org.jetbrains:annotations:23.0.0'
-
-        compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.7.10'
-    }
-
-    tasks.withType(JavaCompile) {
-        options.deprecation = true
-        options.encoding = 'UTF-8'
-    }
-
-    processResources {
-        filesNotMatching(["**/*.png", "**/models/**", "**/textures/**", "**lang.yml"]) {
-            expand projectVersion: project.version
-        }
-    }
-
-    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
-        kotlinOptions {
-            jvmTarget = "17"
-            freeCompilerArgs += ["-Xjvm-default=all"]
-        }
-    }
-
-    java.sourceCompatibility = JavaVersion.VERSION_17
-    java.targetCompatibility = JavaVersion.VERSION_17
-
-    compileJava.options.encoding = 'UTF-8'
-    compileJava.dependsOn clean
-
-    build.dependsOn shadowJar
-}
-
-tasks.withType(Jar) {
-    destinationDirectory = file("$rootDir/bin/")
-}
-
-clean.doLast {
-    file("${rootDir}/bin").deleteDir()
-}
-
-shadowJar {
-    archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + ".jar"
-}
-
-jar {
-    archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + " " + "unshaded" + ".jar"
-}
-
-group = 'com.willfp'
-archivesBaseName = project.name
-version = findProperty("version")
-
-compileJava.options.encoding = 'UTF-8'
-
-build.dependsOn shadowJar
-
-task buyThePlugins {
-    dependsOn subprojects.build
-
-    doLast {
-        println 'If you like the plugin, please consider buying it on Spigot or Polymart!'
-        println 'Spigot: https://www.spigotmc.org/resources/authors/auxilor.507394/'
-        println 'Polymart: https://polymart.org/user/auxilor.1107/'
-        println 'Buying gives you access to support and the plugin auto-updater, and it allows me to keep developing plugins.'
-    }
-}
-build.finalizedBy buyThePlugins

build.gradle.kts

@@ -0,0 +1,84 @@
+plugins {
+    java
+    `java-library`
+    `maven-publish`
+    kotlin("jvm") version "1.7.10"
+    id("com.github.johnrengelman.shadow") version "8.0.0"
+    id("com.willfp.libreforge.gradle") version "1.0.0"
+}
+
+group = "com.willfp"
+version = findProperty("version")!!
+val libreforgeVersion = findProperty("libreforge-version")
+
+base {
+    archivesName.set(project.name)
+}
+
+dependencies {
+    project(":eco-core").dependencyProject.subprojects {
+        implementation(this)
+    }
+}
+
+allprojects {
+    apply(plugin = "java")
+    apply(plugin = "kotlin")
+    apply(plugin = "maven-publish")
+    apply(plugin = "com.github.johnrengelman.shadow")
+
+    repositories {
+        mavenLocal()
+        mavenCentral()
+
+        maven("https://repo.papermc.io/repository/maven-public/")
+        maven("https://jitpack.io")
+    }
+
+    dependencies {
+        compileOnly("com.willfp:eco:6.53.0")
+        compileOnly("org.jetbrains:annotations:23.0.0")
+        compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.7.10")
+
+        implementation("com.willfp:ecomponent:1.3.0")
+    }
+
+    java {
+        withSourcesJar()
+        toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+    }
+
+    tasks {
+        shadowJar {
+            relocate("com.willfp.libreforge.loader", "com.willfp.talismans.libreforge.loader")
+            relocate("com.willfp.ecomponent", "com.willfp.talismans.ecomponent")
+        }
+
+        compileKotlin {
+            kotlinOptions {
+                jvmTarget = "17"
+            }
+        }
+
+        compileJava {
+            options.isDeprecation = true
+            options.encoding = "UTF-8"
+
+            dependsOn(clean)
+        }
+
+        processResources {
+            filesMatching(listOf("**plugin.yml", "**eco.yml")) {
+                expand(
+                    "version" to project.version,
+                    "libreforgeVersion" to libreforgeVersion,
+                    "pluginName" to rootProject.name
+                )
+            }
+        }
+
+        build {
+            dependsOn(shadowJar)
+        }
+    }
+}

eco-core/build.gradle

@@ -1,2 +0,0 @@
-group 'com.willfp'
-version rootProject.version

eco-core/build.gradle.kts

@@ -0,0 +1,2 @@
+group = "com.willfp"
+version = rootProject.version

eco-core/core-plugin/build.gradle

@@ -1,17 +0,0 @@
-group 'com.willfp'
-version rootProject.version
-
-dependencies {
-    compileOnly 'org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT'
-    compileOnly 'com.github.ben-manes.caffeine:caffeine:3.0.5'
-}
-
-build.dependsOn publishToMavenLocal
-
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from(components.java)
-        }
-    }
-}

eco-core/core-plugin/build.gradle.kts

@@ -0,0 +1,21 @@
+group = "com.willfp"
+version = rootProject.version
+
+dependencies {
+    compileOnly("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT")
+    compileOnly("com.github.ben-manes.caffeine:caffeine:3.0.5")
+}
+
+publishing {
+    publications {
+        register("maven", MavenPublication::class) {
+            from(components["java"])
+        }
+    }
+}
+
+tasks {
+    build {
+        dependsOn(publishToMavenLocal)
+    }
+}

eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/TalismansPlugin.kt

@@ -2,7 +2,10 @@ package com.willfp.talismans
 
 import com.willfp.eco.core.command.impl.PluginCommand
 import com.willfp.eco.core.display.DisplayModule
-import com.willfp.libreforge.LibReforgePlugin
+import com.willfp.libreforge.loader.LibreforgePlugin
+import com.willfp.libreforge.loader.configs.ConfigCategory
+import com.willfp.libreforge.registerHolderProvider
+import com.willfp.libreforge.registerPlayerRefreshFunction
 import com.willfp.talismans.bag.TalismanBag
 import com.willfp.talismans.command.CommandTalismans
 import com.willfp.talismans.display.TalismanDisplay
@@ -10,10 +13,9 @@ import com.willfp.talismans.talismans.Talismans
 import com.willfp.talismans.talismans.util.BlockPlaceListener
 import com.willfp.talismans.talismans.util.DiscoverRecipeListener
 import com.willfp.talismans.talismans.util.TalismanChecks
-import com.willfp.talismans.talismans.util.TalismanEnableListeners
 import org.bukkit.event.Listener
 
-class TalismansPlugin : LibReforgePlugin() {
+class TalismansPlugin : LibreforgePlugin() {
     init {
         instance = this
 
@@ -22,14 +24,13 @@ class TalismansPlugin : LibReforgePlugin() {
         }
 
         registerHolderProvider { TalismanChecks.getTalismansOnPlayer(it) }
+        registerPlayerRefreshFunction { TalismanChecks.clearCache(it) }
     }
 
-    override fun handleEnableAdditional() {
-        this.copyConfigs("talismans")
-    }
-
-    override fun handleReloadAdditional() {
-        logger.info("${Talismans.values().size} Talismans Loaded")
+    override fun loadConfigCategories(): List<ConfigCategory> {
+        return listOf(
+            Talismans
+        )
     }
 
     override fun loadPluginCommands(): List<PluginCommand> {
@@ -41,7 +42,6 @@ class TalismansPlugin : LibReforgePlugin() {
     override fun loadListeners(): List<Listener> {
         return listOf(
             BlockPlaceListener(),
-            TalismanEnableListeners(this),
             DiscoverRecipeListener(this)
         )
     }
@@ -54,4 +54,4 @@ class TalismansPlugin : LibReforgePlugin() {
         @JvmStatic
         lateinit var instance: TalismansPlugin
     }
-}
+}

eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/bag/TalismanBag.kt

@@ -16,9 +16,7 @@ import com.willfp.eco.core.placeholder.PlayerPlaceholder
 import com.willfp.eco.core.recipe.parts.EmptyTestableItem
 import com.willfp.eco.util.MenuUtils
 import com.willfp.ecomponent.menuStateVar
-import com.willfp.talismans.talismans.Talisman
 import com.willfp.talismans.talismans.util.TalismanChecks
-import com.willfp.talismans.talismans.util.TalismanUtils
 import org.bukkit.Material
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack

eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/command/CommandGive.kt

@@ -69,7 +69,7 @@ class CommandGive(plugin: EcoPlugin) : Subcommand(plugin, "give", "talismans.com
         val completions = mutableListOf<String>()
 
         if (args.isEmpty()) {
-            return Talismans.values().map { it.id }
+            return Talismans.values().map { it.id.key }
         }
 
         if (args.size == 1) {
@@ -83,7 +83,7 @@ class CommandGive(plugin: EcoPlugin) : Subcommand(plugin, "give", "talismans.com
         if (args.size == 2) {
             StringUtil.copyPartialMatches(
                 args[1],
-                Talismans.values().map { it.id },
+                Talismans.values().map { it.id.key },
                 completions
             )
         }

eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/command/CommandTalismans.kt

@@ -1,28 +1,14 @@
 package com.willfp.talismans.command
 
+import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.command.impl.PluginCommand
-import com.willfp.libreforge.LibReforgePlugin
-import com.willfp.libreforge.lrcdb.CommandExport
-import com.willfp.libreforge.lrcdb.CommandImport
-import com.willfp.libreforge.lrcdb.ExportableConfig
-import com.willfp.talismans.talismans.Talismans
 import org.bukkit.command.CommandSender
 
-class CommandTalismans(plugin: LibReforgePlugin)
-    : PluginCommand(plugin, "talismans", "talismans.command.talismans", false) {
+class CommandTalismans(plugin: EcoPlugin) : PluginCommand(plugin, "talismans", "talismans.command.talismans", false) {
     init {
         addSubcommand(CommandReload(plugin))
             .addSubcommand(CommandGive(plugin))
             .addSubcommand(CommandBag(plugin))
-            .addSubcommand(CommandImport("talismans", plugin))
-            .addSubcommand(CommandExport(plugin) {
-                Talismans.values().map {
-                    ExportableConfig(
-                        it.id,
-                        it.config
-                    )
-                }
-            })
     }
 
     override fun onExecute(sender: CommandSender, args: List<String>) {

eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/display/TalismanDisplay.kt

@@ -9,6 +9,7 @@ import com.willfp.talismans.talismans.util.TalismanUtils
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
 
+@Suppress("DEPRECATION")
 class TalismanDisplay(plugin: EcoPlugin) : DisplayModule(plugin, DisplayPriority.LOWEST) {
     override fun display(
         itemStack: ItemStack,
@@ -35,7 +36,7 @@ class TalismanDisplay(plugin: EcoPlugin) : DisplayModule(plugin, DisplayPriority
         lore.addAll(itemLore)
 
         if (player != null) {
-            val lines = talisman.getNotMetLines(player).map { Display.PREFIX + it }
+            val lines = talisman.conditions.getNotMetLines(player).map { Display.PREFIX + it }
 
             if (lines.isNotEmpty()) {
                 lore.add(Display.PREFIX)

eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/talismans/Talisman.kt

@@ -8,24 +8,26 @@ import com.willfp.eco.core.items.builder.ItemStackBuilder
 import com.willfp.eco.core.recipe.Recipes
 import com.willfp.eco.core.recipe.parts.EmptyTestableItem
 import com.willfp.eco.core.recipe.recipes.CraftingRecipe
+import com.willfp.eco.core.registry.Registrable
 import com.willfp.libreforge.Holder
+import com.willfp.libreforge.ViolationContext
 import com.willfp.libreforge.conditions.Conditions
 import com.willfp.libreforge.effects.Effects
 import com.willfp.talismans.TalismansPlugin
 import com.willfp.talismans.talismans.util.TalismanChecks
 import com.willfp.talismans.talismans.util.TalismanUtils
-import org.apache.commons.lang.Validate
+import org.apache.commons.lang3.Validate
 import org.bukkit.NamespacedKey
 import org.bukkit.inventory.ItemStack
 import org.bukkit.persistence.PersistentDataType
-import java.util.*
+import java.util.Objects
 
 class Talisman(
-    override val id: String,
+    id: String,
     val config: Config,
     private val plugin: TalismansPlugin
-) : Holder {
-    val key: NamespacedKey = plugin.namespacedKeyFactory.create(id)
+) : Holder, Registrable {
+    override val id: NamespacedKey = plugin.namespacedKeyFactory.create(id)
 
     val name = config.getFormattedString("name")
 
@@ -33,7 +35,7 @@ class Talisman(
 
     private val _itemStack: ItemStack = run {
         val item = Items.lookup(config.getString("item"))
-        Validate.isTrue(item !is EmptyTestableItem, "Item specified in " + key.key + " is invalid!")
+        Validate.isTrue(item !is EmptyTestableItem, "Item specified in $id is invalid!")
         TalismanUtils.registerTalismanMaterial(item.item.type)
 
         ItemStackBuilder(item.item)
@@ -53,16 +55,16 @@ class Talisman(
         if (craftable) {
             Recipes.createAndRegisterRecipe(
                 plugin,
-                key.key,
+                id,
                 itemStack,
                 config.getStrings("recipe"),
-                "talismans.fromtable.${key.key}"
+                "talismans.fromtable.$id"
             )
         } else null
     }
 
     val customItem = CustomItem(
-        key,
+        this.id,
         { test -> TalismanChecks.getTalismanOnItem(test) == this },
         itemStack
     ).apply { register() }
@@ -72,16 +74,16 @@ class Talisman(
 
     override val effects = Effects.compile(
         config.getSubsections("effects"),
-        "Talisman $id"
+        ViolationContext(plugin, "Talisman $id")
     )
 
     override val conditions = Conditions.compile(
         config.getSubsections("conditions"),
-        "Talisman $id"
+        ViolationContext(plugin, "Talisman $id")
     )
 
-    init {
-        Talismans.addNewTalisman(this)
+    override fun getID(): String {
+        return this.id.key
     }
 
     override fun equals(other: Any?): Boolean {
@@ -91,16 +93,16 @@ class Talisman(
         if (other !is Talisman) {
             return false
         }
-        return key == other.key
+        return this.id == other.id
     }
 
     override fun hashCode(): Int {
-        return Objects.hash(key)
+        return Objects.hash(this.id)
     }
 
     override fun toString(): String {
         return ("Talisman{"
-                + key
+                + id
                 + "}")
     }
-}
+}

eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/talismans/Talismans.kt

@@ -1,19 +1,23 @@
 package com.willfp.talismans.talismans
 
-import com.google.common.collect.BiMap
-import com.google.common.collect.HashBiMap
 import com.google.common.collect.ImmutableList
 import com.willfp.eco.core.config.ConfigType
+import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.eco.core.config.readConfig
 import com.willfp.eco.core.config.updating.ConfigUpdater
+import com.willfp.eco.core.registry.Registry
+import com.willfp.libreforge.loader.LibreforgePlugin
+import com.willfp.libreforge.loader.configs.ConfigCategory
+import com.willfp.libreforge.loader.configs.LegacyLocation
 import com.willfp.talismans.TalismansPlugin
 import java.io.File
 
-object Talismans {
-    /**
-     * Registered talismans.
-     */
-    private val BY_ID: BiMap<String, Talisman> = HashBiMap.create()
+object Talismans : ConfigCategory("talisman", "talismans") {
+    private val registry = Registry<Talisman>()
+
+    override val legacyLocation: LegacyLocation = LegacyLocation(
+        "talismans", "talismans", emptyList()
+    )
 
     /**
      * Get all registered [Talisman]s.
@@ -22,7 +26,7 @@ object Talismans {
      */
     @JvmStatic
     fun values(): List<Talisman> {
-        return ImmutableList.copyOf(BY_ID.values)
+        return ImmutableList.copyOf(registry.values())
     }
 
     /**
@@ -33,50 +37,14 @@ object Talismans {
      */
     @JvmStatic
     fun getByID(name: String): Talisman? {
-        return BY_ID[name]
+        return registry[name]
     }
 
-    /**
-     * Update all [Talisman]s.
-     *
-     * @param plugin Instance of Talismans.
-     */
-    @ConfigUpdater
-    @JvmStatic
-    fun update(plugin: TalismansPlugin) {
-        for (talisman in values()) {
-            removeTalisman(talisman)
-        }
-
-        for ((id, config) in plugin.fetchConfigs("talismans")) {
-            addNewTalisman(Talisman(id, config, plugin))
-        }
-
-        val talismansYml = File(plugin.dataFolder, "talismans.yml").readConfig(ConfigType.YAML)
-
-        for (setConfig in talismansYml.getSubsections("talismans")) {
-            addNewTalisman(Talisman(setConfig.getString("id"), setConfig, plugin))
-        }
+    override fun clear(plugin: LibreforgePlugin) {
+        registry.clear()
     }
 
-    /**
-     * Add new [Talisman] to Talismans.
-     *
-     * @param talisman The [Talisman] to add.
-     */
-    @JvmStatic
-    fun addNewTalisman(talisman: Talisman) {
-        BY_ID.remove(talisman.id)
-        BY_ID[talisman.id] = talisman
+    override fun acceptConfig(plugin: LibreforgePlugin, id: String, config: Config) {
+        registry.register(Talisman(id, config, plugin as TalismansPlugin))
     }
-
-    /**
-     * Remove [Talisman] from Talismans.
-     *
-     * @param talisman The [Talisman] to remove.
-     */
-    @JvmStatic
-    fun removeTalisman(talisman: Talisman) {
-        BY_ID.remove(talisman.id)
-    }
-}
+}

eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/talismans/util/TalismanChecks.kt

@@ -5,6 +5,7 @@ import com.github.benmanes.caffeine.cache.Caffeine
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.config.updating.ConfigUpdater
 import com.willfp.eco.core.fast.fast
+import com.willfp.libreforge.ItemProvidedHolder
 import com.willfp.talismans.TalismansPlugin.Companion.instance
 import com.willfp.talismans.talismans.Talisman
 import com.willfp.talismans.talismans.Talismans.getByID
@@ -20,7 +21,7 @@ import java.util.concurrent.TimeUnit
 import java.util.function.Function
 
 object TalismanChecks {
-    private val CACHED_TALISMANS: Cache<Player, Set<Talisman>> = Caffeine.newBuilder()
+    private val CACHED_TALISMANS: Cache<Player, Set<ItemProvidedHolder>> = Caffeine.newBuilder()
         .expireAfterWrite(2, TimeUnit.SECONDS)
         .build()
 
@@ -52,7 +53,7 @@ object TalismanChecks {
         }
         val meta = item.itemMeta ?: return false
         val container = meta.persistentDataContainer
-        return container.has(talisman.key, PersistentDataType.INTEGER)
+        return container.has(talisman.id, PersistentDataType.INTEGER)
     }
 
     /**
@@ -120,7 +121,7 @@ object TalismanChecks {
                         }
                         val state = meta.blockState
                         if (state is ShulkerBox) {
-                            contents.addAll(state.inventory.contents)
+                            contents.addAll(state.inventory.contents.filterNotNull())
                             continue
                         }
                     }
@@ -165,9 +166,13 @@ object TalismanChecks {
     fun getTalismansOnPlayer(
         player: Player,
         vararg extra: ItemStack?
-    ): Set<Talisman> {
+    ): Set<ItemProvidedHolder> {
         return CACHED_TALISMANS.get(player) {
-            getTalismanItemsOnPlayer(it, *extra).mapNotNull { itemStack -> getTalismanOnItem(itemStack) }.toSet()
+            getTalismanItemsOnPlayer(player, *extra)
+                .associateWith { itemStack -> getTalismanOnItem(itemStack) }
+                .filterValues { it != null }
+                .map { (itemStack, talisman) -> ItemProvidedHolder(talisman!!, itemStack) }
+                .toSet()
         }
     }
 
@@ -205,7 +210,9 @@ object TalismanChecks {
         player: Player,
         talisman: Talisman
     ): Boolean {
-        return getTalismansOnPlayer(player).contains(talisman)
+        return getTalismansOnPlayer(player)
+            .map { it.holder }
+            .contains(talisman)
     }
 
     /**
@@ -232,4 +239,4 @@ object TalismanChecks {
         readShulkerBoxes = plugin.configYml.getBool("read-shulkerboxes")
         offhandOnly = plugin.configYml.getBool("offhand-only")
     }
-}
+}

eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/talismans/util/TalismanEnableListeners.kt

@@ -1,89 +0,0 @@
-@file:Suppress("UNUSED_PARAMETER")
-
-package com.willfp.talismans.talismans.util
-
-import com.willfp.eco.core.EcoPlugin
-import com.willfp.eco.core.events.ArmorChangeEvent
-import com.willfp.libreforge.updateEffects
-import com.willfp.talismans.talismans.Talismans.values
-import org.bukkit.entity.Player
-import org.bukkit.event.EventHandler
-import org.bukkit.event.Listener
-import org.bukkit.event.entity.EntityPickupItemEvent
-import org.bukkit.event.inventory.InventoryClickEvent
-import org.bukkit.event.player.PlayerDropItemEvent
-import org.bukkit.event.player.PlayerItemHeldEvent
-import org.bukkit.event.player.PlayerJoinEvent
-import org.bukkit.event.player.PlayerQuitEvent
-import org.bukkit.event.player.PlayerRespawnEvent
-
-class TalismanEnableListeners(private val plugin :EcoPlugin) : Listener {
-    @EventHandler
-    fun onItemPickup(event: EntityPickupItemEvent) {
-        if (event.entity !is Player) {
-            return
-        }
-        val player = event.entity as Player
-        if (!TalismanUtils.isTalismanMaterial(event.item.itemStack.type)) {
-            return
-        }
-        refreshPlayer(player)
-    }
-
-    @EventHandler
-    fun onPlayerJoin(event: PlayerJoinEvent) {
-        plugin.scheduler.run { refresh() }
-    }
-
-    @EventHandler
-    fun onPlayerLeave(event: PlayerQuitEvent) {
-        refresh()
-        val player = event.player
-        for (talisman in values()) {
-            for (effect in talisman.effects) {
-                effect.disableFor(player)
-            }
-        }
-    }
-
-    @EventHandler
-    fun onInventoryDrop(event: PlayerDropItemEvent) {
-        if (!TalismanUtils.isTalismanMaterial(event.itemDrop.itemStack.type)) {
-            return
-        }
-        refreshPlayer(event.player)
-    }
-
-    @EventHandler
-    fun onChangeSlot(event: PlayerItemHeldEvent) {
-        refreshPlayer(event.player)
-        plugin.scheduler.run { refreshPlayer(event.player) }
-    }
-
-    @EventHandler
-    fun onArmorChange(event: ArmorChangeEvent) {
-        refreshPlayer(event.player)
-    }
-
-    @EventHandler
-    fun onInventoryClick(event: InventoryClickEvent) {
-        if (event.whoClicked !is Player) {
-            return
-        }
-        refreshPlayer(event.whoClicked as Player)
-    }
-
-    @EventHandler
-    fun onRespawn(event: PlayerRespawnEvent) {
-        plugin.scheduler.run { refreshPlayer(event.player) }
-    }
-
-    private fun refresh() {
-        plugin.server.onlinePlayers.forEach { player: Player -> refreshPlayer(player) }
-    }
-
-    private fun refreshPlayer(player: Player) {
-        TalismanChecks.clearCache(player)
-        player.updateEffects()
-    }
-}

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

@@ -1,21 +0,0 @@
-# Read more about chains: https://plugins.auxilor.io/effects/configuring-an-effect#effect-chains
-
-chains:
-  - id: example_chain
-    effects:
-      - id: teleport
-      - id: potion_effect
-        args:
-          effect: blindness
-          level: 3
-          duration: 30
-          apply_to_player: true
-      - id: send_message
-        args:
-          message: "&fYou have been teleported!"
-          action_bar: true
-      - id: play_sound
-        args:
-          sound: entity_dragon_fireball_explode
-          pitch: 1.5
-          volume: 4

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

@@ -17,48 +17,3 @@ bag:
   title: "Talisman Bag"
   blocked-item: black_stained_glass_pane name:"&cYour talisman bag is not big enough!"
   blocked-item-lore: [ ]
-
-cannot-afford:
-  in-actionbar: true
-  sound:
-    enabled: true
-    sound: "BLOCK_NOTE_BLOCK_PLING"
-    pitch: 0.5
-
-cooldown:
-  in-actionbar: true
-  sound:
-    enabled: true
-    sound: "BLOCK_NOTE_BLOCK_PLING"
-    pitch: 0.5
-
-cannot-afford-type:
-  in-actionbar: true
-  sound:
-    enabled: true
-    sound: "BLOCK_NOTE_BLOCK_PLING"
-    pitch: 0.5
-
-cannot-afford-price:
-  in-actionbar: true
-  sound:
-    enabled: true
-    sound: "BLOCK_NOTE_BLOCK_PLING"
-    pitch: 0.5
-
-point-names: # If you have point names that look ugly (eg souls) then you can map them to nice names to be shown to players.
-  example_point: "Nicely Formatted Point"
-
-use-faster-move-trigger: true # Disable if you want move trigger to detect sub-1-block movements
-raytrace-distance: 80 # The distance that alt_click should check for a location
-
-potions:
-  icon:
-    permanent: true
-    triggered: true
-  ambient:
-    permanent: false
-    triggered: true
-  particles:
-    permanent: false
-    triggered: true

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

@@ -1,3 +1,8 @@
-resource-id: 611
-bstats-id: 9865
-color: "&6"
+environment:
+  - name: libreforge version
+    value: ${libreforgeVersion}
+
+options:
+  resource-id: 611
+  bstats-id: 9865
+  color: "&6"

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

@@ -4,18 +4,6 @@ messages:
   not-player: "&cThis command must be run by a player"
   invalid-command: "&cUnknown subcommand!"
   reloaded: "Reloaded!"
-  cannot-afford: "&cYou can't afford to do this! &fCost: &a$$%cost%"
-  cannot-afford-type: "&cYou can't afford to do this! &fCost: &a%cost% %type%"
-  cannot-afford-price: "&cYou can't afford to do this! &fPrice: %price%"
-  on-cooldown: "&cThis effect is on cooldown! &fTime left: &a%seconds% seconds"
-  cannot-transmit: "&cYou can't transmit here!"
-  must-specify-lrcdb-id: "&cYou must specify the ID of the config to download! Not sure what this means? Go to &alrcdb.auxilor.io"
-  lrcdb-import-error: "&cError importing config: &f%message%"
-  lrcdb-import-success: "&fImported &a%name%&f! Reload the plugin to install it"
-  must-specify-config-name: "&cYou must specify the config name!"
-  invalid-config-name: "&cInvalid config name!"
-  lrcdb-export-error: "&cError exporting config: &f%message%"
-  lrcdb-export-success: "&fExported &a%name%&f! View it on &alrcdb.auxilor.io&f, or share your config ID: &f%id%"
 
   needs-player: "&cYou must specify a player"
   invalid-player: "&cInvalid player!"

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

@@ -1,19 +0,0 @@
-# Options for lrcdb (https://lrcdb.auxilor.io), a website to share configs
-# with other server owners, so you can get more configs without making them
-# yourself!
-
-author: "Unknown Author" # The name attached to configs you export
-
-# Options about automatically sharing configs you create
-share-configs:
-  # If you want all your configs to automatically be publicly available,
-  # set this to true. This really helps out other users!
-  publicly: false
-
-  # If you don't want your configs to be usable to gather information about
-  # plugin usage or to improve the plugins in the future, disable this.
-  # Nothing identifying is shared.
-  enabled: true
-
-# If you disable share-configs, you can still share select configs publicly
-# with /talismans export <config>.

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

@@ -0,0 +1,17 @@
+name: ${pluginName}
+version: ${version}
+main: com.willfp.talismans.TalismansPlugin
+api-version: 1.19
+
+dependencies:
+  - name: eco
+    required: true
+    bootstrap: false
+
+  - name: libreforge
+    required: false
+    bootstrap: false
+
+load-after:
+  - name: eco
+    bootstrap: false

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

@@ -1,23 +1,13 @@
-name: Talismans
-version: ${projectVersion}
+name: ${pluginName}
+version: ${version}
 main: com.willfp.talismans.TalismansPlugin
-api-version: 1.16
+api-version: 1.17
 authors: [ Auxilor ]
 website: willfp.com
 depend:
   - eco
 softdepend:
-  - AureliumSkills
-  - Vault
-  - mcMMO
-  - Jobs
-  - TMMobcoins
-  - EcoEnchants
-  - EcoBosses
-  - EcoArmor
-  - EcoItems
-  - EcoSkills
-  - Boosters
+  - libreforge
 commands:
   talismans:
     description: Parent command.
@@ -37,8 +27,6 @@ permissions:
       talismans.command.give: true
       talismans.command.bag: true
       talismans.command.reload: true
-      talismans.command.import: true
-      talismans.command.export: true
       talismans.fromtable.*: true
 
   talismans.command.reload:
@@ -47,12 +35,6 @@ permissions:
   talismans.command.give:
     description: Allows the use of /talismans give.
     default: op
-  talismans.command.import:
-    description: Allows the use of /talismans import.
-    default: op
-  talismans.command.export:
-    description: Allows the use of /talismans export.
-    default: op
   talismans.command.bag:
     description: Allows the use of /talismans bag.
     default: true

gradle.properties

@@ -1,4 +1,5 @@
 #libreforge-updater
-#Mon Mar 13 13:40:15 GMT 2023
-version=5.138.8
-plugin-name=Talismans
+#Mon Mar 13 13:39:16 GMT 2023
+kotlin.code.style=official
+libreforge-version=4.0.0
+version=6.0.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

settings.gradle

@@ -1,5 +0,0 @@
-rootProject.name = 'Talismans'
-
-// Core
-include ':eco-core'
-include ':eco-core:core-plugin'

settings.gradle.kts

@@ -0,0 +1,14 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        mavenLocal()
+        maven("https://repo.jpenilla.xyz/snapshots/")
+        maven("https://jitpack.io")
+    }
+}
+
+rootProject.name = "Talismans"
+
+// Core
+include(":eco-core")
+include(":eco-core:core-plugin")