Updated to libreforge 4

This commit is contained in:
Auxilor
2023-03-27 17:54:22 +01:00
parent 9a51267090
commit 1ff97769d3
29 changed files with 473 additions and 583 deletions

View File

@@ -1,133 +0,0 @@
buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
}
}
plugins {
id 'java-library'
id 'com.github.johnrengelman.shadow' version '7.0.0'
id 'maven-publish'
id 'java'
}
dependencies {
implementation project(":eco-core").getSubprojects()
}
allprojects {
apply plugin: 'java'
apply plugin: 'maven-publish'
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'kotlin'
repositories {
mavenCentral()
mavenLocal()
maven { url 'https://jitpack.io' }
maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
maven { url 'https://repo.codemc.org/repository/nms/' }
maven { url 'https://repo.codemc.org/repository/maven-public' }
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
maven { url 'https://oss.sonatype.org/content/groups/public/' }
maven { url 'https://maven.enginehub.org/repo/' }
maven { url 'https://ci.ender.zone/plugin/repository/project/' }
maven { url 'https://ci.ender.zone/plugin/repository/everything/' }
maven { url 'https://repo.md-5.net/content/repositories/snapshots/' }
maven { url 'https://repo.dmulloy2.net/nexus/repository/public/' }
maven { url 'https://papermc.io/repo/repository/maven-public/' }
maven { url 'https://repo.maven.apache.org/maven2/' }
maven { url 'https://repo.dustplanet.de/artifactory/ext-release-local/' }
maven { url 'https://libraries.minecraft.net/' }
maven { url 'https://repo.spongepowered.org/maven/' }
maven { url 'https://repo.mikeprimm.com/' }
maven { url 'https://maven.sk89q.com/repo/' }
maven { url 'https://github.com/factions-site/repo/raw/public/' }
maven { url 'https://repo.extendedclip.com/content/repositories/placeholderapi/' }
}
jar {
onlyIf { !sourceSets.main.allSource.files.isEmpty() }
}
shadowJar {
relocate('com.willfp.libreforge', 'com.willfp.ecoitems.libreforge')
relocate('org.joml', 'com.willfp.ecoitems.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.10'
}
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
}
}
java.sourceCompatibility = JavaVersion.VERSION_17
java.targetCompatibility = JavaVersion.VERSION_17
compileJava.options.encoding = 'UTF-8'
compileJava.dependsOn clean
build.dependsOn shadowJar
}
tasks.withType(Jar) {
destinationDirectory = file("$rootDir/bin/")
}
clean.doLast {
file("${rootDir}/bin").deleteDir()
}
shadowJar {
archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + ".jar"
}
jar {
archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + " " + "unshaded" + ".jar"
}
group = 'com.willfp'
archivesBaseName = project.name
version = findProperty("version")
compileJava.options.encoding = 'UTF-8'
build.dependsOn shadowJar
task buyThePlugins {
dependsOn subprojects.build
doLast {
println 'If you like the plugin, please consider buying it on Spigot or Polymart!'
println 'Spigot: https://www.spigotmc.org/resources/authors/auxilor.507394/'
println 'Polymart: https://polymart.org/user/auxilor.1107/'
println 'Buying gives you access to support and the plugin auto-updater, and it allows me to keep developing plugins.'
}
}
build.finalizedBy buyThePlugins

81
build.gradle.kts Normal file
View File

@@ -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.libreforgetemplate.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)
}
}
}

View File

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

View File

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

View File

@@ -1,6 +0,0 @@
group 'com.willfp'
version rootProject.version
dependencies {
compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
}

View File

@@ -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)
}
}

View File

