diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 327de14..0000000 --- a/build.gradle +++ /dev/null @@ -1,113 +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/' } - } - - jar { - onlyIf { !sourceSets.main.allSource.files.isEmpty() } - } - - shadowJar { - relocate('com.willfp.libreforge', 'com.willfp.boosters.libreforge') - relocate('org.joml', 'com.willfp.boosters.libreforge.joml') - } - - dependencies { - compileOnly 'com.willfp:eco:6.44.0' - implementation 'com.willfp:libreforge:3.129.5' - implementation 'org.joml:joml:1.10.4' - - compileOnly 'org.jetbrains:annotations:23.0.0' - - compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.7.20' - } - - tasks.withType(JavaCompile) { - options.deprecation = true - options.encoding = 'UTF-8' - } - - tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) { - kotlinOptions { - jvmTarget = "17" - freeCompilerArgs = ['-Xjvm-default=all'] - } - } - - processResources { - filesNotMatching(["**/*.png", "**/models/**", "**/textures/**", "**lang.yml"]) { - expand projectVersion: project.version - } - } - - compileJava.options.encoding = 'UTF-8' - compileJava.dependsOn clean - - build.dependsOn shadowJar -} - -tasks.withType(Jar) { - destinationDirectory = file("$rootDir/bin/") -} - -clean.doLast { - file("${rootDir}/bin").deleteDir() -} - -shadowJar { - archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + ".jar" -} - -jar { - archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + " " + "unshaded" + ".jar" -} - -group = 'com.willfp' -archivesBaseName = project.name -version = findProperty("version") -java.sourceCompatibility = JavaVersion.VERSION_17 - -compileJava.options.encoding = 'UTF-8' - -build.dependsOn shadowJar - -task buyThePlugins { - dependsOn subprojects.build - - doLast { - println 'If you like the plugin, please consider buying it on Spigot or Polymart!' - println 'Spigot: https://www.spigotmc.org/resources/authors/auxilor.507394/' - println 'Polymart: https://polymart.org/user/auxilor.1107/' - println 'Buying gives you access to support and the plugin auto-updater, and it allows me to keep developing plugins.' - } -} -build.finalizedBy buyThePlugins diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..f540da1 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,81 @@ +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.boosters.libreforge.loader") + } + + 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 68143de..0000000 --- a/eco-core/core-plugin/build.gradle +++ /dev/null @@ -1,15 +0,0 @@ -group 'com.willfp' -version rootProject.version - -dependencies { - compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT' -} - -publishing { - publications { - Library(MavenPublication) { - from project.components.java - artifact tasks.shadowJar - } - } -} diff --git a/eco-core/core-plugin/build.gradle.kts b/eco-core/core-plugin/build.gradle.kts new file mode 100644 index 0000000..8c943af --- /dev/null +++ b/eco-core/core-plugin/build.gradle.kts @@ -0,0 +1,20 @@ +group = "com.willfp" +version = rootProject.version + +dependencies { + compileOnly("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT") +} + +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/boosters/BoosterUtils.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/BoosterUtils.kt index 9e65db6..2512a1d 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/BoosterUtils.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/BoosterUtils.kt @@ -49,6 +49,7 @@ fun Player.activateBooster(booster: Booster): Boolean { this.setAmountOfBooster(booster, amount - 1) for (activationMessage in booster.getActivationMessages(this)) { + @Suppress("DEPRECATION") Bukkit.broadcastMessage(activationMessage) } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/BoostersPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/BoostersPlugin.kt index ebf8f72..b4ac09e 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/BoostersPlugin.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/BoostersPlugin.kt @@ -6,18 +6,24 @@ import com.willfp.boosters.boosters.expireBooster import com.willfp.boosters.boosters.scanForBoosters import com.willfp.boosters.commands.CommandBoosters import com.willfp.eco.core.command.impl.PluginCommand -import com.willfp.libreforge.LibReforgePlugin +import com.willfp.libreforge.SimpleProvidedHolder +import com.willfp.libreforge.loader.LibreforgePlugin +import com.willfp.libreforge.loader.configs.ConfigCategory +import com.willfp.libreforge.registerHolderProvider import org.bukkit.Bukkit -import org.bukkit.event.Listener -class BoostersPlugin : LibReforgePlugin() { - override fun handleEnableAdditional() { - this.copyConfigs("boosters") - - this.registerHolderProvider { Bukkit.getServer().activeBoosters.map { it.booster } } +class BoostersPlugin : LibreforgePlugin() { + override fun loadConfigCategories(): List { + return listOf( + Boosters + ) } - override fun handleReloadAdditional() { + override fun handleEnable() { + registerHolderProvider { Bukkit.getServer().activeBoosters.map { it.booster }.map { SimpleProvidedHolder(it) } } + } + + override fun handleReload() { this.scheduler.runTimer(1, 1) { for (booster in Boosters.values()) { if (booster.active == null) { @@ -26,6 +32,7 @@ class BoostersPlugin : LibReforgePlugin() { if (booster.secondsLeft <= 0) { for (expiryMessage in booster.expiryMessages) { + @Suppress("DEPRECATION") Bukkit.broadcastMessage(expiryMessage) } @@ -47,12 +54,6 @@ class BoostersPlugin : LibReforgePlugin() { } } - override fun loadListeners(): List { - return listOf( - - ) - } - override fun loadPluginCommands(): List { return listOf( CommandBoosters(this) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/boosters/Booster.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/boosters/Booster.kt index 157bf82..a9bcb89 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/boosters/Booster.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/boosters/Booster.kt @@ -10,10 +10,12 @@ import com.willfp.eco.core.integrations.placeholder.PlaceholderManager import com.willfp.eco.core.items.Items import com.willfp.eco.core.items.builder.ItemStackBuilder import com.willfp.eco.core.placeholder.PlayerlessPlaceholder +import com.willfp.eco.core.registry.Registrable import com.willfp.eco.util.StringUtils import com.willfp.eco.util.formatEco import com.willfp.eco.util.savedDisplayName import com.willfp.libreforge.Holder +import com.willfp.libreforge.ViolationContext import com.willfp.libreforge.conditions.Conditions import com.willfp.libreforge.effects.Effects import org.bukkit.Bukkit @@ -24,9 +26,9 @@ import kotlin.math.floor class Booster( private val plugin: BoostersPlugin, - override val id: String, + id: String, val config: Config -) : Holder { +) : Holder, Registrable { val ownedDataKey: PersistentDataKey = PersistentDataKey( plugin.namespacedKeyFactory.create(id), PersistentDataKeyType.INT, @@ -109,16 +111,17 @@ class Booster( override val conditions = Conditions.compile( config.getSubsections("conditions"), - "Booster $id" + ViolationContext(plugin, "Booster $id") ) override val effects = Effects.compile( config.getSubsections("effects"), - "Booster $id" + ViolationContext(plugin, "Booster $id") ) + override val id = plugin.createNamespacedKey(id) + init { - Boosters.addNewBooster(this) PlaceholderManager.registerPlaceholder( PlayerlessPlaceholder( plugin, @@ -220,6 +223,10 @@ class Booster( ) } + override fun getID(): String { + return this.id.key + } + override fun equals(other: Any?): Boolean { if (other !is Booster) { return false diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/boosters/Boosters.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/boosters/Boosters.kt index 0638976..b5fe1b2 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/boosters/Boosters.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/boosters/Boosters.kt @@ -1,18 +1,21 @@ package com.willfp.boosters.boosters -import com.google.common.collect.BiMap -import com.google.common.collect.HashBiMap import com.google.common.collect.ImmutableList import com.willfp.boosters.BoostersPlugin -import com.willfp.eco.core.config.ConfigType -import com.willfp.eco.core.config.readConfig -import com.willfp.eco.core.config.updating.ConfigUpdater -import com.willfp.libreforge.chains.EffectChains -import java.io.File +import com.willfp.eco.core.config.interfaces.Config +import com.willfp.eco.core.registry.Registry +import com.willfp.libreforge.loader.LibreforgePlugin +import com.willfp.libreforge.loader.configs.ConfigCategory +import com.willfp.libreforge.loader.configs.LegacyLocation -object Boosters { +object Boosters : ConfigCategory("booster", "boosters") { /** Registered boosters. */ - private val BY_ID: BiMap = HashBiMap.create() + private val registry = Registry() + + override val legacyLocation = LegacyLocation( + "boosters.yml", + "boosters" + ) /** * Get all registered [Booster]s. @@ -21,7 +24,7 @@ object Boosters { */ @JvmStatic fun values(): List { - return ImmutableList.copyOf(BY_ID.values) + return ImmutableList.copyOf(registry.values()) } /** @@ -32,54 +35,14 @@ object Boosters { */ @JvmStatic fun getByID(name: String): Booster? { - return BY_ID[name] + return registry[name] } - /** - * Update all [Booster]s. - * - * @param plugin Instance of Booster. - */ - @ConfigUpdater - @JvmStatic - fun update(plugin: BoostersPlugin) { - for (booster in values()) { - removeBooster(booster) - } - - for ((id, config) in plugin.fetchConfigs("boosters")) { - Booster(plugin, id, config) - } - - // Legacy - val boostersYml = File(plugin.dataFolder, "boosters.yml").readConfig(ConfigType.YAML) - - for (config in boostersYml.getSubsections("boosters")) { - Booster(plugin, config.getString("id"), config) - } - boostersYml.getSubsections("chains").mapNotNull { - EffectChains.compile(it, "Effect Chains") - } + override fun clear(plugin: LibreforgePlugin) { + registry.clear() } - /** - * Add new [Booster] to Booster. - * - * @param booster The [Booster] to add. - */ - @JvmStatic - fun addNewBooster(booster: Booster) { - BY_ID.remove(booster.id) - BY_ID[booster.id] = booster - } - - /** - * Remove [Booster] from Booster. - * - * @param booster The [Booster] to remove. - */ - @JvmStatic - fun removeBooster(booster: Booster) { - BY_ID.remove(booster.id) + override fun acceptConfig(plugin: LibreforgePlugin, id: String, config: Config) { + registry.register(Booster(plugin as BoostersPlugin, id, config)) } } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/commands/CommandBoosters.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/commands/CommandBoosters.kt index 8a09911..5bbd8c2 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/commands/CommandBoosters.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/commands/CommandBoosters.kt @@ -1,16 +1,12 @@ package com.willfp.boosters.commands -import com.willfp.boosters.boosters.Boosters import com.willfp.boosters.gui.BoosterGUI +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 org.bukkit.command.CommandSender import org.bukkit.entity.Player -class CommandBoosters(plugin: LibReforgePlugin) : +class CommandBoosters(plugin: EcoPlugin) : PluginCommand( plugin, "boosters", @@ -23,15 +19,6 @@ class CommandBoosters(plugin: LibReforgePlugin) : .addSubcommand(CommandReload(plugin)) .addSubcommand(CommandCancel(plugin)) .addSubcommand(CommandActivate(plugin)) - .addSubcommand(CommandImport("boosters", plugin)) - .addSubcommand(CommandExport(plugin) { - Boosters.values().map { - ExportableConfig( - it.id, - it.config - ) - } - }) } override fun onExecute(sender: CommandSender, args: List) { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/commands/CommandGive.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/commands/CommandGive.kt index 18c8a46..970bb28 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/commands/CommandGive.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/commands/CommandGive.kt @@ -73,7 +73,7 @@ class CommandGive(plugin: EcoPlugin) : if (args.size == 2) { StringUtil.copyPartialMatches( args[1], - Boosters.values().map { it.id }, + Boosters.values().map { it.id.key }, completions ) return completions 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 b4c5e31..17fcd4e 100644 --- a/eco-core/core-plugin/src/main/resources/config.yml +++ b/eco-core/core-plugin/src/main/resources/config.yml @@ -13,48 +13,3 @@ gui: - "111111111" - "101101101" - "111111111" - -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 diff --git a/eco-core/core-plugin/src/main/resources/eco.yml b/eco-core/core-plugin/src/main/resources/eco.yml index cdf6a84..533fd41 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: 2036 -bstats-id: 14269 -color: "&e" +environment: + - name: libreforge version + value: ${libreforgeVersion} + +options: + resource-id: 2036 + bstats-id: 14269 + color: "&e" diff --git a/eco-core/core-plugin/src/main/resources/lang.yml b/eco-core/core-plugin/src/main/resources/lang.yml index c3a78b4..2ffe5ca 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%" requires-player: "&cYou must specify a player!" invalid-player: "&cInvalid 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 a6272cd..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 /boosters 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..aea61ad --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/paper-plugin.yml @@ -0,0 +1,17 @@ +name: ${pluginName} +version: ${version} +main: com.willfp.boosters.BoostersPlugin +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 dec0804..1726482 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: Boosters -version: ${projectVersion} +name: ${pluginName} +version: ${version} main: com.willfp.boosters.BoostersPlugin api-version: 1.17 authors: [ Auxilor ] @@ -7,17 +7,7 @@ website: willfp.com depend: - eco softdepend: - - AureliumSkills - - Jobs - - mcMMO - - Vault - - TMMobcoins - - EcoEnchants - - EcoBosses - - Talismans - - EcoArmor - - EcoItems - - EcoSkills + - libreforge commands: boosters: @@ -41,8 +31,6 @@ permissions: boosters.command.boosters: true boosters.command.cancel: true boosters.command.activate: true - boosters.command.import: true - boosters.command.export: true boosters.command.reload: description: Allows reloading the config @@ -58,10 +46,4 @@ permissions: default: op boosters.command.cancel: description: Allows the use of /boosters cancel. - default: op - boosters.command.import: - description: Allows the use of /boosters import - default: op - boosters.command.export: - description: Allows the use of /boosters export default: op \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 3e99cdf..87a7949 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,5 @@ #libreforge-updater -#Mon Mar 13 13:40:49 GMT 2023 -version=4.93.7 -plugin-name=Boosters +#Mon Mar 13 13:39:16 GMT 2023 +kotlin.code.style=official +libreforge-version=4.0.0 +version=5.0.0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..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 692a5d6..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.2-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +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 e42d065..0000000 --- a/settings.gradle +++ /dev/null @@ -1,5 +0,0 @@ -rootProject.name = 'Boosters' - -// 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..c3f2a51 --- /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 = "Boosters" + +// Core +include(":eco-core") +include(":eco-core:core-plugin")