diff --git a/build.gradle b/build.gradle
index 597f242..7faba42 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,8 +42,8 @@ allprojects {
}
dependencies {
- compileOnly 'com.willfp:eco:6.37.3'
- implementation 'com.willfp:libreforge:3.114.1'
+ compileOnly 'com.willfp:eco:6.44.0'
+ implementation 'com.willfp:libreforge:3.115.0'
implementation 'org.joml:joml:1.10.4'
compileOnly 'org.jetbrains:annotations:23.0.0'
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
deleted file mode 100644
index 89247e0..0000000
--- a/config/checkstyle/checkstyle.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/config/checkstyle/suppression.xml b/config/checkstyle/suppression.xml
deleted file mode 100644
index f1d919c..0000000
--- a/config/checkstyle/suppression.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/BoostersPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/BoostersPlugin.kt
index f49b933..2733906 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/BoostersPlugin.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/BoostersPlugin.kt
@@ -68,10 +68,6 @@ class BoostersPlugin : LibReforgePlugin(supportsLrcdb = false) {
)
}
- override fun getMinimumEcoVersion(): String {
- return "6.35.1"
- }
-
init {
instance = this
}
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/boosters/Booster.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/boosters/Booster.kt
index 146426f..9ca8109 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/boosters/Booster.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/boosters/Booster.kt
@@ -1,5 +1,6 @@
package com.willfp.boosters.boosters
+import com.sun.tools.javac.jvm.Items
import com.willfp.boosters.BoostersPlugin
import com.willfp.boosters.getAmountOfBooster
import com.willfp.eco.core.config.interfaces.Config
@@ -108,13 +109,15 @@ class Booster(
val guiColumn = config.getInt("gui.position.column")
- override val conditions = config.getSubsections("conditions").mapNotNull {
- Conditions.compile(it, "Booster $id")
- }.toSet()
+ override val conditions = Conditions.compile(
+ config.getSubsections("conditions"),
+ "Booster $id"
+ )
- override val effects = config.getSubsections("effects").mapNotNull {
- Effects.compile(it, "Booster $id")
- }.toSet()
+ override val effects = Effects.compile(
+ config.getSubsections("effects"),
+ "Booster $id"
+ )
init {
Boosters.addNewBooster(this)
diff --git a/eco-core/core-plugin/src/main/resources/config.yml b/eco-core/core-plugin/src/main/resources/config.yml
index 1df6be3..b650a1c 100644
--- a/eco-core/core-plugin/src/main/resources/config.yml
+++ b/eco-core/core-plugin/src/main/resources/config.yml
@@ -35,6 +35,13 @@ cannot-afford-type:
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"
diff --git a/eco-core/core-plugin/src/main/resources/lang.yml b/eco-core/core-plugin/src/main/resources/lang.yml
index b536f0a..c3a78b4 100644
--- a/eco-core/core-plugin/src/main/resources/lang.yml
+++ b/eco-core/core-plugin/src/main/resources/lang.yml
@@ -4,6 +4,19 @@ messages:
not-player: "&cThis command must be run by a player"
invalid-command: "&cUnknown subcommand!"
reloaded: "Reloaded!"
+ cannot-afford: "&cYou can't afford to do this! &fCost: &a$$%cost%"
+ cannot-afford-type: "&cYou can't afford to do this! &fCost: &a%cost% %type%"
+ cannot-afford-price: "&cYou can't afford to do this! &fPrice: %price%"
+ on-cooldown: "&cThis effect is on cooldown! &fTime left: &a%seconds% seconds"
+ cannot-transmit: "&cYou can't transmit here!"
+ must-specify-lrcdb-id: "&cYou must specify the ID of the config to download! Not sure what this means? Go to &alrcdb.auxilor.io"
+ lrcdb-import-error: "&cError importing config: &f%message%"
+ lrcdb-import-success: "&fImported &a%name%&f! Reload the plugin to install it"
+ must-specify-config-name: "&cYou must specify the config name!"
+ invalid-config-name: "&cInvalid config name!"
+ lrcdb-export-error: "&cError exporting config: &f%message%"
+ lrcdb-export-success: "&fExported &a%name%&f! View it on &alrcdb.auxilor.io&f, or share your config ID: &f%id%"
+
requires-player: "&cYou must specify a player!"
invalid-player: "&cInvalid player!"
requires-booster: "&cYou must specify a booster!"
@@ -11,11 +24,7 @@ messages:
gave-booster: "Gave %player% %booster% &fx%amount%!"
already-active: "&cThis booster is already active!"
dont-have: "&cYou don't have any of these boosters! Get some at &astore.ecomc.net"
- on-cooldown: "&cThis effect is on cooldown! &fTime left: &a%seconds% seconds"
- 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%"
cancelled: "Cancelled the active boosters"
- cannot-transmit: "&cYou can't transmit here!"
no-currently-active: "&cNot Active!"
no-currently-active-list: "&cThere isn't any booster active!"
diff --git a/gradle.properties b/gradle.properties
index 19f7562..0f472b0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
#libreforge-updater
-#Fri Oct 21 19:27:08 BST 2022
-version=4.77.1
+#Mon Oct 24 17:05:46 BST 2022
+version=4.78.0
plugin-name=Boosters