@@ -5,14 +5,17 @@ import com.willfp.eco.core.display.DisplayModule
import com.willfp.ecoitems.commands.CommandEcoItems import com.willfp.ecoitems.commands.CommandEcoItems
import com.willfp.ecoitems.display.ItemsDisplay import com.willfp.ecoitems.display.ItemsDisplay
import com.willfp.ecoitems.items.EcoItems import com.willfp.ecoitems.items.EcoItems
import com.willfp.ecoitems.items.EcoItemsRecipes
import com.willfp.ecoitems.items.ItemAttributeListener import com.willfp.ecoitems.items.ItemAttributeListener
import com.willfp.ecoitems.items.ItemListener import com.willfp.ecoitems.items.ItemListener
import com.willfp.ecoitems.items.ItemUtils import com.willfp.ecoitems.items.ItemUtils
import com.willfp.ecoitems.util.DiscoverRecipeListener import com.willfp.ecoitems.util.DiscoverRecipeListener
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 import org.bukkit.event.Listener
class EcoItemsPlugin : LibReforgePlugin() { class EcoItemsPlugin : LibreforgePlugin() {
/** /**
* Internal constructor called by bukkit on plugin load. * Internal constructor called by bukkit on plugin load.
*/ */
@@ -21,16 +24,17 @@ class EcoItemsPlugin : LibReforgePlugin() {
registerHolderProvider { ItemUtils.getEcoItemsOnPlayer(it) } registerHolderProvider { ItemUtils.getEcoItemsOnPlayer(it) }
} }
override fun handleEnableAdditional() { override fun loadConfigCategories(): List<ConfigCategory> {
this.copyConfigs("items") return listOf(
EcoItems,
EcoItems.update(this) // Preliminary update EcoItemsRecipes
)
} }
override fun loadListeners(): List<Listener> { override fun loadListeners(): List<Listener> {
return listOf( return listOf(
DiscoverRecipeListener(this), DiscoverRecipeListener(this),
ItemListener(this), ItemListener,
ItemAttributeListener(this) ItemAttributeListener(this)
) )
} }

View File

@@ -1,15 +1,11 @@
package com.willfp.ecoitems.commands package com.willfp.ecoitems.commands
import com.willfp.eco.core.EcoPlugin
import com.willfp.eco.core.command.impl.PluginCommand import com.willfp.eco.core.command.impl.PluginCommand
import com.willfp.ecoitems.items.EcoItems
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.command.CommandSender
class CommandEcoItems( class CommandEcoItems(
plugin: LibReforgePlugin plugin: EcoPlugin
) : PluginCommand( ) : PluginCommand(
plugin, plugin,
"ecoitems", "ecoitems",
@@ -18,15 +14,6 @@ class CommandEcoItems(
init { init {
addSubcommand(CommandReload(plugin)) addSubcommand(CommandReload(plugin))
.addSubcommand(CommandGive(plugin)) .addSubcommand(CommandGive(plugin))
.addSubcommand(CommandImport("items", plugin))
.addSubcommand(CommandExport(plugin) {
EcoItems.values().map {
ExportableConfig(
it.id,
it.config
)
}
})
} }
override fun onExecute(sender: CommandSender, args: List<String>) { override fun onExecute(sender: CommandSender, args: List<String>) {

View File

@@ -67,7 +67,7 @@ class CommandGive(plugin: EcoPlugin) : Subcommand(plugin, "give", "ecoitems.comm
val completions = mutableListOf<String>() val completions = mutableListOf<String>()
if (args.isEmpty()) { if (args.isEmpty()) {
return EcoItems.values().map { it.id } return EcoItems.values().map { it.id.key }
} }
if (args.size == 1) { if (args.size == 1) {
@@ -80,7 +80,7 @@ class CommandGive(plugin: EcoPlugin) : Subcommand(plugin, "give", "ecoitems.comm
} }
if (args.size == 2) { if (args.size == 2) {
val itemNames = EcoItems.values().map { it.id } val itemNames = EcoItems.values().map { it.id.key }
StringUtil.copyPartialMatches(args[1], itemNames, completions) StringUtil.copyPartialMatches(args[1], itemNames, completions)
completions.sort() completions.sort()

View File

@@ -26,7 +26,7 @@ class ItemsDisplay(plugin: EcoPlugin) : DisplayModule(plugin, DisplayPriority.LO
val lore = ecoItem.lore.map { "${Display.PREFIX}${StringUtils.format(it, player)}" }.toMutableList() val lore = ecoItem.lore.map { "${Display.PREFIX}${StringUtils.format(it, player)}" }.toMutableList()
if (player != null) { if (player != null) {
val lines = ecoItem.getNotMetLines(player).map { Display.PREFIX + it } val lines = ecoItem.conditions.getNotMetLines(player).map { Display.PREFIX + it }
if (lines.isNotEmpty()) { if (lines.isNotEmpty()) {
lore.add(Display.PREFIX) lore.add(Display.PREFIX)

View File

@@ -7,7 +7,9 @@ import com.willfp.eco.core.items.CustomItem
import com.willfp.eco.core.items.Items import com.willfp.eco.core.items.Items
import com.willfp.eco.core.items.builder.ItemStackBuilder import com.willfp.eco.core.items.builder.ItemStackBuilder
import com.willfp.eco.core.recipe.Recipes import com.willfp.eco.core.recipe.Recipes
import com.willfp.eco.core.registry.Registrable
import com.willfp.libreforge.Holder import com.willfp.libreforge.Holder
import com.willfp.libreforge.ViolationContext
import com.willfp.libreforge.conditions.Conditions import com.willfp.libreforge.conditions.Conditions
import com.willfp.libreforge.effects.Effects import com.willfp.libreforge.effects.Effects
import org.bukkit.inventory.ItemStack import org.bukkit.inventory.ItemStack
@@ -15,20 +17,26 @@ import org.bukkit.persistence.PersistentDataType
import java.util.Objects import java.util.Objects
class EcoItem( class EcoItem(
override val id: String, id: String,
val config: Config, val config: Config,
private val plugin: EcoPlugin private val plugin: EcoPlugin
) : Holder { ) : Holder, Registrable {
override val effects = Effects.compile( override val effects = Effects.compile(
config.getSubsections("effects"), config.getSubsections("effects"),
"Item ID $id" ViolationContext(plugin, "Item ID $id")
) )
override val conditions = Conditions.compile( override val conditions = Conditions.compile(
config.getSubsections("conditions"), config.getSubsections("conditions"),
"Item ID $id" ViolationContext(plugin, "Item ID $id")
) )
override val id = plugin.createNamespacedKey(id)
override fun getID(): String {
return this.id.key
}
val lore: List<String> = config.getStrings("item.lore") val lore: List<String> = config.getStrings("item.lore")
val displayName: String = config.getString("item.display-name") val displayName: String = config.getString("item.display-name")

View File

@@ -1,23 +1,22 @@
package com.willfp.ecoitems.items package com.willfp.ecoitems.items
import com.google.common.collect.BiMap
import com.google.common.collect.HashBiMap
import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableList
import com.willfp.eco.core.EcoPlugin import com.willfp.eco.core.EcoPlugin
import com.willfp.eco.core.config.ConfigType
import com.willfp.eco.core.config.interfaces.Config import com.willfp.eco.core.config.interfaces.Config
import com.willfp.eco.core.config.readConfig import com.willfp.eco.core.registry.Registry
import com.willfp.eco.core.config.updating.ConfigUpdater import com.willfp.libreforge.loader.LibreforgePlugin
import com.willfp.eco.core.items.Items import com.willfp.libreforge.loader.configs.ConfigCategory
import com.willfp.eco.core.recipe.Recipes import com.willfp.libreforge.loader.configs.LegacyLocation
import com.willfp.ecoitems.EcoItemsPlugin
import com.willfp.libreforge.separatorAmbivalent import com.willfp.libreforge.separatorAmbivalent
import java.io.File
import java.util.Objects
object EcoItems { object EcoItems : ConfigCategory("item", "items") {
/** Registered items. */ /** Registered items. */
private val BY_ID: BiMap<String, EcoItem> = HashBiMap.create() private val registry = Registry<EcoItem>()
override val legacyLocation = LegacyLocation(
"items.yml",
"items"
)
/** /**
* Get all registered [EcoItem]s. * Get all registered [EcoItem]s.
@@ -26,7 +25,7 @@ object EcoItems {
*/ */
@JvmStatic @JvmStatic
fun values(): List<EcoItem> { fun values(): List<EcoItem> {
return ImmutableList.copyOf(BY_ID.values) return ImmutableList.copyOf(registry.values())
} }
/** /**
@@ -37,83 +36,14 @@ object EcoItems {
*/ */
@JvmStatic @JvmStatic
fun getByID(name: String): EcoItem? { fun getByID(name: String): EcoItem? {
return BY_ID[name] return registry[name]
} }
/** override fun clear(plugin: LibreforgePlugin) {
* Update all [EcoItem]s. registry.clear()
*
* @param plugin Instance of EcoItems.
*/
@ConfigUpdater
@JvmStatic
fun update(plugin: EcoItemsPlugin) {
BY_ID.clear()
for ((id, config) in plugin.fetchConfigs("items")) {
addNewItem(EcoItem(id, config.separatorAmbivalent(), plugin))
}
for ((id, config) in plugin.fetchConfigs("recipes", dontShare = true)) {
addNewRecipeFromConfig(plugin, id, config.separatorAmbivalent())
}
val itemsYml = File(plugin.dataFolder, "items.yml").readConfig(ConfigType.YAML)
// Legacy
for (config in itemsYml.getSubsections("items")) {
addNewItem(EcoItem(config.getString("id"), config.separatorAmbivalent(), plugin))
}
for (config in itemsYml.getSubsections("recipes")) {
addNewRecipeFromConfig(
plugin,
Objects.hash(config.getStrings("recipe")).toString(),
config.separatorAmbivalent()
)
}
} }
/** override fun acceptConfig(plugin: LibreforgePlugin, id: String, config: Config) {
* Add new recipe to EcoItems. registry.register(EcoItem(id, config.separatorAmbivalent(), plugin as EcoPlugin))
*
* @param config The config for the recipe.
*/
@JvmStatic
fun addNewRecipeFromConfig(plugin: EcoPlugin, id: String, config: Config) {
val result = Items.lookup(config.getString("result"))
val item = result.item
if (config.has("recipe-give-amount")) {
item.amount = config.getInt("recipe-give-amount") // Legacy
}
plugin.scheduler.run {
Recipes.createAndRegisterRecipe(
plugin,
id,
item,
config.getStrings("recipe"),
config.getStringOrNull("permission")
)
}
}
/**
* Add new [EcoItem] to EcoItems.
*
* @param item The [EcoItem] to add.
*/
@JvmStatic
fun addNewItem(item: EcoItem) {
BY_ID.remove(item.id)
BY_ID[item.id] = item
}
/**
* Remove [EcoItem] from EcoItems.
*
* @param item The [EcoItem] to remove.
*/
@JvmStatic
fun removeItem(item: EcoItem) {
BY_ID.remove(item.id)
} }
} }

View File

@@ -0,0 +1,32 @@
package com.willfp.ecoitems.items
import com.willfp.eco.core.config.interfaces.Config
import com.willfp.eco.core.items.Items
import com.willfp.eco.core.recipe.Recipes
import com.willfp.libreforge.loader.LibreforgePlugin
import com.willfp.libreforge.loader.configs.ConfigCategory
import com.willfp.libreforge.loader.configs.LegacyLocation
object EcoItemsRecipes : ConfigCategory("recipe", "recipes") {
override val legacyLocation = LegacyLocation(
"items.yml",
"recipes"
)
override fun clear(plugin: LibreforgePlugin) {
// Do nothing.
}
override fun acceptConfig(plugin: LibreforgePlugin, id: String, config: Config) {
val result = Items.lookup(config.getString("result"))
val item = result.item
if (config.has("recipe-give-amount")) {
item.amount = config.getInt("recipe-give-amount") // Legacy
}
plugin.scheduler.run {
Recipes.createAndRegisterRecipe(
plugin, id, item, config.getStrings("recipe"), config.getStringOrNull("permission")
)
}
}
}

View File

@@ -22,6 +22,7 @@ class ItemAttributeListener(private val plugin: EcoPlugin) : Listener {
private fun apply(player: Player) { private fun apply(player: Player) {
val items = ItemUtils.getEcoItemsOnPlayer(player) val items = ItemUtils.getEcoItemsOnPlayer(player)
.map { it.holder as EcoItem }
val damageInst = player.getAttribute(Attribute.GENERIC_ATTACK_DAMAGE) ?: return val damageInst = player.getAttribute(Attribute.GENERIC_ATTACK_DAMAGE) ?: return
val speedInst = player.getAttribute(Attribute.GENERIC_ATTACK_SPEED) ?: return val speedInst = player.getAttribute(Attribute.GENERIC_ATTACK_SPEED) ?: return
@@ -68,7 +69,7 @@ class ItemAttributeListener(private val plugin: EcoPlugin) : Listener {
AttributeModifier( AttributeModifier(
UUID.nameUUIDFromBytes("ecoitems_ad_$offset".toByteArray()), UUID.nameUUIDFromBytes("ecoitems_ad_$offset".toByteArray()),
"EcoItems Damage $offset", "EcoItems Damage $offset",
item.baseDamage - player.inventory.itemInMainHand.type.getBaseDamage(), item.baseDamage - player.inventory.itemInMainHand.type.baseDamage,
AttributeModifier.Operation.ADD_NUMBER AttributeModifier.Operation.ADD_NUMBER
) )
) )
@@ -77,7 +78,7 @@ class ItemAttributeListener(private val plugin: EcoPlugin) : Listener {
AttributeModifier( AttributeModifier(
UUID.nameUUIDFromBytes("ecoitems_as_$offset".toByteArray()), UUID.nameUUIDFromBytes("ecoitems_as_$offset".toByteArray()),
"EcoItems Speed $offset", "EcoItems Speed $offset",
item.baseAttackSpeed - player.inventory.itemInMainHand.type.getBaseAttackSpeed(), item.baseAttackSpeed - player.inventory.itemInMainHand.type.baseAttackSpeed,
AttributeModifier.Operation.ADD_NUMBER AttributeModifier.Operation.ADD_NUMBER
) )
) )

View File

@@ -1,8 +1,6 @@
package com.willfp.ecoitems.items package com.willfp.ecoitems.items
import com.willfp.eco.core.EcoPlugin
import com.willfp.eco.util.NumberUtils import com.willfp.eco.util.NumberUtils
import com.willfp.libreforge.updateEffects
import org.bukkit.event.EventHandler import org.bukkit.event.EventHandler
import org.bukkit.event.EventPriority import org.bukkit.event.EventPriority
import org.bukkit.event.Listener import org.bukkit.event.Listener
@@ -10,18 +8,9 @@ import org.bukkit.event.block.Action
import org.bukkit.event.block.BlockPlaceEvent import org.bukkit.event.block.BlockPlaceEvent
import org.bukkit.event.player.PlayerInteractEvent import org.bukkit.event.player.PlayerInteractEvent
import org.bukkit.event.player.PlayerItemDamageEvent import org.bukkit.event.player.PlayerItemDamageEvent
import org.bukkit.event.player.PlayerItemHeldEvent
import kotlin.math.roundToInt import kotlin.math.roundToInt
class ItemListener( object ItemListener : Listener {
private val plugin: EcoPlugin
) : Listener {
@EventHandler
fun onHoldItem(event: PlayerItemHeldEvent) {
event.player.updateEffects()
plugin.scheduler.run { event.player.updateEffects() }
}
@EventHandler(priority = EventPriority.LOW) @EventHandler(priority = EventPriority.LOW)
fun onPlaceItem(event: BlockPlaceEvent) { fun onPlaceItem(event: BlockPlaceEvent) {
ItemUtils.getEcoItem(event.itemInHand) ?: return ItemUtils.getEcoItem(event.itemInHand) ?: return

View File

@@ -3,6 +3,7 @@ package com.willfp.ecoitems.items
import com.willfp.eco.core.fast.FastItemStack import com.willfp.eco.core.fast.FastItemStack
import com.willfp.eco.util.NamespacedKeyUtils import com.willfp.eco.util.NamespacedKeyUtils
import com.willfp.ecoitems.EcoItemsPlugin.Companion.instance import com.willfp.ecoitems.EcoItemsPlugin.Companion.instance
import com.willfp.libreforge.ItemProvidedHolder
import org.bukkit.Material import org.bukkit.Material
import org.bukkit.entity.Player import org.bukkit.entity.Player
import org.bukkit.inventory.ItemStack import org.bukkit.inventory.ItemStack
@@ -43,22 +44,18 @@ object ItemUtils {
private fun getEcoItem(container: PersistentDataContainer): EcoItem? { private fun getEcoItem(container: PersistentDataContainer): EcoItem? {
val legacy = container.get( val legacy = container.get(
legacyKey, legacyKey, PersistentDataType.STRING
PersistentDataType.STRING
) )
if (legacy != null) { if (legacy != null) {
container.set( container.set(
PLUGIN.namespacedKeyFactory.create("item"), PLUGIN.namespacedKeyFactory.create("item"), PersistentDataType.STRING, legacy
PersistentDataType.STRING,
legacy
) )
container.remove(legacyKey) container.remove(legacyKey)
} }
val id = container.get( val id = container.get(
PLUGIN.namespacedKeyFactory.create("item"), PLUGIN.namespacedKeyFactory.create("item"), PersistentDataType.STRING
PersistentDataType.STRING
) ?: return null ) ?: return null
return EcoItems.getByID(id) return EcoItems.getByID(id)
@@ -70,18 +67,26 @@ object ItemUtils {
* @param player The player to check. * @param player The player to check.
* @return The EcoItem, or null if no EcoItem is found. * @return The EcoItem, or null if no EcoItem is found.
*/ */
fun getEcoItemsOnPlayer(player: Player): List<EcoItem> { fun getEcoItemsOnPlayer(player: Player): List<ItemProvidedHolder> {
val list = mutableListOf<EcoItem>() val list = mutableListOf<ItemProvidedHolder>()
val mainhand = getEcoItem(player.inventory.itemInMainHand) val mainhand = getEcoItem(player.inventory.itemInMainHand)
if (mainhand != null) { if (mainhand != null) {
list.add(mainhand) list.add(
ItemProvidedHolder(
mainhand, player.inventory.itemInMainHand
)
)
} }
if (PLUGIN.configYml.getBool("check-offhand")) { if (PLUGIN.configYml.getBool("check-offhand")) {
val offhand = getEcoItem(player.inventory.itemInOffHand) val offhand = getEcoItem(player.inventory.itemInOffHand)
if (offhand != null) { if (offhand != null) {
list.add(offhand) list.add(
ItemProvidedHolder(
offhand, player.inventory.itemInOffHand
)
)
} }
} }
@@ -89,83 +94,85 @@ object ItemUtils {
} }
} }
fun Material.getBaseDamage(): Double { val Material.baseDamage: Double
return when (this) { get() {
Material.WOODEN_SWORD -> 4.0 return when (this) {
Material.WOODEN_SHOVEL -> 2.5 Material.WOODEN_SWORD -> 4.0
Material.WOODEN_PICKAXE -> 2.0 Material.WOODEN_SHOVEL -> 2.5
Material.WOODEN_AXE -> 7.0 Material.WOODEN_PICKAXE -> 2.0
Material.WOODEN_AXE -> 7.0
Material.GOLDEN_SWORD -> 4.0 Material.GOLDEN_SWORD -> 4.0
Material.GOLDEN_SHOVEL -> 2.5 Material.GOLDEN_SHOVEL -> 2.5
Material.GOLDEN_PICKAXE -> 2.0 Material.GOLDEN_PICKAXE -> 2.0
Material.GOLDEN_AXE -> 7.0 Material.GOLDEN_AXE -> 7.0
Material.STONE_SWORD -> 5.0 Material.STONE_SWORD -> 5.0
Material.STONE_SHOVEL -> 3.5 Material.STONE_SHOVEL -> 3.5
Material.STONE_PICKAXE -> 3.0 Material.STONE_PICKAXE -> 3.0
Material.STONE_AXE -> 9.0 Material.STONE_AXE -> 9.0
Material.IRON_SWORD -> 6.0 Material.IRON_SWORD -> 6.0
Material.IRON_SHOVEL -> 4.5 Material.IRON_SHOVEL -> 4.5
Material.IRON_PICKAXE -> 4.0 Material.IRON_PICKAXE -> 4.0
Material.IRON_AXE -> 9.0 Material.IRON_AXE -> 9.0
Material.DIAMOND_SWORD -> 7.0 Material.DIAMOND_SWORD -> 7.0
Material.DIAMOND_SHOVEL -> 5.5 Material.DIAMOND_SHOVEL -> 5.5
Material.DIAMOND_PICKAXE -> 5.0 Material.DIAMOND_PICKAXE -> 5.0
Material.DIAMOND_AXE -> 9.0 Material.DIAMOND_AXE -> 9.0
Material.NETHERITE_SWORD -> 8.0 Material.NETHERITE_SWORD -> 8.0
Material.NETHERITE_SHOVEL -> 6.5 Material.NETHERITE_SHOVEL -> 6.5
Material.NETHERITE_PICKAXE -> 6.0 Material.NETHERITE_PICKAXE -> 6.0
Material.NETHERITE_AXE -> 10.0 Material.NETHERITE_AXE -> 10.0
Material.TRIDENT -> 9.0 Material.TRIDENT -> 9.0
else -> 1.0 else -> 1.0
}
} }
}
fun Material.getBaseAttackSpeed(): Double { val Material.baseAttackSpeed: Double
return when (this) { get() {
Material.WOODEN_SWORD -> 1.6 return when (this) {
Material.STONE_SWORD -> 1.6 Material.WOODEN_SWORD -> 1.6
Material.IRON_SWORD -> 1.6 Material.STONE_SWORD -> 1.6
Material.GOLDEN_SWORD -> 1.6 Material.IRON_SWORD -> 1.6
Material.DIAMOND_SWORD -> 1.6 Material.GOLDEN_SWORD -> 1.6
Material.NETHERITE_SWORD -> 1.6 Material.DIAMOND_SWORD -> 1.6
Material.NETHERITE_SWORD -> 1.6
Material.TRIDENT -> 1.1 Material.TRIDENT -> 1.1
Material.WOODEN_SHOVEL -> 1.0 Material.WOODEN_SHOVEL -> 1.0
Material.STONE_SHOVEL -> 1.0 Material.STONE_SHOVEL -> 1.0
Material.IRON_SHOVEL -> 1.0 Material.IRON_SHOVEL -> 1.0
Material.GOLDEN_SHOVEL -> 1.0 Material.GOLDEN_SHOVEL -> 1.0
Material.DIAMOND_SHOVEL -> 1.0 Material.DIAMOND_SHOVEL -> 1.0
Material.NETHERITE_SHOVEL -> 1.0 Material.NETHERITE_SHOVEL -> 1.0
Material.WOODEN_PICKAXE -> 1.2 Material.WOODEN_PICKAXE -> 1.2
Material.STONE_PICKAXE -> 1.2 Material.STONE_PICKAXE -> 1.2
Material.IRON_PICKAXE -> 1.2 Material.IRON_PICKAXE -> 1.2
Material.GOLDEN_PICKAXE -> 1.2 Material.GOLDEN_PICKAXE -> 1.2
Material.DIAMOND_PICKAXE -> 1.2 Material.DIAMOND_PICKAXE -> 1.2
Material.NETHERITE_PICKAXE -> 1.2 Material.NETHERITE_PICKAXE -> 1.2
Material.WOODEN_AXE -> 0.8 Material.WOODEN_AXE -> 0.8
Material.STONE_AXE -> 0.8 Material.STONE_AXE -> 0.8
Material.IRON_AXE -> 0.9 Material.IRON_AXE -> 0.9
Material.GOLDEN_AXE -> 1.0 Material.GOLDEN_AXE -> 1.0
Material.DIAMOND_AXE -> 1.0 Material.DIAMOND_AXE -> 1.0
Material.NETHERITE_AXE -> 1.0 Material.NETHERITE_AXE -> 1.0
Material.WOODEN_HOE -> 1.0 Material.WOODEN_HOE -> 1.0
Material.STONE_HOE -> 2.0 Material.STONE_HOE -> 2.0
Material.IRON_HOE -> 3.0 Material.IRON_HOE -> 3.0
Material.GOLDEN_HOE -> 1.0 Material.GOLDEN_HOE -> 1.0
Material.DIAMOND_HOE -> 4.0 Material.DIAMOND_HOE -> 4.0
Material.NETHERITE_HOE -> 4.0 Material.NETHERITE_HOE -> 4.0
else -> 4.0 else -> 4.0
}
} }
}

View File

@@ -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

View File

@@ -6,48 +6,3 @@
check-offhand: false # If items should work in offhands check-offhand: false # If items should work in offhands
discover-recipes: true # If all recipes should be automatically discovered. discover-recipes: true # If all recipes should be automatically discovered.
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

View File

@@ -1,3 +1,8 @@
resource-id: 1241 environment:
bstats-id: 12205 - name: libreforge version
color: "&#ff0000" value: ${libreforgeVersion}
options:
resource-id: 1241
bstats-id: 12205
color: "&#ff0000"

View File

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

View File

@@ -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 /ecoitems export <config>.

View File

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

View File

@@ -1,19 +1,13 @@
name: EcoItems name: ${pluginName}
version: ${projectVersion} version: ${version}
main: com.willfp.ecoitems.EcoItemsPlugin main: com.willfp.ecoitems.EcoItemsPlugin
api-version: 1.16 api-version: 1.17
authors: [ Auxilor ] authors: [ Auxilor ]
website: willfp.com website: willfp.com
depend: depend:
- eco - eco
softdepend: softdepend:
- EcoSkills - libreforge
- EcoEnchants
- AureliumSkills
- mcMMO
- Jobs
- Vault
- TMMobcoins
loadbefore: loadbefore:
- EcoArmor - EcoArmor
- Talismans - Talismans
@@ -41,8 +35,6 @@ permissions:
ecoitems.command.reload: true ecoitems.command.reload: true
ecoitems.command.ecoitems: true ecoitems.command.ecoitems: true
ecoitems.command.give: true ecoitems.command.give: true
ecoitems.command.import: true
ecoitems.command.export: true
ecoitems.command.reload: ecoitems.command.reload:
description: Allows reloading the config description: Allows reloading the config
@@ -50,12 +42,6 @@ permissions:
ecoitems.command.give: ecoitems.command.give:
description: Allows the use of /ecoitems give description: Allows the use of /ecoitems give
default: op default: op
ecoitems.command.import:
description: Allows the use of /ecoitems import
default: op
ecoitems.command.export:
description: Allows the use of /ecoitems export
default: op
ecoitems.command.ecoitems: ecoitems.command.ecoitems:
description: Allows the user of /ecoitems. description: Allows the user of /ecoitems.
default: true default: true

View File

@@ -1,4 +1,5 @@
#libreforge-updater #libreforge-updater
#Mon Mar 13 13:41:52 GMT 2023 #Mon Mar 13 13:39:16 GMT 2023
version=3.141.7 kotlin.code.style=official
plugin-name=EcoItems libreforge-version=4.0.0
version=4.0.0

Binary file not shown.

View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

269
gradlew vendored
View File

@@ -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"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with 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 # Attempt to set APP_HOME
# Resolve links: $0 may be a link # Resolve links: $0 may be a link
PRG="$0" app_path=$0
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do # Need this for daisy-chained symlinks.
ls=`ls -ld "$PRG"` while
link=`expr "$ls" : '.*-> \(.*\)$'` APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
if expr "$link" : '/.*' > /dev/null; then [ -h "$app_path" ]
PRG="$link" do
else ls=$( ls -ld "$app_path" )
PRG=`dirname "$PRG"`"/$link" link=${ls#*' -> '}
fi case $link in #(
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_NAME="Gradle" 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. # 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"' DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum" MAX_FD=maximum
warn () { warn () {
echo "$*" echo "$*"
} } >&2
die () { die () {
echo echo
echo "$*" echo "$*"
echo echo
exit 1 exit 1
} } >&2
# OS specific support (must be 'true' or 'false'). # OS specific support (must be 'true' or 'false').
cygwin=false cygwin=false
msys=false msys=false
darwin=false darwin=false
nonstop=false nonstop=false
case "`uname`" in case "$( uname )" in #(
CYGWIN* ) CYGWIN* ) cygwin=true ;; #(
cygwin=true Darwin* ) darwin=true ;; #(
;; MSYS* | MINGW* ) msys=true ;; #(
Darwin* ) NONSTOP* ) nonstop=true ;;
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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 [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables # IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java" JAVACMD=$JAVA_HOME/jre/sh/java
else else
JAVACMD="$JAVA_HOME/bin/java" JAVACMD=$JAVA_HOME/bin/java
fi fi
if [ ! -x "$JAVACMD" ] ; then if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME 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." location of your Java installation."
fi fi
else 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. 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 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
fi fi
# Increase the maximum file descriptors if we can. # Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
MAX_FD_LIMIT=`ulimit -H -n` case $MAX_FD in #(
if [ $? -eq 0 ] ; then max*)
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then MAX_FD=$( ulimit -H -n ) ||
MAX_FD="$MAX_FD_LIMIT" warn "Could not query maximum file descriptor limit"
fi esac
ulimit -n $MAX_FD case $MAX_FD in #(
if [ $? -ne 0 ] ; then '' | soft) :;; #(
warn "Could not set maximum file descriptor limit: $MAX_FD" *)
fi ulimit -n "$MAX_FD" ||
else warn "Could not set maximum file descriptor limit to $MAX_FD"
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" ;;
esac esac
fi fi
# Escape application args # Collect all arguments for the java command, stacking in reverse order:
save () { # * args from the command line
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done # * the main class name
echo " " # * -classpath
} # * -D...appname settings
APP_ARGS=`save "$@"` # * --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 # For Cygwin or MSYS, switch paths to Windows format before running java
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" 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" "$@" exec "$JAVACMD" "$@"

View File

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

14
settings.gradle.kts Normal file
View File

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