diff --git a/build.gradle b/build.gradle deleted file mode 100644 index d61da37..0000000 --- a/build.gradle +++ /dev/null @@ -1,118 +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: 'kotlin' - apply plugin: 'java' - 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://papermc.io/repo/repository/maven-public/' } - maven { url 'https://repo.rosewooddev.io/repository/public/' } - } - - jar { - onlyIf { !sourceSets.main.allSource.files.isEmpty() } - } - - shadowJar { - relocate('com.willfp.libreforge', 'com.willfp.reforges.libreforge') - relocate('com.willfp.ecomponent', 'com.willfp.reforges.ecomponent') - relocate('org.joml', 'com.willfp.reforges.libreforge.joml') - } - - dependencies { - compileOnly 'com.willfp:eco:6.46.0' - implementation 'com.willfp:libreforge:3.129.5' - implementation 'com.willfp:ecomponent:1.3.0' - implementation 'org.joml:joml:1.10.4' - - compileOnly 'org.jetbrains:annotations:23.0.0' - compileOnly 'com.github.ben-manes.caffeine:caffeine:3.0.6' - - compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.7.10' - } - - tasks.withType(JavaCompile) { - options.deprecation = true - options.encoding = 'UTF-8' - } - - processResources { - filesMatching(["**plugin.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") + ".jar" -} - -group = 'com.willfp' -archivesBaseName = project.name -version = findProperty("version") - -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 diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..621e1af --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,82 @@ +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") + } + + java { + withSourcesJar() + toolchain.languageVersion.set(JavaLanguageVersion.of(17)) + } + + tasks { + shadowJar { + relocate("com.willfp.libreforge.loader", "com.willfp.reforges.libreforge.loader") + relocate("com.willfp.ecomponent", "com.willfp.reforges.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) + } + } +} diff --git a/eco-core/build.gradle b/eco-core/build.gradle deleted file mode 100644 index 2f7415f..0000000 --- a/eco-core/build.gradle +++ /dev/null @@ -1,2 +0,0 @@ -group 'com.willfp' -version rootProject.version diff --git a/eco-core/build.gradle.kts b/eco-core/build.gradle.kts new file mode 100644 index 0000000..5f8f296 --- /dev/null +++ b/eco-core/build.gradle.kts @@ -0,0 +1,2 @@ +group = "com.willfp" +version = rootProject.version diff --git a/eco-core/core-plugin/build.gradle b/eco-core/core-plugin/build.gradle deleted file mode 100644 index 0d4cc01..0000000 --- a/eco-core/core-plugin/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -group 'com.willfp' -version rootProject.version - -dependencies { - compileOnly fileTree(dir: '../../lib', include: ['*.jar']) - compileOnly 'io.papermc.paper:paper-api:1.17.1-R0.1-SNAPSHOT' - compileOnly 'com.github.MilkBowl:VaultAPI:1.7' - compileOnly 'com.willfp:EcoSkills:1.4.0' - compileOnly 'com.willfp:Talismans:5.28.2' - compileOnly 'com.github.Archy-X:AureliumSkills:Beta1.2.4' -} - -build.dependsOn publishToMavenLocal - -publishing { - publications { - maven(MavenPublication) { - from(components.java) - } - } -} \ No newline at end of file diff --git a/eco-core/core-plugin/build.gradle.kts b/eco-core/core-plugin/build.gradle.kts new file mode 100644 index 0000000..8645ce2 --- /dev/null +++ b/eco-core/core-plugin/build.gradle.kts @@ -0,0 +1,24 @@ +group = "com.willfp" +version = rootProject.version + +dependencies { + compileOnly("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT") + compileOnly("com.willfp:Talismans:6.0.0") + compileOnly("com.benmanes.caffeine:caffeine:3.0.2") + + implementation("com.willfp:ecomponent:1.3.0") +} + +publishing { + publications { + register("maven", MavenPublication::class) { + from(components["java"]) + } + } +} + +tasks { + build { + dependsOn(publishToMavenLocal) + } +} 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 1cd0083..80b5400 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,7 +4,10 @@ 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.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.reforges.commands.CommandReforge import com.willfp.reforges.commands.CommandReforges import com.willfp.reforges.config.TargetYml @@ -14,11 +17,10 @@ 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.ReforgeEnableListeners import com.willfp.reforges.util.ReforgeLookup import org.bukkit.event.Listener -class ReforgesPlugin : LibReforgePlugin() { +class ReforgesPlugin : LibreforgePlugin() { val targetYml: TargetYml = TargetYml(this) @@ -26,22 +28,23 @@ class ReforgesPlugin : LibReforgePlugin() { instance = this } - override fun handleEnableAdditional() { - this.copyConfigs("reforges") - - Items.registerArgParser(ReforgeArgParser()) - registerHolderProvider { ReforgeLookup.provideReforges(it) } + override fun loadConfigCategories(): List { + return listOf( + Reforges + ) } - override fun handleReloadAdditional() { - logger.info(Reforges.values().size.toString() + " Reforges Loaded") + override fun handleEnable() { + Items.registerArgParser(ReforgeArgParser) + + registerHolderProvider { ReforgeLookup.provideReforges(it) } + registerPlayerRefreshFunction { ReforgeLookup.clearCache(it) } } override fun loadListeners(): List { return listOf( DiscoverRecipeListener(this), AntiPlaceListener(), - ReforgeEnableListeners(this) ) } @@ -56,7 +59,7 @@ class ReforgesPlugin : LibReforgePlugin() { return ReforgesDisplay(this) } - override fun loadAdditionalIntegrations(): List { + override fun loadIntegrationLoaders(): List { return listOf( IntegrationLoader("Talismans") { TalismansIntegration.registerProvider() } ) @@ -70,4 +73,4 @@ class ReforgesPlugin : LibReforgePlugin() { lateinit var instance: ReforgesPlugin private set } -} \ No newline at end of file +} diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/commands/CommandApply.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/commands/CommandApply.kt index c1179f2..f7a0ce3 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/commands/CommandApply.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/commands/CommandApply.kt @@ -57,12 +57,12 @@ class CommandApply( val completions = mutableListOf() if (args.isEmpty()) { // Currently, this case is not ever reached - return Reforges.values().map { it.id } + return Reforges.values().map { it.id.key } } if (args.size == 1) { StringUtil.copyPartialMatches( args[0], - Reforges.values().map { it.id }, + Reforges.values().map { it.id.key }, completions ) completions.sort() diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/commands/CommandGive.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/commands/CommandGive.kt index 2aeef61..21fde07 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/commands/CommandGive.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/commands/CommandGive.kt @@ -58,7 +58,7 @@ class CommandGive( val completions = mutableListOf() if (args.isEmpty()) { // Currently, this case is not ever reached - return Reforges.values().filter { it.requiresStone }.map { it.id } + return Reforges.values().filter { it.requiresStone }.map { it.id.key } } if (args.size == 1) { StringUtil.copyPartialMatches( @@ -71,7 +71,7 @@ class CommandGive( if (args.size == 2) { StringUtil.copyPartialMatches( args[1], - Reforges.values().filter { it.requiresStone }.map { it.id }, + Reforges.values().filter { it.requiresStone }.map { it.id.key }, completions ) completions.sort() diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/commands/CommandReforges.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/commands/CommandReforges.kt index 9757e4b..4e2aad5 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/commands/CommandReforges.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/commands/CommandReforges.kt @@ -1,14 +1,10 @@ package com.willfp.reforges.commands +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.reforges.reforges.Reforges import org.bukkit.command.CommandSender -class CommandReforges(plugin: LibReforgePlugin) : +class CommandReforges(plugin: EcoPlugin) : PluginCommand(plugin, "reforges", "reforges.command.reforges", false) { override fun onExecute(sender: CommandSender, args: List) { sender.sendMessage( @@ -21,14 +17,5 @@ class CommandReforges(plugin: LibReforgePlugin) : .addSubcommand(CommandGive(plugin)) .addSubcommand(CommandOpen(plugin)) .addSubcommand(CommandApply(plugin)) - .addSubcommand(CommandImport("reforges", plugin)) - .addSubcommand(CommandExport(plugin) { - Reforges.values().map { - ExportableConfig( - it.id, - it.config - ) - } - }) } } 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 0ff4b6c..ec1e9d6 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 @@ -111,7 +111,7 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin if (player != null) { - val lines = reforge.getNotMetLines(player).map { Display.PREFIX + it } + val lines = reforge.conditions.getNotMetLines(player).map { Display.PREFIX + it } if (lines.isNotEmpty()) { lore.add(Display.PREFIX) 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 58db81d..ed9a20e 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 @@ -8,8 +8,10 @@ import com.willfp.eco.core.items.Items import com.willfp.eco.core.items.builder.ItemStackBuilder import com.willfp.eco.core.price.ConfiguredPrice import com.willfp.eco.core.recipe.Recipes +import com.willfp.eco.core.registry.Registrable import com.willfp.eco.util.StringUtils 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.reforges.ReforgesPlugin @@ -20,10 +22,10 @@ import java.util.Objects @Suppress("DEPRECATION") class Reforge( - override val id: String, + id: String, internal val config: Config, plugin: ReforgesPlugin -) : Holder { +) : Holder, Registrable { val name = config.getFormattedString("name") val namePrefixComponent = StringUtils.toComponent("$name ").decoration(TextDecoration.ITALIC, false) @@ -34,14 +36,16 @@ class Reforge( override val effects = Effects.compile( config.getSubsections("effects"), - "Reforge $id" + ViolationContext(plugin, "Reforge $id") ) override val conditions = Conditions.compile( config.getSubsections("conditions"), - "Reforge $id" + ViolationContext(plugin, "Reforge $id") ) + override val id = plugin.createNamespacedKey(id) + val requiresStone = config.getBool("stone.enabled") val stone: ItemStack = ItemStackBuilder(Items.lookup(config.getString("stone.item")).item).apply { @@ -64,15 +68,13 @@ class Reforge( } ) } + else -> ConfiguredPrice.createOrFree(config.getSubsection("stone.price")) } } else null init { - Reforges.addNewReforge(this) - stone.reforgeStone = this - Display.display(stone) if (config.getBool("stone.enabled")) { CustomItem( @@ -96,6 +98,10 @@ class Reforge( return targets.any { target -> target.items.any { it.matches(item) } } } + override fun getID(): String { + return this.id.key + } + override fun equals(other: Any?): Boolean { if (this === other) { return true diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/Reforges.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/Reforges.kt index bca114d..846d188 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/Reforges.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/Reforges.kt @@ -1,17 +1,26 @@ package com.willfp.reforges.reforges -import com.google.common.collect.HashBiMap import com.google.common.collect.ImmutableSet 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.chains.EffectChains +import com.willfp.libreforge.loader.LibreforgePlugin +import com.willfp.libreforge.loader.configs.ConfigCategory +import com.willfp.libreforge.loader.configs.LegacyLocation import com.willfp.reforges.ReforgesPlugin import java.io.File @Suppress("UNUSED") -object Reforges { - private val BY_KEY = HashBiMap.create() +object Reforges : ConfigCategory("reforge", "reforges") { + private val registry = Registry() + + override val legacyLocation = LegacyLocation( + "reforges.yml", + "reforges" + ) /** * Get all registered [Reforge]s. @@ -20,17 +29,7 @@ object Reforges { */ @JvmStatic fun values(): Set { - return ImmutableSet.copyOf(BY_KEY.values) - } - - /** - * Get [String]s for all registered [Reforge]s. - * - * @return A list of all [Reforge]s. - */ - @JvmStatic - fun keySet(): Set { - return ImmutableSet.copyOf(BY_KEY.keys) + return ImmutableSet.copyOf(registry.values()) } /** @@ -43,55 +42,14 @@ object Reforges { fun getByKey(key: String?): Reforge? { return if (key == null) { null - } else BY_KEY[key] + } else registry[key] } - /** - * Update all [Reforge]s. - * - * @param plugin Instance of Reforges. - */ - @ConfigUpdater - @JvmStatic - fun update(plugin: ReforgesPlugin) { - val reforgesYml = File(plugin.dataFolder, "reforges.yml").readConfig(ConfigType.YAML) - - for (config in reforgesYml.getSubsections("chains")) { - EffectChains.compile(config, "Chains") - } - - for (reforge in values()) { - removeReforge(reforge) - } - - for ((id, config) in plugin.fetchConfigs("reforges")) { - Reforge(id, config, plugin) - } - - for (config in reforgesYml.getSubsections("reforges")) { - Reforge(config.getString("id"), config, plugin) - } + override fun clear(plugin: LibreforgePlugin) { + registry.clear() } - /** - * Remove [Reforge] from Reforges. - * - * @param reforge The [Reforge] to remove. - */ - @JvmStatic - fun removeReforge(reforge: Reforge) { - BY_KEY.remove(reforge.id) - } - - /** - * Add new [Reforge] to Reforges. - * - * Only for internal use, reforges are automatically added in the constructor. - * - * @param reforge The [Reforge] to add. - */ - internal fun addNewReforge(reforge: Reforge) { - BY_KEY.remove(reforge.id) - BY_KEY[reforge.id] = reforge + override fun acceptConfig(plugin: LibreforgePlugin, id: String, config: Config) { + registry.register(Reforge(id, config, plugin as ReforgesPlugin)) } } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/util/ReforgeArgParser.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/util/ReforgeArgParser.kt index e4a1e91..3c05940 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/util/ReforgeArgParser.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/util/ReforgeArgParser.kt @@ -8,7 +8,7 @@ import org.bukkit.inventory.ItemStack import org.bukkit.inventory.meta.ItemMeta import java.util.function.Predicate -class ReforgeArgParser : LookupArgParser { +object ReforgeArgParser : LookupArgParser { override fun parseArguments( args: Array, meta: ItemMeta diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/util/ReforgeEnableListeners.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/util/ReforgeEnableListeners.kt deleted file mode 100644 index 6e9bb4e..0000000 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/util/ReforgeEnableListeners.kt +++ /dev/null @@ -1,84 +0,0 @@ -package com.willfp.reforges.util - -import com.willfp.eco.core.EcoPlugin -import com.willfp.eco.core.events.ArmorChangeEvent -import com.willfp.libreforge.updateEffects -import com.willfp.reforges.reforges.ReforgeTargets -import com.willfp.reforges.reforges.Reforges.values -import com.willfp.reforges.util.ReforgeLookup.clearCache -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 - -@Suppress("UNUSED", "UNUSED_PARAMETER") -class ReforgeEnableListeners(private val plugin: EcoPlugin) : Listener { - @EventHandler - fun onItemPickup(event: EntityPickupItemEvent) { - if (event.entity !is Player) { - return - } - val player = event.entity as Player - if (!ReforgeTargets.ALL.matches(event.item.itemStack)) { - return - } - refreshPlayer(player) - } - - @EventHandler - fun onPlayerJoin(event: PlayerJoinEvent) { - refresh() - } - - @EventHandler - fun onPlayerLeave(event: PlayerQuitEvent) { - refresh() - val player = event.player - for (value in values()) { - for (effect in value.effects) { - effect.disableFor(player) - } - } - } - - @EventHandler - fun onInventoryDrop(event: PlayerDropItemEvent) { - if (!ReforgeTargets.ALL.matches(event.itemDrop.itemStack)) { - 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) - } - - private fun refresh() { - plugin.server.onlinePlayers.forEach { player: Player -> refreshPlayer(player) } - } - - private fun refreshPlayer(player: Player) { - clearCache(player) - player.updateEffects() - } -} \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/util/ReforgeLookup.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/util/ReforgeLookup.kt index 4ddfb02..300935a 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/util/ReforgeLookup.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/util/ReforgeLookup.kt @@ -1,8 +1,8 @@ package com.willfp.reforges.util import com.github.benmanes.caffeine.cache.Caffeine +import com.willfp.libreforge.ItemProvidedHolder import com.willfp.reforges.ReforgesPlugin -import com.willfp.reforges.reforges.Reforge import com.willfp.reforges.reforges.ReforgeTarget import org.bukkit.entity.Player import org.bukkit.inventory.ItemStack @@ -13,12 +13,14 @@ typealias SlotProvider = (Player) -> Map object ReforgeLookup { private val plugin = ReforgesPlugin.instance private val slotProviders = mutableSetOf<(Player) -> Map>() + private val itemCache = Caffeine.newBuilder() .expireAfterWrite(2, TimeUnit.SECONDS) .build>() + private val reforgeCache = Caffeine.newBuilder() .expireAfterWrite(2, TimeUnit.SECONDS) - .build>() + .build>() @JvmStatic fun registerProvider(provider: SlotProvider) { @@ -44,9 +46,9 @@ object ReforgeLookup { } } - fun provideReforges(player: Player): List { + fun provideReforges(player: Player): List { return reforgeCache.get(player) { - val found = mutableListOf() + val found = mutableListOf() for ((itemStack, slot) in provide(player)) { val reforge = itemStack.reforge ?: continue @@ -55,19 +57,18 @@ object ReforgeLookup { continue } } - found.add(reforge) + found.add( + ItemProvidedHolder( + reforge, + itemStack + ) + ) } found }.toList() } - /** - * Clear cache. - * - * @param player The player. - */ - @JvmStatic fun clearCache(player: Player) { itemCache.invalidate(player) reforgeCache.invalidate(player) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/util/ReforgeUtils.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/util/ReforgeUtils.kt index 2a1d312..c3733d6 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/util/ReforgeUtils.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/util/ReforgeUtils.kt @@ -51,7 +51,7 @@ var PersistentDataContainer?.reforge: Reforge? if (value == null) { this.remove(reforgeKey) } else { - this.set(reforgeKey, PersistentDataType.STRING, value.id) + this.set(reforgeKey, PersistentDataType.STRING, value.id.key) } } @@ -91,7 +91,7 @@ var PersistentDataContainer?.reforgeStone: Reforge? if (value == null) { this.remove(reforgeStoneKey) } else { - this.set(reforgeStoneKey, PersistentDataType.STRING, value.id) + this.set(reforgeStoneKey, PersistentDataType.STRING, value.id.key) } } diff --git a/eco-core/core-plugin/src/main/resources/chains.yml b/eco-core/core-plugin/src/main/resources/chains.yml deleted file mode 100644 index e882918..0000000 --- a/eco-core/core-plugin/src/main/resources/chains.yml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/config.yml b/eco-core/core-plugin/src/main/resources/config.yml index 50ac836..0eeaced 100644 --- a/eco-core/core-plugin/src/main/resources/config.yml +++ b/eco-core/core-plugin/src/main/resources/config.yml @@ -155,48 +155,3 @@ reforge: reforged-prefix: - "" - "%reforge%" - -cooldown: - in-actionbar: true - sound: - enabled: true - sound: "BLOCK_NOTE_BLOCK_PLING" - pitch: 0.5 - -cannot-afford: - 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 g_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 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/eco.yml b/eco-core/core-plugin/src/main/resources/eco.yml index 4cf512d..73765c0 100644 --- a/eco-core/core-plugin/src/main/resources/eco.yml +++ b/eco-core/core-plugin/src/main/resources/eco.yml @@ -1,3 +1,8 @@ -resource-id: 1330 -bstats-id: 12412 -color: "&3" \ No newline at end of file +environment: + - name: libreforge version + value: ${libreforgeVersion} + +options: + resource-id: 1330 + bstats-id: 12412 + color: "&3" diff --git a/eco-core/core-plugin/src/main/resources/lang.yml b/eco-core/core-plugin/src/main/resources/lang.yml index 2dbe114..5565a15 100644 --- a/eco-core/core-plugin/src/main/resources/lang.yml +++ b/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%" applied-reforge: "Applied %reforge%&r reforge!" needs-player: "&cYou must specify a player" diff --git a/eco-core/core-plugin/src/main/resources/lrcdb.yml b/eco-core/core-plugin/src/main/resources/lrcdb.yml deleted file mode 100644 index 5098e65..0000000 --- a/eco-core/core-plugin/src/main/resources/lrcdb.yml +++ /dev/null @@ -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 /reforges export . \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/paper-plugin.yml b/eco-core/core-plugin/src/main/resources/paper-plugin.yml new file mode 100644 index 0000000..807e344 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/paper-plugin.yml @@ -0,0 +1,17 @@ +name: ${pluginName} +version: ${version} +main: com.willfp.reforges.ReforgesPlugin +api-version: 1.19 + +dependencies: + - name: eco + required: true + bootstrap: false + + - name: libreforge + required: false + bootstrap: false + +load-after: + - name: eco + bootstrap: false diff --git a/eco-core/core-plugin/src/main/resources/plugin.yml b/eco-core/core-plugin/src/main/resources/plugin.yml index b204c6d..d9c6ffd 100644 --- a/eco-core/core-plugin/src/main/resources/plugin.yml +++ b/eco-core/core-plugin/src/main/resources/plugin.yml @@ -1,24 +1,13 @@ -name: Reforges -version: ${projectVersion} +name: ${pluginName} +version: ${version} main: com.willfp.reforges.ReforgesPlugin -api-version: 1.16 +api-version: 1.17 authors: [ Auxilor ] website: willfp.com depend: - eco softdepend: - - Vault - - AureliumSkills - - PlayerPoints - - Jobs - - TMMobcoins - - EcoEnchants - - EcoBosses - - Talismans - - EcoArmor - - EcoItems - - EcoSkills - - Boosters + - libreforge commands: reforges: @@ -44,8 +33,6 @@ permissions: reforges.command.give: true reforges.command.apply: true reforges.command.open: true - reforges.command.import: true - reforges.command.export: true reforges.command.reload: description: Allows reloading the config @@ -65,9 +52,3 @@ permissions: reforges.command.apply: description: Allows the user of /reforges apply. default: op - reforges.command.import: - description: Allows the user of /reforges import. - default: op - reforges.command.export: - description: Allows the user of /reforges export. - default: op diff --git a/gradle.properties b/gradle.properties index 022364b..9c4074e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,5 @@ #libreforge-updater -#Mon Mar 13 13:39:38 GMT 2023 -version=5.81.7 -plugin-name=Reforges +#Mon Mar 13 13:39:16 GMT 2023 +kotlin.code.style=official +libreforge-version=4.0.0 +version=6.0.0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..41d9927 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e750102..e1bef7e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..1b6c787 100755 --- a/gradlew +++ b/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" "$@" diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 0151cbb..0000000 --- a/settings.gradle +++ /dev/null @@ -1,5 +0,0 @@ -rootProject.name = 'Reforges' - -// Core -include ':eco-core' -include ':eco-core:core-plugin' \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..45c9f8c --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,14 @@ +pluginManagement { + repositories { + gradlePluginPortal() + mavenLocal() + maven("https://repo.jpenilla.xyz/snapshots/") + maven("https://jitpack.io") + } +} + +rootProject.name = "Reforges" + +// Core +include(":eco-core") +include(":eco-core:core-plugin")