From 392a76bad8ec161a5239352f2330e673ef3c2b14 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 28 Mar 2023 14:32:53 +0100 Subject: [PATCH] Updated to libreforge 4 --- build.gradle.kts | 83 ++++-------------- eco-core/core-plugin/build.gradle.kts | 21 +++-- .../com/willfp/ecobosses/EcoBossesPlugin.kt | 31 ++++--- .../com/willfp/ecobosses/bosses/BossUtils.kt | 10 +-- .../com/willfp/ecobosses/bosses/Bosses.kt | 65 ++++---------- .../com/willfp/ecobosses/bosses/EcoBoss.kt | 25 ++++-- .../com/willfp/ecobosses/bosses/EggDisplay.kt | 2 +- ...ommandEcobosses.kt => CommandEcoBosses.kt} | 15 +--- .../willfp/ecobosses/commands/CommandGive.kt | 4 +- .../willfp/ecobosses/commands/CommandSpawn.kt | 2 +- .../ecobosses/lifecycle/ConsoleLoggers.kt | 4 +- .../willfp/ecobosses/spawn/SpawnEggHandler.kt | 3 +- .../ecobosses/spawn/SpawnTotemHandler.kt | 4 +- .../willfp/ecobosses/tick/BossBarTicker.kt | 1 + .../ecobosses/tick/DisplayNameTicker.kt | 1 + .../ecobosses/util/EntityProvidedHolder.kt | 24 +++++ .../willfp/ecobosses/util/LocalBroadcast.kt | 1 + .../core-plugin/src/main/resources/chains.yml | 16 ---- .../core-plugin/src/main/resources/config.yml | 45 ---------- .../core-plugin/src/main/resources/eco.yml | 11 ++- .../core-plugin/src/main/resources/lang.yml | 12 --- .../core-plugin/src/main/resources/lrcdb.yml | 19 ---- .../src/main/resources/paper-plugin.yml | 17 ++++ .../core-plugin/src/main/resources/plugin.yml | 27 +----- gradle.properties | 7 +- gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 59821 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 12 --- settings.gradle.kts | 14 +++ 29 files changed, 176 insertions(+), 302 deletions(-) rename eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/commands/{CommandEcobosses.kt => CommandEcoBosses.kt} (53%) create mode 100644 eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/util/EntityProvidedHolder.kt delete mode 100644 eco-core/core-plugin/src/main/resources/chains.yml delete mode 100644 eco-core/core-plugin/src/main/resources/lrcdb.yml create mode 100644 eco-core/core-plugin/src/main/resources/paper-plugin.yml delete mode 100644 settings.gradle create mode 100644 settings.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts index 430369d..20c5ef9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,11 +3,13 @@ plugins { `java-library` `maven-publish` kotlin("jvm") version "1.7.10" - id("com.github.johnrengelman.shadow") version "7.0.0" + 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) @@ -22,27 +24,22 @@ dependencies { 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") - maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") - maven("https://repo.codemc.org/repository/nms/") - maven("https://repo.codemc.org/repository/maven-public") - maven("https://repo.dmulloy2.net/nexus/repository/public/") - maven("https://papermc.io/repo/repository/maven-public/") maven("https://mvn.lumine.io/repository/maven-public/") } dependencies { - compileOnly("com.willfp:eco:6.44.0") + 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:libreforge:3.129.5") - implementation("org.joml:joml:1.10.4") } java { @@ -51,10 +48,13 @@ allprojects { } tasks { + shadowJar { + relocate("com.willfp.libreforge.loader", "com.willfp.ecobosses.libreforge.loader") + } + compileKotlin { kotlinOptions { jvmTarget = "17" - freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all" } } @@ -66,66 +66,17 @@ allprojects { } processResources { - val ignoreList = listOf("**/*.png", "**/models/**", "**/textures/**", "**lang.yml") - filesNotMatching(ignoreList) { - expand("projectVersion" to project.version) + filesMatching(listOf("**plugin.yml", "**eco.yml")) { + expand( + "version" to project.version, + "libreforgeVersion" to libreforgeVersion, + "pluginName" to rootProject.name + ) } } build { dependsOn(shadowJar) } - - shadowJar { - relocate("com.willfp.libreforge", "com.willfp.ecobosses.libreforge") - relocate("org.joml", "com.willfp.ecobosses.libreforge.joml") - } - } -} - -tasks { - shadowJar { - destinationDirectory.set(file("$rootDir/bin")) - } - - val buyThePlugins by creating { - dependsOn(subprojects.map { it.tasks.getByName("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 { - dependsOn(shadowJar) - dependsOn(publishToMavenLocal) - finalizedBy(buyThePlugins) - } - - clean.get().doLast { file("$rootDir/bin").deleteRecursively() } - - fun fileName(extra: String): String = buildString { - append(findProperty("plugin-name")) - append(" v") - append(findProperty("version")) - if (extra.isNotEmpty()) { - append(" ") - append(extra) - } - append(".jar") - } - - shadowJar.get().archiveFileName.set(fileName("")) - jar.get().archiveFileName.set(fileName("unshaded")) -} - -publishing { - publications { - register("maven", MavenPublication::class) { - from(subprojects.first { it.name == "core-plugin" }.components["java"]) - } } } diff --git a/eco-core/core-plugin/build.gradle.kts b/eco-core/core-plugin/build.gradle.kts index f476d26..f05f36d 100644 --- a/eco-core/core-plugin/build.gradle.kts +++ b/eco-core/core-plugin/build.gradle.kts @@ -2,10 +2,21 @@ group = "com.willfp" version = rootProject.version dependencies { - compileOnly("org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT") - compileOnly("net.kyori:adventure-api:4.9.3") - - // Integrations + compileOnly("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT") compileOnly("com.github.lokka30:LevelledMobs:3.1.4") - compileOnly("com.ticxo.modelengine:api:R3.0.1") + compileOnly("com.ticxo.modelengine:api:R3.1.5") +} + +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/ecobosses/EcoBossesPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/EcoBossesPlugin.kt index 915617c..c73a283 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/EcoBossesPlugin.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/EcoBossesPlugin.kt @@ -6,7 +6,7 @@ import com.willfp.eco.core.integrations.IntegrationLoader import com.willfp.ecobosses.bosses.Bosses import com.willfp.ecobosses.bosses.EggDisplay import com.willfp.ecobosses.bosses.bossHolders -import com.willfp.ecobosses.commands.CommandEcobosses +import com.willfp.ecobosses.commands.CommandEcoBosses import com.willfp.ecobosses.defence.DamageMultiplierHandler import com.willfp.ecobosses.defence.ImmunitiesHandler import com.willfp.ecobosses.defence.MountHandler @@ -21,28 +21,33 @@ import com.willfp.ecobosses.spawn.SpawnEggHandler import com.willfp.ecobosses.spawn.SpawnTotemHandler import com.willfp.ecobosses.util.DiscoverRecipeListener import com.willfp.ecobosses.util.TopDamagerListener -import com.willfp.libreforge.LibReforgePlugin +import com.willfp.libreforge.loader.LibreforgePlugin +import com.willfp.libreforge.loader.configs.ConfigCategory +import com.willfp.libreforge.registerHolderProvider import org.bukkit.event.Listener -class EcoBossesPlugin : LibReforgePlugin() { +class EcoBossesPlugin : LibreforgePlugin() { init { instance = this + } + + override fun loadConfigCategories(): List { + return listOf( + Bosses + ) + } + + override fun handleEnable() { registerHolderProvider { it.bossHolders } } - override fun handleEnableAdditional() { - this.copyConfigs("bosses") - } - - override fun handleReloadAdditional() { + override fun handleReload() { Bosses.getAllAlive().forEach { it.remove() } - logger.info(Bosses.values().size.toString() + " Bosses Loaded") - AutospawnHandler.startSpawning(this) } - override fun handleDisableAdditional() { + override fun handleDisable() { Bosses.getAllAlive().forEach { it.remove() } } @@ -52,7 +57,7 @@ class EcoBossesPlugin : LibReforgePlugin() { override fun loadPluginCommands(): List { return listOf( - CommandEcobosses(this) + CommandEcoBosses(this) ) } @@ -73,7 +78,7 @@ class EcoBossesPlugin : LibReforgePlugin() { ) } - override fun loadAdditionalIntegrations(): List { + override fun loadIntegrationLoaders(): List { return listOf( IntegrationLoader("LevelledMobs") { this.eventManager.registerListener(IntegrationLevelledMobs()) } ) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/BossUtils.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/BossUtils.kt index cc9d6d2..cf211f1 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/BossUtils.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/BossUtils.kt @@ -2,15 +2,15 @@ package com.willfp.ecobosses.bosses import com.willfp.eco.core.fast.fast import com.willfp.ecobosses.EcoBossesPlugin -import com.willfp.libreforge.Holder +import com.willfp.ecobosses.util.EntityProvidedHolder import org.bukkit.entity.Player import org.bukkit.inventory.ItemStack import org.bukkit.persistence.PersistentDataType import kotlin.math.pow -val Player.bossHolders: Iterable +val Player.bossHolders: Collection get() { - val holders = mutableListOf() + val holders = mutableListOf() for (boss in Bosses.values()) { for (livingBoss in boss.getAllAlive()) { @@ -21,7 +21,7 @@ val Player.bossHolders: Iterable } if (entity.location.distanceSquared(this.location) <= boss.influence.pow(2)) { - holders.add(boss) + holders.add(EntityProvidedHolder(boss, entity)) } } } @@ -38,7 +38,7 @@ var ItemStack.bossEgg: EcoBoss? if (value == null) { pdc.remove(spawnEggKey) } else { - pdc.set(spawnEggKey, PersistentDataType.STRING, value.id) + pdc.set(spawnEggKey, PersistentDataType.STRING, value.id.key) } this.itemMeta = meta } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/Bosses.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/Bosses.kt index 0fcce45..67a35b5 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/Bosses.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/Bosses.kt @@ -1,21 +1,29 @@ package com.willfp.ecobosses.bosses -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.ecobosses.EcoBossesPlugin +import com.willfp.libreforge.loader.LibreforgePlugin +import com.willfp.libreforge.loader.configs.ConfigCategory +import com.willfp.libreforge.loader.configs.LegacyLocation import com.willfp.libreforge.separatorAmbivalent import org.bukkit.entity.Entity import org.bukkit.entity.LivingEntity import java.io.File import java.util.UUID -object Bosses { +object Bosses : ConfigCategory("boss", "bosses") { /** Registered bosses. */ - private val BY_ID: BiMap = HashBiMap.create() + private val registry = Registry() + + override val legacyLocation = LegacyLocation( + "ecobosses.yml", + "bosses" + ) /** * Get all registered [EcoBoss]s. @@ -24,7 +32,7 @@ object Bosses { */ @JvmStatic fun values(): List { - return ImmutableList.copyOf(BY_ID.values) + return ImmutableList.copyOf(registry.values()) } /** @@ -35,52 +43,15 @@ object Bosses { */ @JvmStatic fun getByID(name: String): EcoBoss? { - return BY_ID[name] + return registry[name] } - /** - * Update all [EcoBoss]s. - * - * @param plugin Instance of EcoBosses. - */ - @ConfigUpdater - @JvmStatic - fun update(plugin: EcoBossesPlugin) { - for (boss in values()) { - removeBoss(boss) - } - - for ((id, config) in plugin.fetchConfigs("bosses")) { - addNewBoss(EcoBoss(id, config, plugin)) - } - - val ecoBossesYml = File(plugin.dataFolder, "ecobosses.yml").readConfig(ConfigType.YAML) - - for (bossConfig in ecoBossesYml.getSubsections("bosses")) { - // Boss configs are separator ambivalent in order to preserve backwards compatibility - addNewBoss(EcoBoss(bossConfig.getString("id"), bossConfig.separatorAmbivalent(), plugin)) - } + override fun clear(plugin: LibreforgePlugin) { + registry.clear() } - /** - * Add new [EcoBoss] to EcoBosses. - * - * @param set The [EcoBoss] to add. - */ - @JvmStatic - fun addNewBoss(set: EcoBoss) { - BY_ID.remove(set.id) - BY_ID[set.id] = set - } - - /** - * Remove [EcoBoss] from EcoBosses. - * - * @param set The [EcoBoss] to remove. - */ - @JvmStatic - fun removeBoss(set: EcoBoss) { - BY_ID.remove(set.id) + override fun acceptConfig(plugin: LibreforgePlugin, id: String, config: Config) { + registry.register(EcoBoss(id, config, plugin as EcoBossesPlugin)) } /** diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EcoBoss.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EcoBoss.kt index cacf951..d0f7e11 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EcoBoss.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EcoBoss.kt @@ -17,6 +17,7 @@ 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.eco.util.NamespacedKeyUtils import com.willfp.eco.util.toComponent import com.willfp.ecobosses.events.BossKillEvent @@ -38,6 +39,7 @@ import com.willfp.ecobosses.util.SpawnTotem import com.willfp.ecobosses.util.XpReward import com.willfp.ecobosses.util.topDamagers import com.willfp.libreforge.Holder +import com.willfp.libreforge.ViolationContext import com.willfp.libreforge.conditions.Conditions import com.willfp.libreforge.effects.Effects import net.kyori.adventure.bossbar.BossBar @@ -53,10 +55,12 @@ import java.util.Objects import java.util.UUID class EcoBoss( - override val id: String, + id: String, val config: Config, private val plugin: EcoPlugin -) : Holder { +) : Holder, Registrable { + override val id = plugin.createNamespacedKey(id) + val displayName: String = config.getString("display-name") val lifespan = config.getInt("lifespan") @@ -192,9 +196,10 @@ class EcoBoss( ConfiguredGoal(it.getInt("priority"), goal) } - val spawnConditions = config.getSubsections("spawn.conditions").mapNotNull { - Conditions.compile(it, "$id Spawn Conditions") - } + val spawnConditions = Conditions.compile( + config.getSubsections("spawn.conditions"), + ViolationContext(plugin, "$id Spawn Conditions") + ) private val bossBarColor = BossBar.Color.valueOf(config.getString("boss-bar.color").uppercase()) @@ -307,12 +312,12 @@ class EcoBoss( override val conditions = Conditions.compile( config.getSubsections("conditions"), - "Boss ID $id" + ViolationContext(plugin, "Boss ID $id") ) override val effects = Effects.compile( config.getSubsections("effects"), - "Boss ID $id" + ViolationContext(plugin, "Boss ID $id") ) fun markDead(uuid: UUID) { @@ -339,7 +344,7 @@ class EcoBoss( mob.persistentDataContainer.set( plugin.namespacedKeyFactory.create("boss"), PersistentDataType.STRING, - this.id + this.id.key ) if (hasCustomAI) { @@ -470,6 +475,10 @@ class EcoBoss( ) } + override fun getID(): String { + return this.id.key + } + override fun equals(other: Any?): Boolean { if (other !is EcoBoss) { return false diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EggDisplay.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EggDisplay.kt index eefc251..2d78db1 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EggDisplay.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EggDisplay.kt @@ -27,7 +27,7 @@ class EggDisplay( val lines = egg.spawnConditions .filterNot { it.isMet(player) } - .mapNotNull { it.notMetLines?.map { line -> Display.PREFIX + line } } + .map { it.notMetLines.map { line -> Display.PREFIX + line } } .flatten() diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/commands/CommandEcobosses.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/commands/CommandEcoBosses.kt similarity index 53% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/commands/CommandEcobosses.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/commands/CommandEcoBosses.kt index 13ef2a4..7abf9a3 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/commands/CommandEcobosses.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/commands/CommandEcoBosses.kt @@ -2,13 +2,9 @@ package com.willfp.ecobosses.commands import com.willfp.eco.core.command.impl.PluginCommand import com.willfp.ecobosses.EcoBossesPlugin -import com.willfp.ecobosses.bosses.Bosses -import com.willfp.libreforge.lrcdb.CommandExport -import com.willfp.libreforge.lrcdb.CommandImport -import com.willfp.libreforge.lrcdb.ExportableConfig import org.bukkit.command.CommandSender -class CommandEcobosses(plugin: EcoBossesPlugin) : PluginCommand( +class CommandEcoBosses(plugin: EcoBossesPlugin) : PluginCommand( plugin, "ecobosses", "ecobosses.command.ecobosses", @@ -26,14 +22,5 @@ class CommandEcobosses(plugin: EcoBossesPlugin) : PluginCommand( .addSubcommand(CommandKillall(plugin)) .addSubcommand(CommandSpawn(plugin)) .addSubcommand(CommandGive(plugin)) - .addSubcommand(CommandImport("bosses", plugin)) - .addSubcommand(CommandExport(plugin) { - Bosses.values().map { - ExportableConfig( - it.id, - it.config - ) - } - }) } } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/commands/CommandGive.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/commands/CommandGive.kt index 5ad3619..fc4427c 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/commands/CommandGive.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/commands/CommandGive.kt @@ -47,7 +47,7 @@ class CommandGive(plugin: EcoPlugin) : Subcommand( } var message = plugin.langYml.getMessage("give-success") - message = message.replace("%boss%", boss.id).replace("%recipient%", reciever.name) + message = message.replace("%boss%", boss.id.key).replace("%recipient%", reciever.name) sender.sendMessage(message) val itemStack = boss.spawnEgg!! @@ -94,7 +94,7 @@ class CommandGive(plugin: EcoPlugin) : Subcommand( * The cached names. */ private val BOSS_NAMES: List - get() = Bosses.values().map { it.id } + get() = Bosses.values().map { it.id.key } /** diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/commands/CommandSpawn.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/commands/CommandSpawn.kt index 859c286..9c42d5a 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/commands/CommandSpawn.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/commands/CommandSpawn.kt @@ -166,7 +166,7 @@ class CommandSpawn(plugin: EcoBossesPlugin) : Subcommand( * The cached names. */ private val BOSS_NAMES: List - get() = Bosses.values().map { it.id } + get() = Bosses.values().map { it.id.key } /** * The cached numbers. diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/lifecycle/ConsoleLoggers.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/lifecycle/ConsoleLoggers.kt index 9ce388f..aa1c421 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/lifecycle/ConsoleLoggers.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/lifecycle/ConsoleLoggers.kt @@ -1,15 +1,15 @@ package com.willfp.ecobosses.lifecycle +import com.willfp.eco.core.EcoPlugin import com.willfp.ecobosses.events.BossDespawnEvent import com.willfp.ecobosses.events.BossKillEvent import com.willfp.ecobosses.events.BossSpawnEvent -import com.willfp.libreforge.LibReforgePlugin import org.bukkit.event.EventHandler import org.bukkit.event.EventPriority import org.bukkit.event.Listener class ConsoleLoggers( - private val plugin: LibReforgePlugin + private val plugin: EcoPlugin ) : Listener { @EventHandler( ignoreCancelled = true, diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnEggHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnEggHandler.kt index 0b6ee13..d16777a 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnEggHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnEggHandler.kt @@ -3,7 +3,6 @@ package com.willfp.ecobosses.spawn import com.willfp.ecobosses.EcoBossesPlugin import com.willfp.ecobosses.bosses.bossEgg import com.willfp.ecobosses.events.BossSpawnEvent -import com.willfp.libreforge.conditions.isMet import org.bukkit.Bukkit import org.bukkit.Location import org.bukkit.block.Container @@ -79,7 +78,7 @@ class SpawnEggHandler( } if (player != null) { - if (!boss.spawnConditions.isMet(player)) { + if (!boss.spawnConditions.areMet(player)) { return false } } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnTotemHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnTotemHandler.kt index b6569a7..bf6a62f 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnTotemHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnTotemHandler.kt @@ -28,11 +28,13 @@ class SpawnTotemHandler : Listener { middle = event.block.getRelative(0, -1, 0) bottom = event.block.getRelative(0, -2, 0) } + 1 -> { top = event.block.getRelative(0, 2, 0) middle = event.block.getRelative(0, 1, 0) bottom = event.block } + 2 -> { top = event.block.getRelative(0, 1, 0) middle = event.block @@ -52,7 +54,7 @@ class SpawnTotemHandler : Listener { val player = event.player - if (!boss.spawnConditions.all { it.condition.isConditionMet(player, it.config) }) { + if (!boss.spawnConditions.areMet(player)) { return } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/tick/BossBarTicker.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/tick/BossBarTicker.kt index 5a46ff1..5c4fb9d 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/tick/BossBarTicker.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/tick/BossBarTicker.kt @@ -14,6 +14,7 @@ class BossBarTicker( override fun tick(boss: LivingEcoBoss, tick: Int) { val entity = boss.entity + @Suppress("DEPRECATION") bar.name(entity.customName!!.toComponent()) bar.progress((entity.health / entity.getAttribute(Attribute.GENERIC_MAX_HEALTH)!!.value).toFloat()) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/tick/DisplayNameTicker.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/tick/DisplayNameTicker.kt index 17c21f6..177551a 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/tick/DisplayNameTicker.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/tick/DisplayNameTicker.kt @@ -15,6 +15,7 @@ class DisplayNameTicker : BossTicker { val formattedTime = String.format("%d:%02d", timeLeft / 60, timeLeft % 60) + @Suppress("DEPRECATION") entity.customName = boss.boss.displayName .replace("%health%", NumberUtils.format(entity.health)) .replace("%time%", formattedTime) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/util/EntityProvidedHolder.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/util/EntityProvidedHolder.kt new file mode 100644 index 0000000..e036e14 --- /dev/null +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/util/EntityProvidedHolder.kt @@ -0,0 +1,24 @@ +package com.willfp.ecobosses.util + +import com.willfp.libreforge.Holder +import com.willfp.libreforge.ProvidedHolder +import org.bukkit.entity.LivingEntity + +class EntityProvidedHolder( + override val holder: Holder, + override val item: LivingEntity +) : ProvidedHolder { + override fun equals(other: Any?): Boolean { + if (other !is EntityProvidedHolder) { + return false + } + + return other.holder == holder && other.item == item + } + + override fun hashCode(): Int { + var result = holder.hashCode() + result = 31 * result + item.hashCode() + return result + } +} diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/util/LocalBroadcast.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/util/LocalBroadcast.kt index 19ba0f4..fdf7388 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/util/LocalBroadcast.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/util/LocalBroadcast.kt @@ -38,6 +38,7 @@ data class LocalBroadcast( if (radius < 0) { for (message in toBroadcast) { + @Suppress("DEPRECATION") Bukkit.broadcastMessage(message) } } else { 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 5e6a054..0000000 --- a/eco-core/core-plugin/src/main/resources/chains.yml +++ /dev/null @@ -1,16 +0,0 @@ -# Read more about chains: https://plugins.auxilor.io/effects/configuring-an-effect#effect-chains - -chains: - - id: blind - effects: - - id: potion_effect - args: - effect: blindness - level: 3 - duration: 30 - apply_to_player: 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 dea8d1a..0cb9810 100644 --- a/eco-core/core-plugin/src/main/resources/config.yml +++ b/eco-core/core-plugin/src/main/resources/config.yml @@ -8,48 +8,3 @@ log-spawn-kill: true autospawn: one-boss-per-world: true # If only one boss can auto-spawn per world at once. - -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 (e.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 7e10e09..be43918 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: 525 -bstats-id: 10635 -color: "&9" \ No newline at end of file +environment: + - name: libreforge version + value: ${libreforgeVersion} + +options: + resource-id: 525 + bstats-id: 10635 + color: "&9" diff --git a/eco-core/core-plugin/src/main/resources/lang.yml b/eco-core/core-plugin/src/main/resources/lang.yml index c497083..3fb5fef 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%" sent-drop: "Check console for the drop!" specify-boss: "&cYou must specify a valid boss!" 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 ddddd4f..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 /ecobosses 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..74d90d8 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/paper-plugin.yml @@ -0,0 +1,17 @@ +name: ${pluginName} +version: ${version} +main: com.willfp.ecobosses.EcoBossesPlugin +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 953e089..db8a1f9 100644 --- a/eco-core/core-plugin/src/main/resources/plugin.yml +++ b/eco-core/core-plugin/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ -name: EcoBosses -version: ${projectVersion} +name: ${pluginName} +version: ${version} main: com.willfp.ecobosses.EcoBossesPlugin api-version: 1.17 authors: [Auxilor] @@ -7,20 +7,9 @@ website: willfp.com depend: - eco softdepend: + - libreforge - LevelledMobs - AureliumSkills - - Jobs - - mcMMO - - Vault - - TMMobcoins - - EcoEnchants - - Talismans - - EcoArmor - - EcoItems - - EcoSkills - - Boosters - - ModelEngine - - EcoJobs commands: ecobosses: @@ -41,8 +30,6 @@ permissions: ecobosses.command.reload: true ecobosses.command.spawn: true ecobosses.command.give: true - ecobosses.command.import: true - ecobosses.command.export: true ecobosses.command.ecobosses: description: Allows the use of /ecobosses @@ -63,11 +50,3 @@ permissions: ecobosses.command.reload: description: Allows the use of /ecobosses reload default: op - - ecobosses.command.import: - description: Allows the use of /ecobosses import - default: op - - ecobosses.command.export: - description: Allows the use of /ecobosses export - default: op \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index f36f604..67995d0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,5 @@ #libreforge-updater -#Mon Mar 13 13:40:30 GMT 2023 -version=8.115.6 -plugin-name=EcoBosses +#Mon Mar 13 13:39:16 GMT 2023 +kotlin.code.style=official +libreforge-version=4.0.0 +version=9.0.0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..41d9927a4d4fb3f96a785543079b8df6723c946b 100644 GIT binary patch delta 8958 zcmY+KWl$VIlZIh&f(Hri?gR<$?iyT!TL`X;1^2~W7YVSq1qtqM!JWlDxLm%}UESUM zndj}Uny%^UnjhVhFb!8V3s(a#fIy>`VW15{5nuy;_V&a5O#0S&!a4dSkUMz_VHu3S zGA@p9Q$T|Sj}tYGWdjH;Mpp8m&yu&YURcrt{K;R|kM~(*{v%QwrBJIUF+K1kX5ZmF zty3i{d`y0;DgE+de>vN@yYqFPe1Ud{!&G*Q?iUc^V=|H%4~2|N zW+DM)W!`b&V2mQ0Y4u_)uB=P@-2`v|Wm{>CxER1P^ z>c}ZPZ)xxdOCDu59{X^~2id7+6l6x)U}C4Em?H~F`uOxS1?}xMxTV|5@}PlN%Cg$( zwY6c}r60=z5ZA1L zTMe;84rLtYvcm?M(H~ZqU;6F7Evo{P7!LGcdwO|qf1w+)MsnvK5^c@Uzj<{ zUoej1>95tuSvDJ|5K6k%&UF*uE6kBn47QJw^yE&#G;u^Z9oYWrK(+oL97hBsUMc_^ z;-lmxebwlB`Er_kXp2$`&o+rPJAN<`WX3ws2K{q@qUp}XTfV{t%KrsZ5vM!Q#4{V& zq>iO$MCiLq#%wXj%`W$_%FRg_WR*quv65TdHhdpV&jlq<=K^K`&!Kl5mA6p4n~p3u zWE{20^hYpn1M}}VmSHBXl1*-)2MP=0_k)EPr#>EoZukiXFDz?Di1I>2@Z^P$pvaF+ zN+qUy63jek2m59;YG)`r^F3-O)0RDIXPhf)XOOdkmu`3SMMSW(g+`Ajt{=h1dt~ks ztrhhP|L4G%5x79N#kwAHh5N){@{fzE7n&%dnisCm65Za<8r_hKvfx4Bg*`%-*-Mvn zFvn~)VP@}1sAyD+B{{8l{EjD10Av&Mz9^Xff*t`lU=q=S#(|>ls520;n3<}X#pyh& z*{CJf7$*&~!9jMnw_D~ikUKJ2+UnXmN6qak{xx%W;BKuXt7@ky!LPI1qk?gDwG@@o zkY+BkIie>{{q==5)kXw(*t#I?__Kwi>`=+s?Gq6X+vtSsaAO&Tf+Bl$vKnzc&%BHM z=loWOQq~n}>l=EL(5&6((ESsQC3^@4jlO5Od{qN#sWV)vqXw}aA>*uvwZopNN(|-T zRTF%5Y_k1R$;(d-)n;hWex{;7b6KgdAVE@&0pd(*qDzBO#YZV%kh%pYt1`hnQ(Fa& zYiDrOTDqk5M7hzp9kI2h!PxNnuJ&xl*zF8sx6!67bA49R1bmUF5bpK&&{eI0U~cH}PM z3aW1$lRb|ItkG5~_eBNu$|I|vYIdAA9a!pVq<+UTx*M}fG`23zxXp&E=FfnY- zEzKj;Cu_s4v>leO7M2-mE(UzKHL4c$c`3dS*19OpLV^4NI*hWWnJQ9lvzP4c;c?do zqrcsKT*i~eIHl0D3r4N{)+RsB6XhrC^;sp2cf_Eq#6*CV;t8v=V!ISe>>9kPgh}NI z=1UZutslxcT$Ad;_P^;Oouoa(cs!Ctpvi>%aQ+Zp=1d|h{W9Wmf7JWxa(~<#tSZ?C%wu4_5F!fc!<@PIBeJ)Nr^$bB6!_Gic_7}c3J{QI~Gg5g5jTp9}V6KYgrgaX>pJt}7$!wOht&KO|+z{Iw@YL|@~D zMww}+lG}rm2^peNx>58ME||ZQxFQeVSX8iogHLq_vXb`>RnoEKaTWBF-$JD#Q4BMv zt2(2Qb*x-?ur1Y(NsW8AdtX0#rDB?O(Vs4_xA(u-o!-tBG03OI!pQD+2UytbL5>lG z*(F)KacHqMa4?dxa(Vcrw>IIAeB$3cx#;;5r2X;HE8|}eYdAgCw#tpXNy7C3w1q`9 zGxZ6;@1G%8shz9e+!K2MO*{_RjO}Jo6eL3{TSZ>nY7)Qs`Dhi5><@oh0r)gT7H-?3 zLDsd^@m%JvrS8sta5`QiZNs^*GT}Hiy^zjK2^Ni%`Z|ma)D2 zuyumbvw$M8$haCTI~6M%d4+P)uX%u{Sfg4Al+F7c6;O-*)DKI7E8izSOKB#FcV{M+ zEvY0FBkq!$J0EW$Cxl}3{JwV^ki-T?q6C30Y5e&p@8Rd?$ST-Ghn*-`tB{k54W<>F z5I)TFpUC!E9298=sk>m#FI4sUDy_!8?51FqqW!9LN1(zuDnB3$!pEUjL>N>RNgAG~-9Xm|1lqHseW(%v&6K(DZ3Pano(1-Qe?3%J&>0`~w^Q-p&@ zg@HjvhJk?*hpF7$9P|gkzz`zBz_5Z!C4_-%fCcAgiSilzFQef!@amHDrW!YZS@?7C zs2Y9~>yqO+rkih?kXztzvnB^6W=f52*iyuZPv$c42$WK7>PHb z6%MYIr5D32KPdwL1hJf{_#jn?`k(taW?mwmZVvrr=y~fNcV$`}v(8};o9AjOJumS4 z`889O91^pkF+|@$d9wVoZ3;^j;^sUs&Ubo_qD&MTL%O z&*SE0ujG~zm;?x)8TLC&ft))nyI zcg44@*Q{cYT+qGrA=In_X{NNCD+B0w#;@g)jvBU;_8od6U>;7HIo@F*=g8CQUo(u^ z3r4FJ7#<@)MXO&5+DgKE&^>^`r!loe7CWE*1k0*0wLFzSOV8jvlX~WOQ?$1v zk$Or}!;ix0g78^6W;+<=J>z@CBs!<<)HvF(Ls-&`matpesJ5kkjC)6nGB@b{ii6-Uoho$BT%iJgugTOeZ$5Xo4D7Pd< zC*LJh5V@2#5%aBZCgzlQi3@<_!VfiL07ywc)ZbwKPfcR|ElQoS(8x|a7#IR}7#Io= zwg4$8S{egr-NffD)Fg&X9bJSoM25pF&%hf>(T&9bI}=#dPQyNYz;ZZ7EZ=u1n701SWKkZ9n(-qU ztN`sdWL1uxQ1mKS@x11;O|@^AD9!NeoPx}?EKIr!2>1Qq4gjfGU)tr6?Z5l7JAS3j zZeq{vG{rb%DFE4%$szK}d2UzB{4>L?Tv+NAlE*&Nq6g+XauaSI+N2Y8PJLw+aNg1p zbxr|hI8wcMP&&+(Cu|%+Jq|r>+BHk@{AvfBXKiVldN)@}TBS0LdIpnANCVE26WL-} zV}HJ^?m&$Rkq;Zf*i-hoasnpJVyTH__dbGWrB_R55d*>pTyl6(?$EO@>RCmTX1Hzr zT2)rOng?D4FfZ_C49hjMV*UonG2DlG$^+k=Y%|?Dqae4}JOU=8=fgY4Uh!pa9eEqf zFX&WLPu!jArN*^(>|H>dj~g`ONZhaaD%h_HHrHkk%d~TR_RrX{&eM#P@3x=S^%_6h zh=A)A{id16$zEFq@-D7La;kTuE!oopx^9{uA3y<}9 z^bQ@U<&pJV6kq7LRF47&!UAvgkBx=)KS_X!NY28^gQr27P=gKh0+E>$aCx&^vj2uc}ycsfSEP zedhTgUwPx%?;+dESs!g1z}5q9EC+fol}tAH9#fhZQ?q1GjyIaR@}lGCSpM-014T~l zEwriqt~ftwz=@2tn$xP&-rJt?nn5sy8sJ5Roy;pavj@O+tm}d_qmAlvhG(&k>(arz z;e|SiTr+0<&6(-An0*4{7akwUk~Yf4M!!YKj^swp9WOa%al`%R>V7mi z+5+UodFAaPdi4(8_FO&O!Ymb#@yxkuVMrog(7gkj$G@FLA#ENMxG)4f<}S%Fn?Up$+C%{02AgMKa^ z4SFGWp6U>{Q6VRJV}yjxXT*e`1XaX}(dW1F&RNhpTzvCtzuu;LMhMfJ2LBEy?{^GHG!OF!! zDvs64TG)?MX&9NCE#H3(M0K>O>`ca0WT2YR>PTe&tn?~0FV!MRtdb@v?MAUG&Ef7v zW%7>H(;Mm)RJkt18GXv!&np z?RUxOrCfs;m{fBz5MVlq59idhov21di5>WXWD-594L-X5;|@kyWi@N+(jLuh=o+5l zGGTi~)nflP_G}Yg5Pi%pl88U4+^*ihDoMP&zA*^xJE_X*Ah!jODrijCqQ^{=&hD7& z^)qv3;cu?olaT3pc{)Kcy9jA2E8I)#Kn8qO>70SQ5P8YSCN=_+_&)qg)OYBg|-k^d3*@jRAeB?;yd-O1A0wJ z?K*RDm|wE<(PBz~+C%2CTtzCTUohxP2*1kE8Of~{KRAvMrO_}NN&@P7SUO{;zx0iK z@or9R8ydYOFZf(cHASCAatL%;62IL27~SmASr(7F&NMr+#gNw@z1VM z_ALFwo3)SoANEwRerBdRV`>y`t72#aF2ConmWQp(Xy|msN9$yxhZ1jAQ67lq{vbC5 zujj|MlGo`6Bfn0TfKgi(k=gq0`K~W+X(@GzYlPI4g0M;owH3yG14rhK>lG8lS{`!K z+Nc@glT-DGz?Ym?v#Hq|_mEdPAlHH5jZuh*6glq!+>Lk$S%ED2@+ea6CE@&1-9a?s znglt|fmIK}fg<9@XgHe4*q!aO<-;Xj$T?IzB-{&2`#eA6rdtCi80mpP&vw(Uytxu$#YzNI_cB>LS zmim>ys;ir;*Dzbr22ZDxO2s;671&J0U<9(n1yj)J zHFNz=ufPcQVEG+ePjB<5C;=H0{>Mi*xD>hQq8`Vi7TjJ$V04$`h3EZGL|}a07oQdR z?{cR(z+d>arn^AUug&voOzzi$ZqaS)blz-z3zr;10x;oP2)|Cyb^WtN2*wNn`YX!Y z+$Pji<7|!XyMCEw4so}xXLU)p)BA~2fl>y2Tt}o9*BPm?AXA8UE8a;>rOgyCwZBFa zyl42y`bc3}+hiZL_|L_LY29vVerM+BVE@YxK>TGm@dHi@Uw*7AIq?QA9?THL603J% zIBJ4y3n8OFzsOI;NH%DZ!MDwMl<#$)d9eVVeqVl(5ZX$PPbt*p_(_9VSXhaUPa9Qu z7)q4vqYKX7ieVSjOmVEbLj4VYtnDpe*0Y&+>0dS^bJ<8s*eHq3tjRAw^+Mu4W^-E= z4;&namG4G;3pVDyPkUw#0kWEO1;HI6M51(1<0|*pa(I!sj}F^)avrE`ShVMKBz}nE zzKgOPMSEp6M>hJzyTHHcjV%W*;Tdb}1xJjCP#=iQuBk_Eho6yCRVp&e!}4IBJ&?ksVc&u#g3+G$oNlJ?mWfADjeBS-Ph3`DKk-~Z70XugH8sq2eba@4 zIC1H_J$`9b$K`J)sGX3d!&>OmC@@rx1TL~NinQOYy72Q_+^&Mg>Ku(fTgaXdr$p_V z#gav1o{k~c>#)u3r@~6v^o)Lf=C{rAlL@!s457pq)pO;Cojx7U{urO4cvXP|E>+dV zmr2?!-5)tk-&*ap^D^2x7NG6nOop2zNFQ9v8-EZ{WCz-h36C)<^|f{V#R_WE^@(T0+d-at5hXX{U?zak*ac-XnyINo+yBD~~3O1I=a z99|CI>502&s-Qi5bv>^2#cQ%ut<4d7KgQ^kE|=%6#VlGiY8$rdJUH{sra;P~cyb_i zeX(kS%w0C?mjhJl9TZp8RS;N~y3(EXEz13oPhOSE4WaTljGkVXWd~|#)vsG6_76I)Kb z8ro?;{j^lxNsaxE-cfP;g(e;mhh3)&ba}li?woV2#7ByioiD>s%L_D;?#;C#z;a(N z-_WY<=SH42m9bFQ>Nb z@4K$@4l8pD7AKxCR>t0%`Qoy9=hA?<<^Vcj8;-E+oBe3ReW1`el8np8E$k{LgFQ}2 z2t8a`wOXFdJ9!5$&mEfD1CnJ)TB+RJih88-Zos9@HZ# zL#{qfbF0ARTXkR@G{lwlOH~nnL)1jcyu!qv2`57S&%oKz0}r{~l9U_UHaJ5!8#nrs z?2FrL`mxnzu&{bweD&62)ilz*?pYIvt`T!XFVVA78})p1YEy7 z8fK#s?b~Yo$n7&_a?EBdXH-_W)Z44?!;DFx6pZ?~RArtBI*Qm4~6nX6Z_T*i$bQPE;Qz?DAPstpGSqr-AJ zo%m9cA`oDDm?&dTaoh_>@F>a?!y4qt_;NGN9Z<%SS;fX-cSu|>+Pba22`CRb#|HZa z;{)yHE>M-pc1C0mrnT~80!u&dvVTYFV8xTQ#g;6{c<9d!FDqU%TK5T6h*w*p980D~ zUyCb`y3{-?(mJFP)0*-Nt;mI$-gc4VQumh|rs&j_^R{sgTPF`1Xja2YWstsKFuQ(d zmZMxV$p$|qQUXchu&8%J(9|)B?`~rIx&)LqDS>ob5%gTeTP#Sbny#y*rnJ&?(l=!( zoV~}LJ1DPLnF8oyM(2ScrQ0{Q4m4-BWnS4wilgCW-~~;}pw=&<+HggRD_3c@3RQIr z9+-%!%}u_{`YS=&>h%kPO3ce}>y!d-zqiniNR-b5r97u;+K6HA2tS>Z#cV{+eFI`* zd8RMGAUtX1KWfPV;q<-5JAykS+2sY$2~UX+4461a(%{P#{rwFPu0xpIuYlbgD{C7C z=U{FUarVTYX6ZUq3wE@G^QT4H2Re;n$Fz9cJ>hABl)9T8pozqbA1)H-%1=WKm^QMu zjnUZ&Pu>q+X&6Co*y#@pxc-4waKMInEPGmE_>3@Ym3S*dedSradmc5mlJn`i0vMW6 zhBnGQD^Z;&S0lnS0curqDO@({J7kTtRE+Ra?nl^HP9<)W&C>~`!258f$XDbyQOQXG zP8hhySnarOpgu8xv8@WlXnm(Uk~)_3$Sg0vTbU3 z{W!5B(L3{Yy3K5PN<@jEarAtja`}@KYva&zFRF*s+_%jIXh$T(S=an8?=Ry3H*NRqWgsM`&!#|@kf1>=4q%bFw7^Rhz!z5I zyI^zU8_R1WN9`88Z=n>pIZQ`Ixr~_9G%Q}@A7rd#*%y7G zXl^Id=^ZL?Rx}}gWXCqzj9C6;x(~mAH|$JteXa1MH<6UQig@!Hf~t}B%tP0I|H&;y zO6N0}svOa1a^PyP9N5?4W6VF%=Bj{qHUgc8@siw4bafT=UPFSoQqKgyUX>sXTBZ=x zOh^Ad!{kOM9v{%5y}`-8u*T&C7Vq6mD%GR}UeU(*epO&qgC-CkD;%=l)ZuinSzHM` z{@`j&_vC6dDe{Yb9k@1zeV_K6!l(@=6ucoI=R^cH=6{i71%4W3$J-?<8Qn#$-DMtA z6Qqi)t?4ifrt%3jSA#6ji#{f(($KBL-iQh-xrC||3U3lq`9>r)>X%oLvtimuHW-)} zy}>9~|M>w4eES`g7;iBM%Se5-OP%1U6gNWp3AZqT8C6OlFFfQ$|7LL;tBV)(qlp4K zruar^K8FnJN3@_}B;G`a~H`t|3+6d>q3#`ctTkE-D^1#d9NalQ04lH*qUW2!V zhk7#z8OwHhSl8w14;KctfO8ubZJ4$dEdpXE78wABz=n5*=q9ex3S}`e7x~~V-jmHOhtX2*n+pBslo3uosdE7xABK=V#-t{1Hd~?i z{i~%Bw6NYF+F$aK$M`r#xe=NxhA5=p%i7!$);sd>Q}#`G?Q~fygrMXmZw?0#5#17W}6Tj+&kFexG{!mYl5FoA99}3G9l;3lVQ^ z48^~gsVppE*x91WheqI(A%F0Z#$#1UJP1R12Mj9r)y(A?a+iquX+d8WD4WAQJ_!oq z9rTISr7bPd(GTP57xm$}C}&kjMivi;zi^Y9g3&X0A;ovdJ?{%_wHgt%%9P&N4H z^XzV(uNA4 zAP`hgP6BEN5`YXh|DF~6Pud?~gWfhUKoPX4>z|}0aocC&K+AoV%|SX*N!wGq3|y< zg4lP(04XIPmt6}$N!dTk+pZv>u;MTB{L4hp9uXk7>aS!6jqM2lVr%{)H3$O127TSZ z0x9hi0k-P?nWFdQ0K`pykqUIT&jD~B0tHP{ffS(}fZ(aW$oBWTSfHO!A^><6vA?qar%tzN-5NQO zL&|F{nGiQyzNJ+bM$Y`n=Lx^3wTG^o2bGB@cwr1eb+6c-1tN=U+Db;bc~eJ!hwM{SbI=#g?$!PjDB+) zPgU_2EIxocr*EOJG52-~!gml&|D|C2OQ3Y(zAhL}iae4-Ut0F*!z!VEdfw8#`LAi# zhJ_EM*~;S|FMV6y%-SduHjPOI3cFM(GpH|HES<}*=vqY+64%dJYc|k?n6Br7)D#~# zEqO(xepfaf2F{>{E2`xb=AO%A<7RtUq6kU_Iu0m?@0K(+<}u3gVw5fy=Y4CC*{IE3 zLP3YBJ7x+U(os5=&NT%gKi23bbaZ`@;%ln)wp4GpDUT$J8NtFDHJzIe_-t}{!HAsh zJ4<^WovY};)9IKAskSebdQiXv$y5}THuJZ}ouoElIZRui=6lrupV|_Jz=9^&;@HwL;J#@23k?A;k`0Bgf;ioO>W`IQ+4? z7A)eKoY4%+g%=w;=Vm8}H>@U*=*AWNtPqgWRqib#5RTGA@Q=43FrQn3J`GkTUV5yp0U`EOTqjfp+-9;0F8!dMEwwcK%(6`8sDD^aR04 zd6O5vh|Xk?&3dy4f|1QK&Ulf{h6Iq;d-&*ti#Ck>wZFG;GHwc?b;X~eBITx49>2d8 z4HcK&1&DvEGT6kXdzAm4oO8%c}8OBt~8H956_;YP-ss*uMf==a+%w~F>Qkm7r)IAuxuoX}h92$gHqbFUun#8m zWHdy`Zrm#=Pa98x8cO0vd@Tgkr*lm0{dky+Gocr0P8y%HGEI#c3qLqIRc`Oq_C%*; zG+QTr(#Q|yHKv6R@!DmLlwJQ3FAB)Yor-I4zyDyqM4yp5n2TrQH>gRt*Zw0+WI-Sj`EgmYHh=t9! zF6lz^xpqGGpo6!5`sc0a^FVhy_Uxq|@~(1@IIzV)nTpY9sY`CV!?8e&bB8=M&sYEb z2i}fvKdhp9Hs68Y-!QJ<=wE(iQ5+49tqt;Rh|jhYrI5VW-mIz|UY{h8E=rC5sh#DU z?wGgk-Tn!I?+Zer7pHlF_Z^!Kd1qkS3&lv#%s6-<5Y%jQL${cge5=G5Ab?D&|9$Y~ zf%rJC2+=2vg;y0-SJb3<@3%}BO$T$C66q$L_H33a`VUbgW~N(4B=v5(<=My|#|J7q z*Ox4wL4kbJd_~EjLTABSu4U7Jk#`y(6O*U6(k6XxM}CtGZB(H@3~kh*zaGRXM}Iwp zQ%xFk2>@wiZrVCV_G4G~v;NebCQ%T7{SDyPpSv&dT@Cn)Mx@IK*IdNrj{*4pkV4wv z)y0J538h>cpB7iPSzA~x24T`{dzNkpvGIqvt1Dvdq@o-`B=$hkczX8$yFMhsWNK-X zxr$kR$tMD0@W)Vxe1^t9qVmsg&K^F@u84)(n2dttIEAZFN6VD$&tskpG%SI7whGL3 z)DeRiwe&?8m7U{G`oW8!SCi*dM>oYL%UKQnKxV_0RXAEBQg1kStExGEUVwLJ0orGGwb7uv+kPDl7_E2*iD|J*=8A@;XCvwq0aw5oJYN*Yh&o=l} z2z8YKb-fIAH5spql4eXqp*)o2*b>#1@DSt?zZi{GPj0gH&Nm+EI<3^z0w%YTEV4xw zI6$+=Faa|Y4o5i0zm5lOg|&tmnJ806DBovU@Ll6XsA;NRrTK~t*AAJIAS=v-UZ%Pr z$oddI@NRir&erzCwq|)ciJemr-E061j{0Vc@Ys7K(mW|JYj*$+i1Q8XlIK8T?TYS(AXu$`2U zQ@fHxc=AVHl_}cRZQ)w0anMEoqRKKIvS^`<-aMf*FM`NsG&Uowneo+Ji$7DUDYc7*Hjg;-&aHM%3 zXO6cz$$G};Uqh+iY7Wpme>PHG4cu(q;xyskNLs$^uRRMfEg?8Cj~aE-ajM%CXkx0F z>C?g3tIA#9sBQOpe`J+04{q7^TqhFk^F1jFtk4JDRO*`d-fx`GYHb=&(JiaM1b?Y^ zO3Kj3sj76ieol|N$;>j@t#tKj=@*gP+mv}KwlTcPYgR$+)2(gk)2JNE=jSauPq!$< z<|?Sb%W)wS)b>b6i{8!x!^!xIdU3{CJFVnTcw0j{M%DUCF=_>eYYEUWnA-|B(+KYL z_W_`JI&&u^@t0})@DH^1LDuT0s3dMpCHIbYBgOT4Zh_4yHbSqRbtIKndeT4Q*Jg91 z@>rO!^t-G~*AIW;FQ$3J=b;oGg8?CTa~qNCb>&cgp@e;?0AqA&paz~(%PYO+QBo4( zp?}ZdSMWx0iJm7HVNk9A#^9Osa#GPJ!_pYEW}($8>&2}fbr@&ygZ?${A7_9?X$(&5 z#~-hxdPQwCNEpf=^+WH-3`2LxrrBMTa}~qJC9S;VzhG!On^JLyW6WkF{8aAE$sM+( zxr8xLW(KIjI`Rm(24r3OJBk<3GF=G!uSP0-G&AY32mLm8q=#Xom&Pqv=1C{d3>1^ zAjsmV@XZ%BKq^eUfBpa8KvO8ob|F3hAjJv*yo2Bhl0)KUus{qA9m8jf)KnOGGTa6~4>3@J_VzkL|vYPl*uL+Ot*Q7W!f5rJw5+AsjP_IfL+-S*2p| zB7!FhjvkUTxQkGWGSg{X;h~dK>gAJivW?88Nu!3o>ySDaABn$rAYt086#27fbjPQS zhq>55ASvm*60qRdVOY9=bU^+{Pi#!OaZwENN;zy5?EztOHK-Q5;rCuiFl}BSc1YaQ zC-S{=KsGDz@Ji9O5W;XxE0xI|@3o6(2~i4b8Ii9VT;^G$*dRw(V?=br)D&q^XkeBX z+gl~+R@rVD-Hwv@7RHV?Bip5KMI)aV^&snt?H<$Nt=OPx#VxF&BGi?2A2+lNOYywNUGMeGL;|(=UjGDtLG0sN&LpGx;|U;xa13s z;W_|SPk^G}!M9_^pO zA3bt3-tca%^42sHeDtfcC0S3w3H1ny!Bxpa=*k?XRPpx9Bb-gx1J9Yvx)4J(8cG+q z(iCPZ9dsf3#QVyZgD_MW#G#qgV)olu$59&3(PzQfw@%4uZ~<5J=ABvdY43(Qnp{;G zHg3>@T#>DbTuhFl3)fb3TFqdh)V2aq7!;&JOHseTWukvA7}(iGUq;v-{2J0iHSNHq z;+)h!p6Ok^+Sp8-jgL($n6Qu47xyE`cFO5SdZR6;R!FET`tm#0D37z339Suxjpv+s z*=%2-N$N?X&0?x_uut3erF@aBGj;9$k9?3FlbDO{RQa1_qtxrh4!4#fjp4x~akvdTp@ zos?^Q&XE;3N93s4rHQGPrV7+au1$$aB6$hLy*Yz_kN$~dweb9PcB!eYVQTGjFuJP> zZCEwBtb>TIgIO^qAzq@Bv-qud_ZD-2W<_at&ml-gv`tPt$@DF5`HlA zM>DmmMkpv&Zm-8)Y#0bLQf4MpD4_-7M8eu6rh(tL8dq8onHs#R9J~dGd2IaXXMC~h z91pKhnQa%Fsn29nAA1;x(%oC zhca~qQDJaMf?wFrl-Pj;e$bZMYmMF!Y3Lv&Sb?Sjn#!NVx&NDyc^$b4uYyo2OmERa zRz;yDGd@JTykzFLe|Wk-y7#3x`6$wt$zR8r48mdUvfbeL+4D|Z``~7$PrE@qc7rZe zVsIoIbCwzjLZ@_M1*bD{HaYn();Z1-q*-I{tEnTZ(}Zmk&%MXSNBX>o| z-u*RNkAyKC-Srp7c-=@5f)xMWg>o2WWl}j6j9=8+D8;T z>0*0q#;qw8%U8i;6s0fu#I*%(g*@@a2Er@@nyI}{=@W{Z-;`=wN4N~>6Xrh&z#g}l zN1g5}0-#(nHUTv_rl2{yUZ;h#t&Fd?tY!7L%ClY)>uH-Ny2ET$lW$S)IQiN79H)D^ zb&0AXYkupy0~w8)*>Sj_p9}4L?lGTq%VG|2p`nWGhnM^!g|j-|O{%9Q%swOq63|*W zw$(N_laI}`ilB+o!a-wl?er~;;3+)$_akSQ!8YO_&-e*SI7n^(QQ;X0ZE`{4f!gAl z5$d+9CKVNonM!NO_frREICIAxOv)wm>}-k?iRisM`R7;=lyo|E_YR~FpS&PS`Lg0f zl-ON<0S%Uix8J%#yZdkCz4YNhcec<|7*P(JsM#>-L>+tYg_71q9~70FAc^6KW5jql zw!crdgVLH1G_eET=|SEc977;)ezVC|{PJZfra|}@rD;0s&@61mTEBJtILllg{%{vN zfhb&lq0yChaLhnJ-Qb62MB7`>M;|_ceHKZAeeh@#8tbrK!ArP6oXIhMK;dhEJTY`@ z0Tq>MIe0`7tGv)N*F0IGYSJv0vN?Az8g+4K9S!pW2~9F4W(_U_T=jCZrzuZ3*|__T zONp_UWmyePv8C~rckc?Xji;Z5OEqg zC*Um)i;Wh4TEwqReQdVVbUKT^2>Tpi6z_^-uF*adUFug4i@JhzpWT^Sk&E>CyP2?H zWf6x}ehuTs6wvzCnTU&gYzT029Nz19(In1WC z`(1IGmi!O%2AR|BjQa4Q0~u)kM%}?xQyjWuQ16^Gp++;`vr7!k--UZWM*~7Zl|ceO@I3`OpaRhD;YoCuo5IC0uHx>9 z478hu@H|e0Zlo)Zj@01#;8BDs@991xe~^9uG2}UXLM(m7fa}AMwX*tjioBeV&Q8Gx zSq$6wZFkRBK`cMI>R(@W@+lo2t)L+4q-negWRLWZBz*|%=W4v62JrmzNuOtA*x)QE z5L%=OH#@KMdB%Jp^r?0tE}5-*6oP`-lO7Sf)0)n*e<{HA=&qhLR)oD8-+V}Z4=md) z+k9lKf64DB2hAT)UaCP~di?-V3~JBH7itYyk~L6hrnxM%?RKntqd`=!b|e7eFnAcu z3*V;g{xr7TSTm$}DY%~SMpl>m{Sj!We+WfxSEor?YeiAxYUy25pn(?T()E>ByP^c@ zipwvWrhIK((R((VU+;@LmOnDu)ZXB3YArzzin!Z^0;PyJWnlfflo|q8(QY;o1*5CO z##hnkO{uynTMdk`~DOC#1 zdiYxQoy}=@7(ke#A8$YZZVtk4wo$8x28&I;cY3Ro-|kW=*yiiHgCLZeAr)UtVx>Tu z|LvL0hq|1-jC0I4x#>&QZCfrVB=zT!nR|~Uz`9%~2 znl{uZ{VEszW`Fad^q_HB!K9*|U-stK%?~;g?&&+12A}Rq$z($Bzuk^2X(Y=hF?-dQ ztc3DsQKI;qhWIV`99Q#R3xnU0AvY!i*BECj-z9l74|%O=V@nlv|qqC^r^-~C?E zGW%c|uYgnfJ(gjsTm_cIqcv*mYM{+i+&@F@+69ZQOK&u#v4oxUSQJ=tvqQ3W=*m;| z>SkBi8LYb-qRY7Sthh*0%3XAC%$z1rhOJzuX=PkTOa=DlocZUpE#KxVNH5)_4n=T( zGi3YrH7e~sPNYVBd~Grcq#CF~rN{p9Zza-Ntnwfma@TB)=3g36*0lSZg#ixEjFe%+ zX=&LDZ5zqculZ`=RYc^ln(~;nN|Qh6gN=!6f9-N2h+3NWbIxYud&;4SX*tWf5slk4 z{q@@l71UAZgj~*6edXb57fBUxvAS7s(RI=X868JM0+^DCn2yC>;v%S;qPOjB>YVsz(Zx9a>>BK&M zIQK>7_n)4ud0X5YM}^i*keH{ehLsiy9@NvOpsFeQjdI6anLGvVbBw_*fU1TzdVS$i z*4j7z!I5RF#rSz|8ibi$;qE{4`aqWYik7QB5U&F5C*;TO_x+gtzPGpzNt!7~nsBT7)Ckc(K~%uv&{{6A`mmBJVAk-{s~52Vu|HbCH7_W1~ZCX^RflOakGg=jo2Z z<*s;5-J+2@^LRDZ-7EV&Pq+FTErw@pfFqvx^i%E7Fx#^n(E`m2(c>K-O5`M`Yek9el zzTGs5qD6*G;y#~xu3>qWuO?-amKYtvRA}I9z#UspEeM;wOERYeot_n_EUMJf$4_u?E!6X~?q)tPoZb^_;8Y_Ox2h1m<+Le-fsRd|T8db<8#$bqez zua^Z|>h%zdnuU^ww$#-dZ9NTM`FN+!IlLkz*FqWb!x^Z|C{KyGjZ+>G;;7Mb@LY|H zc+Gp`L((Dw7pnDlHNm&;SfHedhx*kad$I^uGz{`0BYelq0yEUHpNKSkvj$|dpvY3{7*YGyhXA^LP0&wOw9oNoC=QoVx1<2Dne8qqZL zm>nFh5DX(-RnQwvHCZQwn^#Z=E!SPVlaRJ78Bo@}!!9dRt^qZy?-*`Pt4WSmgucJv zV1yFkcjlEM^uz-;b#Q7ZCP@Lk)m}uPX={R4B=56k7WNh11BN~0T*vr@!!ow^B0hOR zQ)4)&(e%>bNNL%bm<&8H{*l_L7s0$2GUgX2Vd;=4d9Dm2v3TaL+;L>{K7h7 zV#k?xDPm(NDE31$ z<}|X)pEY6myjK+^gaIMk&Yj2~F0rSKemNqlsVm4c|N7mp_C*L01s;GNx#D-*&gk!qQr}^?_r@q!8fuXw!)fA7xkd} zb>vHvdx~H$5qqAWrow7}+8zBM65-JOt5z za=T6f7MK`XJuQog8kIEboPdhcaVJeHy)5z7EBLK5NRr()E|#K0L0N^JD@pUA^Czb` zbUZ_558y+vqAGeyHCbrvOvLD67Ph}06959VzQ_|>RrXQAqE+AQ(-AaKdxoWaF8hdt z{O3W@b^*o#-f1VuU>YMV03ELF7zkCN4Q&b#prz%3Nne0lSbRo@@ z^ihv%oIl~Qyl6Q;a#$*jOC%x0_;eis*)J7=f@Ct*)xF5 zo}u~@-I}2|$b%5L7>@+Z?4o+1r&v6ceIy+vroK&jCQ<4q&45HP2wCol4hVm3pZtjf zHz1D7oyaSKJ~T{Gx}7ONLA)D5k(%%`WswrDyzX*rn}i}}TB4^y#@mAwPzoC)`?rYv zHgx|trUN#mu*VzUV~8TnJM2Qh*ZM5B{x&y>5An`(M7=Z*Q>TdiH@j*2=moNuOtvpz z+G`@~-`%~+AgPKgke@XiRPgndh@bp*-HRsh;HTtz@-y_uhb%7ylVOTqG0#u?Vn5c5 zEp*XRo|8hcgG^$#{$O9CJ&NE;TrfRpSnLmes&MO{m=N%zc`}gb!eQ7odl$oy1%PI} z#AIxx%oRVy&{O~9xnK4$EY>(eQj}!HKIV$Fz*H=-=Kn)N0D6u`(;iO|VraI4fu_W` z;b5{7;Lyx4za}DU#+U7}=H0dAS#YJJ&g2!P@Htu-AL&w=-)*%P9h2{wR|@?Ff9~)b z^+e_3Hetq7W%ls{!?<6&Y$Z;NNB41pvrv)|MET6AZXFXJeFqbFW5@i5WGzl?bP+~? z*&_puH;wKv2)9T_d+P`bLvJFqX#j&xa*-;0nGBbQf0DC>o~=J_Wmtf*2SZQr?{i~X z9-IbRH8{iy?<0v9Ir1?$66+igy|yDQ5J~A9sFX@Pe<*kCY8+MwH?I z`P}zfQ6l^AO8ehZ=l^ZR;R%uu4;BK*=?W9t|0{+-at(MQZ(CtG=EJFNaFMlKCMXu30(gJUqj5+ z`GM|!keqcj;FKTa_qq;{*dHRXAq157hlB@kL#8%yAm2AgfU|*rDKX@FLlp=HL8ddv zAWLCHe@DcDeB2}fl7#=0+#<05c3=VqM*O3bkr@9X4nO|)q0hU;Gye{L8ZN*NH8Id@mP-u;Fmb8YuorjLrW&ndip8CN%_qp982r w1WEnz9^$&s1hkp_3#lPJQ~!HI7WYYjA7>z!`?f%npAh2%rB@vD|Lau$2O)#1n*aa+ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..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.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 82d44d0..0000000 --- a/settings.gradle +++ /dev/null @@ -1,12 +0,0 @@ -pluginManagement { - repositories { - gradlePluginPortal() - maven { url "https://repo.jpenilla.xyz/snapshots/" } - } -} - -rootProject.name = 'EcoBosses' - -// 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..169c99f --- /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 = "EcoBosses" + +// Core +include(":eco-core") +include(":eco-core:core-plugin")