Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2a46a25197 | ||
|
|
05d2ffa199 | ||
|
|
03a3ccd841 | ||
|
|
871fe861f1 | ||
|
|
9e328231e1 | ||
|
|
baa051f67d | ||
|
|
bf1d3b9ae0 | ||
|
|
20d927cc2c | ||
|
|
49f2e27ef2 | ||
|
|
f44ffca6cc | ||
|
|
8c6e22e93d | ||
|
|
505e6f35ac | ||
|
|
b969c3e054 | ||
|
|
140eab592e |
@@ -1,9 +1,11 @@
|
|||||||
|
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
java
|
java
|
||||||
`java-library`
|
`java-library`
|
||||||
`maven-publish`
|
`maven-publish`
|
||||||
kotlin("jvm") version "1.9.20"
|
kotlin("jvm") version "2.1.0"
|
||||||
id("io.github.goooler.shadow") version "8.1.7"
|
id("com.gradleup.shadow") version "8.3.0"
|
||||||
id("com.willfp.libreforge-gradle-plugin") version "1.0.0"
|
id("com.willfp.libreforge-gradle-plugin") version "1.0.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -25,7 +27,7 @@ allprojects {
|
|||||||
apply(plugin = "java")
|
apply(plugin = "java")
|
||||||
apply(plugin = "kotlin")
|
apply(plugin = "kotlin")
|
||||||
apply(plugin = "maven-publish")
|
apply(plugin = "maven-publish")
|
||||||
apply(plugin = "io.github.goooler.shadow")
|
apply(plugin = "com.gradleup.shadow")
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenLocal()
|
mavenLocal()
|
||||||
@@ -39,9 +41,9 @@ allprojects {
|
|||||||
dependencies {
|
dependencies {
|
||||||
implementation("com.willfp:ecomponent:1.4.1")
|
implementation("com.willfp:ecomponent:1.4.1")
|
||||||
|
|
||||||
compileOnly("com.willfp:eco:6.71.0")
|
compileOnly("com.willfp:eco:6.73.0")
|
||||||
compileOnly("org.jetbrains:annotations:23.0.0")
|
compileOnly("org.jetbrains:annotations:23.0.0")
|
||||||
compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.9.20")
|
compileOnly("org.jetbrains.kotlin:kotlin-stdlib:2.1.0")
|
||||||
compileOnly("com.github.ben-manes.caffeine:caffeine:3.1.5")
|
compileOnly("com.github.ben-manes.caffeine:caffeine:3.1.5")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,8 +59,8 @@ allprojects {
|
|||||||
}
|
}
|
||||||
|
|
||||||
compileKotlin {
|
compileKotlin {
|
||||||
kotlinOptions {
|
compilerOptions {
|
||||||
jvmTarget = "17"
|
jvmTarget.set(JvmTarget.JVM_17)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package com.willfp.ecoscrolls
|
|||||||
import com.willfp.eco.core.command.impl.PluginCommand
|
import com.willfp.eco.core.command.impl.PluginCommand
|
||||||
import com.willfp.eco.core.display.DisplayModule
|
import com.willfp.eco.core.display.DisplayModule
|
||||||
import com.willfp.eco.core.integrations.placeholder.PlaceholderManager
|
import com.willfp.eco.core.integrations.placeholder.PlaceholderManager
|
||||||
|
import com.willfp.eco.core.items.Items
|
||||||
import com.willfp.eco.core.placeholder.context.PlaceholderContext
|
import com.willfp.eco.core.placeholder.context.PlaceholderContext
|
||||||
import com.willfp.eco.core.placeholder.templates.DynamicPlaceholder
|
import com.willfp.eco.core.placeholder.templates.DynamicPlaceholder
|
||||||
import com.willfp.ecoscrolls.commands.CommandEcoScrolls
|
import com.willfp.ecoscrolls.commands.CommandEcoScrolls
|
||||||
@@ -17,6 +18,7 @@ import com.willfp.ecoscrolls.libreforge.TriggerInscribe
|
|||||||
import com.willfp.ecoscrolls.libreforge.TriggerTryInscribe
|
import com.willfp.ecoscrolls.libreforge.TriggerTryInscribe
|
||||||
import com.willfp.ecoscrolls.scrolls.InscriptionHandler
|
import com.willfp.ecoscrolls.scrolls.InscriptionHandler
|
||||||
import com.willfp.ecoscrolls.scrolls.ScrollLevel
|
import com.willfp.ecoscrolls.scrolls.ScrollLevel
|
||||||
|
import com.willfp.ecoscrolls.scrolls.ScrollTag
|
||||||
import com.willfp.ecoscrolls.scrolls.Scrolls
|
import com.willfp.ecoscrolls.scrolls.Scrolls
|
||||||
import com.willfp.ecoscrolls.target.ScrollFinder
|
import com.willfp.ecoscrolls.target.ScrollFinder
|
||||||
import com.willfp.ecoscrolls.target.Targets
|
import com.willfp.ecoscrolls.target.Targets
|
||||||
@@ -54,6 +56,8 @@ class EcoScrollsPlugin : LibreforgePlugin() {
|
|||||||
Triggers.register(TriggerInscribe)
|
Triggers.register(TriggerInscribe)
|
||||||
Triggers.register(TriggerTryInscribe)
|
Triggers.register(TriggerTryInscribe)
|
||||||
|
|
||||||
|
Items.registerTag(ScrollTag(this))
|
||||||
|
|
||||||
registerHolderProvider(ScrollFinder.toHolderProvider())
|
registerHolderProvider(ScrollFinder.toHolderProvider())
|
||||||
|
|
||||||
registerHolderPlaceholderProvider<ScrollLevel> { it, _ ->
|
registerHolderPlaceholderProvider<ScrollLevel> { it, _ ->
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ import com.willfp.libreforge.triggers.TriggerData
|
|||||||
import org.bukkit.entity.Player
|
import org.bukkit.entity.Player
|
||||||
import org.bukkit.inventory.ItemStack
|
import org.bukkit.inventory.ItemStack
|
||||||
import java.util.Optional
|
import java.util.Optional
|
||||||
import kotlin.math.max
|
|
||||||
import kotlin.math.min
|
import kotlin.math.min
|
||||||
|
|
||||||
class InscriptionHandler(private val plugin: EcoScrollsPlugin) {
|
class InscriptionHandler(private val plugin: EcoScrollsPlugin) {
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package com.willfp.ecoscrolls.scrolls
|
||||||
|
|
||||||
|
import com.willfp.eco.core.EcoPlugin
|
||||||
|
import com.willfp.eco.core.items.tag.CustomItemTag
|
||||||
|
import org.bukkit.inventory.ItemStack
|
||||||
|
|
||||||
|
class ScrollTag(plugin: EcoPlugin) : CustomItemTag(plugin.createNamespacedKey("scroll")) {
|
||||||
|
override fun matches(p0: ItemStack): Boolean {
|
||||||
|
return p0.scroll != null
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getExampleItem(): ItemStack? {
|
||||||
|
return Scrolls.values().randomOrNull()?.item
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
#libreforge-updater
|
#libreforge-updater
|
||||||
#Fri Jul 19 20:28:49 BST 2024
|
#Sat Jan 25 13:45:42 GMT 2025
|
||||||
kotlin.code.style=official
|
kotlin.code.style=official
|
||||||
libreforge-version=4.68.0
|
libreforge-version=4.73.0
|
||||||
version=1.2.0
|
version=1.8.0
|
||||||
|
|||||||
Reference in New Issue
Block a user