mirror of
https://github.com/Auxilor/EcoEnchants.git
synced 2024-11-21 14:55:17 +01:00
Updated to libreforge v4
This commit is contained in:
parent
7798cbd970
commit
0d8b6c1d41
118
build.gradle
118
build.gradle
@ -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.essentialsx.net/releases/' }
|
||||
maven { url 'https://repo.codemc.io/repository/nms/' }
|
||||
}
|
||||
|
||||
jar {
|
||||
onlyIf { !sourceSets.main.allSource.files.isEmpty() }
|
||||
}
|
||||
|
||||
shadowJar {
|
||||
relocate('com.willfp.libreforge', 'com.willfp.ecoenchants.libreforge')
|
||||
relocate('org.joml', 'com.willfp.ecoenchants.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 '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 {
|
||||
filesNotMatching(["**/*.png", "**/models/**", "**/textures/**", "**enchants.yml", "**lang.yml"]) {
|
||||
expand projectVersion: project.version
|
||||
}
|
||||
}
|
||||
|
||||
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
|
||||
kotlinOptions {
|
||||
jvmTarget = "17"
|
||||
freeCompilerArgs += ["-Xjvm-default=all"]
|
||||
}
|
||||
}
|
||||
|
||||
java.sourceCompatibility = JavaVersion.VERSION_17
|
||||
java.targetCompatibility = JavaVersion.VERSION_17
|
||||
|
||||
compileJava.options.encoding = 'UTF-8'
|
||||
compileJava.dependsOn clean
|
||||
|
||||
build.dependsOn shadowJar
|
||||
}
|
||||
|
||||
tasks.withType(Jar) {
|
||||
destinationDirectory = file("$rootDir/bin/")
|
||||
}
|
||||
|
||||
clean.doLast {
|
||||
file("${rootDir}/bin").deleteDir()
|
||||
}
|
||||
|
||||
shadowJar {
|
||||
archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + ".jar"
|
||||
}
|
||||
|
||||
jar {
|
||||
archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + ".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
|
85
build.gradle.kts
Normal file
85
build.gradle.kts
Normal file
@ -0,0 +1,85 @@
|
||||
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")
|
||||
maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
|
||||
maven("https://repo.codemc.org/repository/nms/")
|
||||
maven("https://repo.essentialsx.net/releases/")
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly("com.willfp:eco:6.53.0")
|
||||
compileOnly("org.jetbrains:annotations:23.0.0")
|
||||
compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.7.10")
|
||||
compileOnly("com.github.ben-manes.caffeine:caffeine:3.1.0")
|
||||
}
|
||||
|
||||
java {
|
||||
withSourcesJar()
|
||||
toolchain.languageVersion.set(JavaLanguageVersion.of(17))
|
||||
}
|
||||
|
||||
tasks {
|
||||
shadowJar {
|
||||
relocate("com.willfp.libreforge.loader", "com.willfp.ecoenchants.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)
|
||||
}
|
||||
}
|
||||
}
|
@ -1,2 +0,0 @@
|
||||
group 'com.willfp'
|
||||
version rootProject.version
|
2
eco-core/build.gradle.kts
Normal file
2
eco-core/build.gradle.kts
Normal file
@ -0,0 +1,2 @@
|
||||
group = "com.willfp"
|
||||
version = rootProject.version
|
@ -1,9 +0,0 @@
|
||||
group 'com.willfp'
|
||||
version rootProject.version
|
||||
|
||||
subprojects {
|
||||
dependencies {
|
||||
compileOnly project(':eco-core:core-proxy')
|
||||
compileOnly project(':eco-core:core-plugin')
|
||||
}
|
||||
}
|
9
eco-core/core-nms/build.gradle.kts
Normal file
9
eco-core/core-nms/build.gradle.kts
Normal file
@ -0,0 +1,9 @@
|
||||
group = "com.willfp"
|
||||
version = rootProject.version
|
||||
|
||||
subprojects {
|
||||
dependencies {
|
||||
compileOnly(project(":eco-core:core-proxy"))
|
||||
compileOnly(project(":eco-core:core-plugin"))
|
||||
}
|
||||
}
|
@ -1,6 +0,0 @@
|
||||
group 'com.willfp'
|
||||
version rootProject.version
|
||||
|
||||
dependencies {
|
||||
compileOnly 'org.spigotmc:spigot:1.17-R0.1-SNAPSHOT'
|
||||
}
|
6
eco-core/core-nms/v1_17_R1/build.gradle.kts
Normal file
6
eco-core/core-nms/v1_17_R1/build.gradle.kts
Normal file
@ -0,0 +1,6 @@
|
||||
group = "com.willfp"
|
||||
version = rootProject.version
|
||||
|
||||
dependencies {
|
||||
compileOnly("org.spigotmc:spigot:1.17-R0.1-SNAPSHOT")
|
||||
}
|
@ -1,6 +0,0 @@
|
||||
group 'com.willfp'
|
||||
version rootProject.version
|
||||
|
||||
dependencies {
|
||||
compileOnly 'org.spigotmc:spigot:1.18-R0.1-SNAPSHOT'
|
||||
}
|
6
eco-core/core-nms/v1_18_R1/build.gradle.kts
Normal file
6
eco-core/core-nms/v1_18_R1/build.gradle.kts
Normal file
@ -0,0 +1,6 @@
|
||||
group = "com.willfp"
|
||||
version = rootProject.version
|
||||
|
||||
dependencies {
|
||||
compileOnly("org.spigotmc:spigot:1.18-R0.1-SNAPSHOT")
|
||||
}
|
@ -1,6 +0,0 @@
|
||||
group 'com.willfp'
|
||||
version rootProject.version
|
||||
|
||||
dependencies {
|
||||
compileOnly 'org.spigotmc:spigot:1.18.2-R0.1-SNAPSHOT'
|
||||
}
|
6
eco-core/core-nms/v1_18_R2/build.gradle.kts
Normal file
6
eco-core/core-nms/v1_18_R2/build.gradle.kts
Normal file
@ -0,0 +1,6 @@
|
||||
group = "com.willfp"
|
||||
version = rootProject.version
|
||||
|
||||
dependencies {
|
||||
compileOnly("org.spigotmc:spigot:1.18.2-R0.1-SNAPSHOT")
|
||||
}
|
@ -1,6 +0,0 @@
|
||||
group 'com.willfp'
|
||||
version rootProject.version
|
||||
|
||||
dependencies {
|
||||
compileOnly 'org.spigotmc:spigot:1.19.1-R0.1-SNAPSHOT'
|
||||
}
|
6
eco-core/core-nms/v1_19_R1/build.gradle.kts
Normal file
6
eco-core/core-nms/v1_19_R1/build.gradle.kts
Normal file
@ -0,0 +1,6 @@
|
||||
group = "com.willfp"
|
||||
version = rootProject.version
|
||||
|
||||
dependencies {
|
||||
compileOnly("org.spigotmc:spigot:1.19.1-R0.1-SNAPSHOT")
|
||||
}
|
@ -1,6 +0,0 @@
|
||||
group 'com.willfp'
|
||||
version rootProject.version
|
||||
|
||||
dependencies {
|
||||
compileOnly 'org.spigotmc:spigot:1.19.3-R0.1-SNAPSHOT'
|
||||
}
|
6
eco-core/core-nms/v1_19_R2/build.gradle.kts
Normal file
6
eco-core/core-nms/v1_19_R2/build.gradle.kts
Normal file
@ -0,0 +1,6 @@
|
||||
group = "com.willfp"
|
||||
version = rootProject.version
|
||||
|
||||
dependencies {
|
||||
compileOnly("org.spigotmc:spigot:1.19.3-R0.1-SNAPSHOT")
|
||||
}
|
@ -1,6 +0,0 @@
|
||||
group 'com.willfp'
|
||||
version rootProject.version
|
||||
|
||||
dependencies {
|
||||
compileOnly 'org.spigotmc:spigot:1.19.4-R0.1-SNAPSHOT'
|
||||
}
|
6
eco-core/core-nms/v1_19_R3/build.gradle.kts
Normal file
6
eco-core/core-nms/v1_19_R3/build.gradle.kts
Normal file
@ -0,0 +1,6 @@
|
||||
group = "com.willfp"
|
||||
version = rootProject.version
|
||||
|
||||
dependencies {
|
||||
compileOnly("org.spigotmc:spigot:1.19.4-R0.1-SNAPSHOT")
|
||||
}
|
@ -1,19 +0,0 @@
|
||||
group 'com.willfp'
|
||||
version rootProject.version
|
||||
|
||||
dependencies {
|
||||
compileOnly fileTree(dir: '../../lib', include: ['*.jar'])
|
||||
compileOnly project(":eco-core:core-proxy")
|
||||
compileOnly 'io.papermc.paper:paper-api:1.17.1-R0.1-SNAPSHOT'
|
||||
compileOnly 'net.essentialsx:EssentialsX:2.19.0'
|
||||
}
|
||||
|
||||
build.dependsOn publishToMavenLocal
|
||||
|
||||
publishing {
|
||||
publications {
|
||||
maven(MavenPublication) {
|
||||
from(components.java)
|
||||
}
|
||||
}
|
||||
}
|
26
eco-core/core-plugin/build.gradle.kts
Normal file
26
eco-core/core-plugin/build.gradle.kts
Normal file
@ -0,0 +1,26 @@
|
||||
group = "com.willfp"
|
||||
version = rootProject.version
|
||||
|
||||
dependencies {
|
||||
compileOnly(fileTree("../../lib") {
|
||||
include("*.jar")
|
||||
}
|
||||
)
|
||||
compileOnly(project(":eco-core:core-proxy"))
|
||||
compileOnly("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT")
|
||||
compileOnly("net.essentialsx:EssentialsX:2.19.7")
|
||||
}
|
||||
|
||||
tasks {
|
||||
build {
|
||||
dependsOn("publishToMavenLocal")
|
||||
}
|
||||
}
|
||||
|
||||
publishing {
|
||||
publications {
|
||||
create<MavenPublication>("mavenJava") {
|
||||
from(components["java"])
|
||||
}
|
||||
}
|
||||
}
|
@ -23,10 +23,12 @@ import com.willfp.ecoenchants.mechanics.LootSupport
|
||||
import com.willfp.ecoenchants.mechanics.VillagerSupport
|
||||
import com.willfp.ecoenchants.target.ActiveEnchantUpdateListeners
|
||||
import com.willfp.ecoenchants.target.EnchantLookup.heldEnchantLevels
|
||||
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 EcoEnchantsPlugin : LibReforgePlugin() {
|
||||
class EcoEnchantsPlugin : LibreforgePlugin() {
|
||||
val targetsYml = TargetsYml(this)
|
||||
val rarityYml = RarityYml(this)
|
||||
val typesYml = TypesYml(this)
|
||||
@ -36,11 +38,15 @@ class EcoEnchantsPlugin : LibReforgePlugin() {
|
||||
|
||||
init {
|
||||
instance = this
|
||||
copyConfigs("enchants")
|
||||
EcoEnchants.update(this)
|
||||
}
|
||||
|
||||
override fun handleEnableAdditional() {
|
||||
override fun loadConfigCategories(): List<ConfigCategory> {
|
||||
return listOf(
|
||||
EcoEnchants
|
||||
)
|
||||
}
|
||||
|
||||
override fun handleEnable() {
|
||||
registerHolderProvider { it.heldEnchantLevels }
|
||||
}
|
||||
|
||||
@ -48,7 +54,7 @@ class EcoEnchantsPlugin : LibReforgePlugin() {
|
||||
isLoaded = true
|
||||
}
|
||||
|
||||
override fun handleReloadAdditional() {
|
||||
override fun handleReload() {
|
||||
registerVanillaEnchants(this)
|
||||
|
||||
logger.info(EcoEnchants.values().size.toString() + " Enchants Loaded")
|
||||
@ -66,7 +72,7 @@ class EcoEnchantsPlugin : LibReforgePlugin() {
|
||||
)
|
||||
}
|
||||
|
||||
override fun loadAdditionalIntegrations(): List<IntegrationLoader> {
|
||||
override fun loadIntegrationLoaders(): List<IntegrationLoader> {
|
||||
return listOf(
|
||||
IntegrationLoader("Essentials") { EnchantRegistrations.register(EssentialsIntegration()) },
|
||||
IntegrationLoader("CMI") { EnchantRegistrations.register(CMIIntegration()) }
|
||||
|
@ -2,10 +2,6 @@ package com.willfp.ecoenchants.commands
|
||||
|
||||
import com.willfp.eco.core.command.impl.PluginCommand
|
||||
import com.willfp.ecoenchants.EcoEnchantsPlugin
|
||||
import com.willfp.ecoenchants.enchants.EcoEnchants
|
||||
import com.willfp.libreforge.lrcdb.CommandExport
|
||||
import com.willfp.libreforge.lrcdb.CommandImport
|
||||
import com.willfp.libreforge.lrcdb.ExportableConfig
|
||||
import org.bukkit.command.CommandSender
|
||||
|
||||
class CommandEcoEnchants(plugin: EcoEnchantsPlugin) :
|
||||
@ -21,14 +17,5 @@ class CommandEcoEnchants(plugin: EcoEnchantsPlugin) :
|
||||
.addSubcommand(CommandToggleDescriptions(plugin))
|
||||
.addSubcommand(CommandGiveRandomBook(plugin))
|
||||
.addSubcommand(CommandGUI(plugin))
|
||||
.addSubcommand(CommandImport("enchants", plugin))
|
||||
.addSubcommand(CommandExport(plugin) {
|
||||
EcoEnchants.values().map {
|
||||
ExportableConfig(
|
||||
it.id,
|
||||
it.config
|
||||
)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
@ -17,8 +17,10 @@ import com.willfp.ecoenchants.target.EnchantLookup.getEnchantLevel
|
||||
import com.willfp.ecoenchants.target.EnchantmentTargets
|
||||
import com.willfp.ecoenchants.target.TargetSlot
|
||||
import com.willfp.ecoenchants.type.EnchantmentTypes
|
||||
import com.willfp.libreforge.ViolationContext
|
||||
import com.willfp.libreforge.conditions.ConditionList
|
||||
import com.willfp.libreforge.conditions.Conditions
|
||||
import com.willfp.libreforge.conditions.ConfiguredCondition
|
||||
import com.willfp.libreforge.effects.EffectList
|
||||
import net.kyori.adventure.text.Component
|
||||
import org.bukkit.Bukkit
|
||||
import org.bukkit.Material
|
||||
@ -50,7 +52,7 @@ abstract class EcoEnchant(
|
||||
override val displayName = config.getFormattedString("display-name")
|
||||
override val unformattedDisplayName = config.getString("display-name")
|
||||
|
||||
val conditions: Set<ConfiguredCondition>
|
||||
val conditions: ConditionList
|
||||
|
||||
val targets = config.getStrings("targets")
|
||||
.mapNotNull { EnchantmentTargets.getByID(it) }
|
||||
@ -125,8 +127,8 @@ abstract class EcoEnchant(
|
||||
|
||||
conditions = if (plugin.isLoaded) Conditions.compile(
|
||||
config.getSubsections("conditions"),
|
||||
"Enchantment $id"
|
||||
) else emptySet()
|
||||
ViolationContext(plugin, "Enchantment $id")
|
||||
) else ConditionList(emptyList())
|
||||
|
||||
if (Bukkit.getPluginManager().getPermission("ecoenchants.fromtable.$id") == null) {
|
||||
val permission = Permission(
|
||||
@ -195,7 +197,7 @@ abstract class EcoEnchant(
|
||||
}
|
||||
|
||||
open fun createLevel(level: Int) =
|
||||
EcoEnchantLevel(this, level, emptySet(), conditions)
|
||||
EcoEnchantLevel(this, level, EffectList(emptyList()), conditions, plugin)
|
||||
|
||||
fun registerListener(listener: Listener) {
|
||||
this.plugin.eventManager.registerListener(listener)
|
||||
|
@ -2,6 +2,7 @@ package com.willfp.ecoenchants.enchants
|
||||
|
||||
import com.google.common.collect.HashBiMap
|
||||
import com.google.common.collect.ImmutableSet
|
||||
import com.willfp.eco.core.config.interfaces.Config
|
||||
import com.willfp.eco.core.config.updating.ConfigUpdater
|
||||
import com.willfp.ecoenchants.EcoEnchantsPlugin
|
||||
import com.willfp.ecoenchants.enchants.impl.EnchantmentPermanenceCurse
|
||||
@ -14,13 +15,15 @@ import com.willfp.ecoenchants.integrations.EnchantRegistrations
|
||||
import com.willfp.ecoenchants.rarity.EnchantmentRarities
|
||||
import com.willfp.ecoenchants.target.EnchantmentTargets
|
||||
import com.willfp.ecoenchants.type.EnchantmentTypes
|
||||
import com.willfp.libreforge.loader.LibreforgePlugin
|
||||
import com.willfp.libreforge.loader.configs.ConfigCategory
|
||||
import org.bukkit.ChatColor
|
||||
import org.bukkit.NamespacedKey
|
||||
import org.bukkit.enchantments.Enchantment
|
||||
import org.bukkit.event.Listener
|
||||
|
||||
@Suppress("UNUSED")
|
||||
object EcoEnchants {
|
||||
object EcoEnchants : ConfigCategory("enchant", "enchants") {
|
||||
private val BY_KEY = HashBiMap.create<String, EcoEnchant>()
|
||||
private val BY_NAME = HashBiMap.create<String, EcoEnchant>()
|
||||
|
||||
@ -83,18 +86,8 @@ object EcoEnchants {
|
||||
} else BY_NAME[name]
|
||||
}
|
||||
|
||||
/**
|
||||
* Update all [EcoEnchant]s.
|
||||
*
|
||||
* @param plugin Instance of EcoEnchants.
|
||||
*/
|
||||
@JvmStatic
|
||||
@ConfigUpdater
|
||||
fun update(plugin: EcoEnchantsPlugin) {
|
||||
EnchantmentRarities.update(plugin)
|
||||
EnchantmentTargets.update(plugin)
|
||||
EnchantmentTypes.update(plugin)
|
||||
|
||||
override fun clear(plugin: LibreforgePlugin) {
|
||||
for (enchant in values()) {
|
||||
removeEnchant(enchant)
|
||||
|
||||
@ -102,26 +95,39 @@ object EcoEnchants {
|
||||
plugin.eventManager.unregisterListener(listener)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for ((id, config) in plugin.fetchConfigs("enchants")) {
|
||||
if (config.has("effects")) {
|
||||
try {
|
||||
LibReforgeEcoEnchant(
|
||||
id,
|
||||
config,
|
||||
plugin
|
||||
)
|
||||
} catch (e: MissingDependencyException) {
|
||||
addPluginPrompt(plugin, e.plugins)
|
||||
}
|
||||
}
|
||||
}
|
||||
override fun beforeReload(plugin: LibreforgePlugin) {
|
||||
plugin as EcoEnchantsPlugin
|
||||
|
||||
EnchantmentRarities.update(plugin)
|
||||
EnchantmentTargets.update(plugin)
|
||||
EnchantmentTypes.update(plugin)
|
||||
}
|
||||
|
||||
override fun afterReload(plugin: LibreforgePlugin) {
|
||||
plugin as EcoEnchantsPlugin
|
||||
|
||||
sendPrompts(plugin)
|
||||
|
||||
registerHardcodedEnchantments(plugin)
|
||||
}
|
||||
|
||||
override fun acceptConfig(plugin: LibreforgePlugin, id: String, config: Config) {
|
||||
plugin as EcoEnchantsPlugin
|
||||
|
||||
if (config.has("effects")) {
|
||||
try {
|
||||
LibReforgeEcoEnchant(
|
||||
id,
|
||||
config,
|
||||
plugin
|
||||
)
|
||||
} catch (e: MissingDependencyException) {
|
||||
addPluginPrompt(plugin, e.plugins)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove [Enchantment] from EcoEnchants.
|
||||
*
|
||||
@ -157,7 +163,6 @@ object EcoEnchants {
|
||||
*
|
||||
* @param enchant The [EcoEnchant] to add.
|
||||
*/
|
||||
@Suppress("UNCHECKED_CAST", "DEPRECATION")
|
||||
internal fun addNewEnchant(enchant: EcoEnchant) {
|
||||
register(enchant)
|
||||
|
||||
|
@ -3,9 +3,11 @@ package com.willfp.ecoenchants.enchants
|
||||
import com.willfp.eco.core.config.interfaces.Config
|
||||
import com.willfp.ecoenchants.EcoEnchantsPlugin
|
||||
import com.willfp.libreforge.Holder
|
||||
import com.willfp.libreforge.conditions.ConfiguredCondition
|
||||
import com.willfp.libreforge.effects.ConfiguredEffect
|
||||
import com.willfp.libreforge.ViolationContext
|
||||
import com.willfp.libreforge.conditions.ConditionList
|
||||
import com.willfp.libreforge.effects.EffectList
|
||||
import com.willfp.libreforge.effects.Effects
|
||||
import com.willfp.libreforge.loader.LibreforgePlugin
|
||||
import java.util.Objects
|
||||
|
||||
class LibReforgeEcoEnchant(
|
||||
@ -17,26 +19,27 @@ class LibReforgeEcoEnchant(
|
||||
config,
|
||||
plugin
|
||||
) {
|
||||
private val effects: Set<ConfiguredEffect>
|
||||
private val effects: EffectList
|
||||
|
||||
init {
|
||||
effects = if (plugin.isLoaded) Effects.compile(
|
||||
config.getSubsections("effects"),
|
||||
"Enchantment $id"
|
||||
) else emptySet()
|
||||
ViolationContext(plugin, "Enchantment $id")
|
||||
) else EffectList(emptyList())
|
||||
}
|
||||
|
||||
override fun createLevel(level: Int): EcoEnchantLevel =
|
||||
EcoEnchantLevel(this, level, effects, conditions)
|
||||
EcoEnchantLevel(this, level, effects, conditions, plugin)
|
||||
}
|
||||
|
||||
class EcoEnchantLevel(
|
||||
parent: EcoEnchant,
|
||||
level: Int,
|
||||
override val effects: Set<ConfiguredEffect>,
|
||||
override val conditions: Set<ConfiguredCondition>
|
||||
override val effects: EffectList,
|
||||
override val conditions: ConditionList,
|
||||
plugin: LibreforgePlugin
|
||||
) : Holder {
|
||||
override val id = "${parent.id}_$level"
|
||||
override val id = plugin.createNamespacedKey("${parent.id}_$level")
|
||||
|
||||
override fun equals(other: Any?): Boolean {
|
||||
if (other !is EcoEnchantLevel) {
|
||||
@ -47,7 +50,7 @@ class EcoEnchantLevel(
|
||||
}
|
||||
|
||||
override fun toString(): String {
|
||||
return id
|
||||
return id.toString()
|
||||
}
|
||||
|
||||
override fun hashCode(): Int {
|
||||
|
@ -1,5 +1,6 @@
|
||||
package com.willfp.ecoenchants.enchants
|
||||
|
||||
import com.willfp.eco.core.EcoPlugin
|
||||
import com.willfp.ecoenchants.EcoEnchantsPlugin
|
||||
|
||||
class MissingDependencyException(
|
||||
@ -8,7 +9,7 @@ class MissingDependencyException(
|
||||
override val message = "Missing the following plugins: ${plugins.joinToString(", ")}"
|
||||
}
|
||||
|
||||
// Plugin names mapped to enchants not installed.
|
||||
// Plugin names mapped to enchants that aren't installed.
|
||||
private val prompts = mutableMapOf<String, Int>()
|
||||
|
||||
fun addPluginPrompt(plugin: EcoEnchantsPlugin, plugins: List<String>) {
|
||||
@ -21,7 +22,7 @@ fun addPluginPrompt(plugin: EcoEnchantsPlugin, plugins: List<String>) {
|
||||
}
|
||||
}
|
||||
|
||||
fun sendPrompts(plugin: EcoEnchantsPlugin) {
|
||||
fun sendPrompts(plugin: EcoPlugin) {
|
||||
for ((pl, amount) in prompts) {
|
||||
plugin.logger.apply {
|
||||
warning("$amount enchantments were not loaded because they need $pl to be installed!")
|
||||
|
@ -4,12 +4,14 @@ import com.github.benmanes.caffeine.cache.Caffeine
|
||||
import com.willfp.eco.core.fast.fast
|
||||
import com.willfp.ecoenchants.enchants.EcoEnchant
|
||||
import com.willfp.ecoenchants.enchants.EcoEnchantLevel
|
||||
import com.willfp.libreforge.ItemProvidedHolder
|
||||
import com.willfp.libreforge.ProvidedHolder
|
||||
import org.bukkit.entity.Player
|
||||
import org.bukkit.inventory.ItemStack
|
||||
import java.util.concurrent.TimeUnit
|
||||
|
||||
// The Int is the inventory slot ID
|
||||
typealias SlotProvider = (Player) -> Map<Int, ItemInSlot>
|
||||
typealias SlotProvider = (Player) -> Map<ItemInNumericSlot, ItemInSlot>
|
||||
|
||||
data class ItemInSlot internal constructor(
|
||||
val item: ItemStack,
|
||||
@ -21,6 +23,11 @@ data class ItemInSlot internal constructor(
|
||||
) : this(item, listOf(slot))
|
||||
}
|
||||
|
||||
data class ItemInNumericSlot internal constructor(
|
||||
val item: ItemStack,
|
||||
val slot: Int
|
||||
)
|
||||
|
||||
private data class HeldEnchant(
|
||||
val enchant: EcoEnchant,
|
||||
val level: Int
|
||||
@ -31,21 +38,21 @@ object EnchantLookup {
|
||||
|
||||
private val itemCache = Caffeine.newBuilder()
|
||||
.expireAfterWrite(2, TimeUnit.SECONDS)
|
||||
.build<Player, Map<Int, ItemInSlot>>()
|
||||
.build<Player, Map<ItemInNumericSlot, ItemInSlot>>()
|
||||
|
||||
private val enchantCache = Caffeine.newBuilder()
|
||||
.expireAfterWrite(2, TimeUnit.SECONDS)
|
||||
.build<Player, Map<Int, Collection<HeldEnchant>>>()
|
||||
.build<Player, Map<ItemInNumericSlot, Collection<HeldEnchant>>>()
|
||||
|
||||
// Higher frequency cache as less intensive
|
||||
private val enchantLevelCache = Caffeine.newBuilder()
|
||||
.expireAfterWrite(200, TimeUnit.MILLISECONDS)
|
||||
.build<Player, Map<EcoEnchant, Int>>()
|
||||
.build<Player, Map<ItemInNumericSlot, Map<EcoEnchant, Int>>>()
|
||||
|
||||
@JvmStatic
|
||||
fun registerProvider(provider: SlotProvider) {
|
||||
slotProviders.add {
|
||||
val found = mutableMapOf<Int, ItemInSlot>()
|
||||
val found = mutableMapOf<ItemInNumericSlot, ItemInSlot>()
|
||||
for ((slot, inSlot) in provider(it)) {
|
||||
found[slot] = inSlot
|
||||
}
|
||||
@ -53,14 +60,16 @@ object EnchantLookup {
|
||||
}
|
||||
}
|
||||
|
||||
private fun provide(player: Player): Map<Int, ItemInSlot> {
|
||||
private fun provide(player: Player): Map<ItemInNumericSlot, ItemInSlot> {
|
||||
return itemCache.get(player) {
|
||||
val found = mutableMapOf<Int, ItemInSlot>()
|
||||
val found = mutableMapOf<ItemInNumericSlot, ItemInSlot>()
|
||||
|
||||
for (provider in slotProviders) {
|
||||
val fromProvider = provider(player)
|
||||
for ((slot, item) in fromProvider) {
|
||||
// Basically a multimap
|
||||
val current = found[slot]
|
||||
|
||||
if (current == null) {
|
||||
found[slot] = item
|
||||
} else {
|
||||
@ -76,10 +85,10 @@ object EnchantLookup {
|
||||
/**
|
||||
* The inventory slot IDs mapped to HeldEnchants found in that slot.
|
||||
*/
|
||||
private val Player.slotHeldEnchants: Map<Int, Collection<HeldEnchant>>
|
||||
private val Player.slotHeldEnchants: Map<ItemInNumericSlot, Collection<HeldEnchant>>
|
||||
get() {
|
||||
return enchantCache.get(this) {
|
||||
val found = mutableMapOf<Int, MutableCollection<HeldEnchant>>()
|
||||
val found = mutableMapOf<ItemInNumericSlot, MutableCollection<HeldEnchant>>()
|
||||
|
||||
for ((slotID, inSlot) in provide(this)) {
|
||||
val (item, slot) = inSlot
|
||||
@ -113,29 +122,80 @@ object EnchantLookup {
|
||||
}
|
||||
|
||||
/**
|
||||
* All EcoEnchants mapped to their IDs, regardless of conditions.
|
||||
* Slot IDs mapped to HeldEnchants found in that slot.
|
||||
*/
|
||||
val Player.heldEnchants: Map<EcoEnchant, Int>
|
||||
private val Player.slotIDHeldEnchants: Map<Int, Collection<HeldEnchant>>
|
||||
get() {
|
||||
return this.slotHeldEnchants.mapKeys { it.key.slot }
|
||||
}
|
||||
|
||||
/**
|
||||
* All slots holding EcoEnchants mapped to their IDs, regardless of conditions.
|
||||
*/
|
||||
val Player.heldEnchantsInSlots: Map<ItemInNumericSlot, Map<EcoEnchant, Int>>
|
||||
get() {
|
||||
return enchantLevelCache.get(this) {
|
||||
val found = mutableMapOf<EcoEnchant, Int>()
|
||||
val found = mutableMapOf<ItemInNumericSlot, MutableMap<EcoEnchant, Int>>()
|
||||
|
||||
for ((enchant, level) in it.slotHeldEnchants.values.flatten()) {
|
||||
found[enchant] = found.getOrDefault(enchant, 0) + level
|
||||
for ((inSlot, enchants) in this.slotHeldEnchants) {
|
||||
val map = mutableMapOf<EcoEnchant, Int>()
|
||||
for ((enchant, level) in enchants) {
|
||||
map[enchant] = level
|
||||
}
|
||||
found[inSlot] = map
|
||||
}
|
||||
|
||||
found
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* All EcoEnchants mapped to their IDs, regardless of conditions.
|
||||
*/
|
||||
val Player.heldEnchants: Map<EcoEnchant, Int>
|
||||
get() {
|
||||
val found = mutableMapOf<EcoEnchant, Int>()
|
||||
for ((_, enchants) in this.heldEnchantsInSlots) {
|
||||
for ((enchant, level) in enchants) {
|
||||
found[enchant] = level
|
||||
}
|
||||
}
|
||||
|
||||
return found
|
||||
}
|
||||
|
||||
/**
|
||||
* All slots mapped to EcoEnchants mapped to their IDs, respecting conditions.
|
||||
*/
|
||||
val Player.activeEnchantsInSlots: Map<ItemInNumericSlot, Map<EcoEnchant, Int>>
|
||||
get() {
|
||||
val found = mutableMapOf<ItemInNumericSlot, MutableMap<EcoEnchant, Int>>()
|
||||
for ((slot, enchants) in this.heldEnchantsInSlots) {
|
||||
val inSlot = mutableMapOf<EcoEnchant, Int>()
|
||||
for ((enchant, level) in enchants) {
|
||||
if (enchant.getLevel(level).conditions.all { it.isMet(this) }) {
|
||||
inSlot[enchant] = level
|
||||
}
|
||||
}
|
||||
found[slot] = inSlot
|
||||
}
|
||||
|
||||
return found
|
||||
}
|
||||
|
||||
/**
|
||||
* All EcoEnchants mapped to their IDs, respecting conditions.
|
||||
*/
|
||||
val Player.activeEnchants: Map<EcoEnchant, Int>
|
||||
get() {
|
||||
return this.heldEnchants.filter { (enchant, level) ->
|
||||
enchant.getLevel(level).conditions.all { it.isMet(this) }
|
||||
val found = mutableMapOf<EcoEnchant, Int>()
|
||||
for ((_, enchants) in this.activeEnchantsInSlots) {
|
||||
for ((enchant, level) in enchants) {
|
||||
found[enchant] = level
|
||||
}
|
||||
}
|
||||
|
||||
return found
|
||||
}
|
||||
|
||||
/**
|
||||
@ -162,7 +222,7 @@ object EnchantLookup {
|
||||
* @return The level, or 0 if not found.
|
||||
*/
|
||||
fun Player.getEnchantLevelInSlot(enchant: EcoEnchant, slot: Int): Int {
|
||||
val inSlot = this.slotHeldEnchants[slot] ?: return 0
|
||||
val inSlot = this.slotIDHeldEnchants[slot] ?: return 0
|
||||
val heldEnchant = inSlot.firstOrNull { it.enchant == enchant } ?: return 0
|
||||
return heldEnchant.level
|
||||
}
|
||||
@ -222,9 +282,18 @@ object EnchantLookup {
|
||||
return this.getActiveEnchantLevelInSlot(enchant, slot) > 0
|
||||
}
|
||||
|
||||
val Player.heldEnchantLevels: List<EcoEnchantLevel>
|
||||
get() = this.heldEnchants
|
||||
.map { (enchant, level) -> enchant.getLevel(level) }
|
||||
val Player.heldEnchantLevels: List<ProvidedHolder<ItemStack>>
|
||||
get() {
|
||||
val found = mutableListOf<ProvidedHolder<ItemStack>>()
|
||||
|
||||
for ((slot, enchants) in this.heldEnchantsInSlots) {
|
||||
for ((enchant, level) in enchants) {
|
||||
found.add(ItemProvidedHolder(enchant.getLevel(level), slot.item))
|
||||
}
|
||||
}
|
||||
|
||||
return found
|
||||
}
|
||||
|
||||
/**
|
||||
* Clear item and enchant cache.
|
||||
@ -238,11 +307,13 @@ object EnchantLookup {
|
||||
init {
|
||||
fun createProvider(slot: TargetSlot): SlotProvider {
|
||||
return { player: Player ->
|
||||
val found = mutableMapOf<Int, ItemInSlot>()
|
||||
val found = mutableMapOf<ItemInNumericSlot, ItemInSlot>()
|
||||
|
||||
for (slotID in slot.getItemSlots(player)) {
|
||||
val item = player.inventory.getItem(slotID) ?: continue
|
||||
found[slotID] = ItemInSlot(item, slot)
|
||||
found[
|
||||
ItemInNumericSlot(item, slotID)
|
||||
] = ItemInSlot(item, slot)
|
||||
}
|
||||
|
||||
found
|
||||
|
@ -1,16 +0,0 @@
|
||||
# Read more about chains: https://plugins.auxilor.io/effects/configuring-an-effect#effect-chains
|
||||
|
||||
chains:
|
||||
- id: shoot_extra_arrows
|
||||
effects:
|
||||
- id: shoot_arrow
|
||||
args:
|
||||
repeat:
|
||||
times: "2 * %arrows%"
|
||||
start: "-11 * %arrows%"
|
||||
increment: 22
|
||||
inherit_velocity: true
|
||||
mutators:
|
||||
- id: spin_velocity
|
||||
args:
|
||||
angle: '%repeat_count%'
|
@ -167,48 +167,3 @@ enchant-gui:
|
||||
lore-conversion:
|
||||
enabled: false # If lore conversion should be enabled
|
||||
aggressive: false # Will convert all items in all inventories when opened, likely to use a lot of performance
|
||||
|
||||
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 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
|
||||
|
@ -1,4 +1,9 @@
|
||||
resource-id: 490
|
||||
bstats-id: 7666
|
||||
color: "&a"
|
||||
proxy-package: "com.willfp.ecoenchants.proxy"
|
||||
options:
|
||||
resource-id: 490
|
||||
bstats-id: 7666
|
||||
color: "&a"
|
||||
proxy-package: "com.willfp.ecoenchants.proxy"
|
||||
|
||||
environment:
|
||||
- name: libreforge version
|
||||
value: ${libreforgeVersion}
|
@ -4,19 +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%"
|
||||
|
||||
invalid-player: "&cInvalid Player!"
|
||||
requires-player: "&cRequires a Player!"
|
||||
enabled-descriptions: "&fYou have successfully &aenabled &fenchantment descriptions!"
|
||||
|
@ -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 /ecoenchants export <config>.
|
25
eco-core/core-plugin/src/main/resources/paper-plugin.yml
Normal file
25
eco-core/core-plugin/src/main/resources/paper-plugin.yml
Normal file
@ -0,0 +1,25 @@
|
||||
name: ${pluginName}
|
||||
version: ${version}
|
||||
main: com.willfp.ecoenchants.EcoEnchantsPlugin
|
||||
api-version: 1.19
|
||||
|
||||
dependencies:
|
||||
- name: eco
|
||||
required: true
|
||||
bootstrap: false
|
||||
|
||||
- name: libreforge
|
||||
required: false
|
||||
bootstrap: false
|
||||
|
||||
- name: CMI
|
||||
required: false
|
||||
bootstrap: false
|
||||
|
||||
- name: EssentialsX
|
||||
required: false
|
||||
bootstrap: false
|
||||
|
||||
load-after:
|
||||
- name: eco
|
||||
bootstrap: false
|
@ -1,25 +1,14 @@
|
||||
name: EcoEnchants
|
||||
version: ${projectVersion}
|
||||
name: ${pluginName}
|
||||
version: ${version}
|
||||
main: com.willfp.ecoenchants.EcoEnchantsPlugin
|
||||
api-version: 1.17
|
||||
authors: [ Auxilor ]
|
||||
website: willfp.com
|
||||
load: STARTUP
|
||||
depend:
|
||||
- eco
|
||||
softdepend:
|
||||
- Vault
|
||||
- AureliumSkills
|
||||
- PlayerPoints
|
||||
- Jobs
|
||||
- TMMobcoins
|
||||
- Reforges
|
||||
- EcoBosses
|
||||
- Talismans
|
||||
- EcoArmor
|
||||
- EcoItems
|
||||
- EcoSkills
|
||||
- Boosters
|
||||
- CMI
|
||||
- EssentialsX
|
||||
|
||||
commands:
|
||||
ecoenchants:
|
||||
|
@ -1,6 +0,0 @@
|
||||
group 'com.willfp'
|
||||
version rootProject.version
|
||||
|
||||
dependencies {
|
||||
compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
|
||||
}
|
6
eco-core/core-proxy/build.gradle.kts
Normal file
6
eco-core/core-proxy/build.gradle.kts
Normal file
@ -0,0 +1,6 @@
|
||||
group = "com.willfp"
|
||||
version = rootProject.version
|
||||
|
||||
dependencies {
|
||||
compileOnly("io.papermc.paper:paper-api:1.17.1-R0.1-SNAPSHOT")
|
||||
}
|
@ -1,4 +1,5 @@
|
||||
#libreforge-updater
|
||||
#Mon Mar 13 13:41:34 GMT 2023
|
||||
version=9.17.8
|
||||
plugin-name=EcoEnchants
|
||||
#Mon Mar 13 13:39:16 GMT 2023
|
||||
kotlin.code.style=official
|
||||
libreforge-version=4.0.0
|
||||
version=10.0.0
|
||||
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -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
|
||||
|
269
gradlew
vendored
269
gradlew
vendored
@ -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" "$@"
|
||||
|
@ -1,13 +0,0 @@
|
||||
rootProject.name = 'EcoEnchants'
|
||||
|
||||
// Core
|
||||
include ':eco-core'
|
||||
include ':eco-core:core-plugin'
|
||||
include ':eco-core:core-proxy'
|
||||
include ':eco-core:core-nms'
|
||||
include ':eco-core:core-nms:v1_17_R1'
|
||||
include ':eco-core:core-nms:v1_18_R1'
|
||||
include ':eco-core:core-nms:v1_18_R2'
|
||||
include ':eco-core:core-nms:v1_19_R1'
|
||||
include ':eco-core:core-nms:v1_19_R2'
|
||||
include ':eco-core:core-nms:v1_19_R3'
|
21
settings.gradle.kts
Normal file
21
settings.gradle.kts
Normal file
@ -0,0 +1,21 @@
|
||||
pluginManagement {
|
||||
repositories {
|
||||
gradlePluginPortal()
|
||||
mavenLocal()
|
||||
maven("https://jitpack.io")
|
||||
}
|
||||
}
|
||||
|
||||
rootProject.name = "EcoEnchants"
|
||||
|
||||
// Core
|
||||
include(":eco-core")
|
||||
include(":eco-core:core-plugin")
|
||||
include(":eco-core:core-proxy")
|
||||
include(":eco-core:core-nms")
|
||||
include(":eco-core:core-nms:v1_17_R1")
|
||||
include(":eco-core:core-nms:v1_18_R1")
|
||||
include(":eco-core:core-nms:v1_18_R2")
|
||||
include(":eco-core:core-nms:v1_19_R1")
|
||||
include(":eco-core:core-nms:v1_19_R2")
|
||||
include(":eco-core:core-nms:v1_19_R3")
|
Loading…
Reference in New Issue
Block a user