libreforge-updater
This commit is contained in:
@@ -42,8 +42,8 @@ allprojects {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly 'com.willfp:eco:6.37.3'
|
compileOnly 'com.willfp:eco:6.44.0'
|
||||||
implementation 'com.willfp:libreforge:3.114.1'
|
implementation 'com.willfp:libreforge:3.115.0'
|
||||||
implementation 'org.joml:joml:1.10.4'
|
implementation 'org.joml:joml:1.10.4'
|
||||||
|
|
||||||
compileOnly 'org.jetbrains:annotations:23.0.0'
|
compileOnly 'org.jetbrains:annotations:23.0.0'
|
||||||
|
|||||||
@@ -1,184 +0,0 @@
|
|||||||
<?xml version="1.0"?>
|
|
||||||
<!DOCTYPE module PUBLIC
|
|
||||||
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
|
|
||||||
"https://checkstyle.org/dtds/configuration_1_3.dtd">
|
|
||||||
|
|
||||||
<!--
|
|
||||||
|
|
||||||
Checkstyle configuration that checks the sun coding conventions from:
|
|
||||||
|
|
||||||
- the Java Language Specification at
|
|
||||||
https://docs.oracle.com/javase/specs/jls/se11/html/index.html
|
|
||||||
|
|
||||||
- the Sun Code Conventions at https://www.oracle.com/java/technologies/javase/codeconventions-contents.html
|
|
||||||
|
|
||||||
- the Javadoc guidelines at
|
|
||||||
https://www.oracle.com/technical-resources/articles/java/javadoc-tool.html
|
|
||||||
|
|
||||||
- the JDK Api documentation https://docs.oracle.com/en/java/javase/11/
|
|
||||||
|
|
||||||
- some best practices
|
|
||||||
|
|
||||||
Checkstyle is very configurable. Be sure to read the documentation at
|
|
||||||
https://checkstyle.org (or in your downloaded distribution).
|
|
||||||
|
|
||||||
Most Checks are configurable, be sure to consult the documentation.
|
|
||||||
|
|
||||||
To completely disable a check, just comment it out or delete it from the file.
|
|
||||||
To suppress certain violations please review suppression filters.
|
|
||||||
|
|
||||||
Finally, it is worth reading the documentation.
|
|
||||||
|
|
||||||
-->
|
|
||||||
|
|
||||||
<module name="Checker">
|
|
||||||
<module name="SuppressionFilter">
|
|
||||||
<property name="file" value="config/checkstyle/suppression.xml"/>
|
|
||||||
</module>
|
|
||||||
|
|
||||||
<!--
|
|
||||||
If you set the basedir property below, then all reported file
|
|
||||||
names will be relative to the specified directory. See
|
|
||||||
https://checkstyle.org/config.html#Checker
|
|
||||||
|
|
||||||
<property name="basedir" value="${basedir}"/>
|
|
||||||
-->
|
|
||||||
<property name="severity" value="error"/>
|
|
||||||
|
|
||||||
<property name="fileExtensions" value="java, properties, xml"/>
|
|
||||||
|
|
||||||
<!-- Excludes all 'module-info.java' files -->
|
|
||||||
<!-- See https://checkstyle.org/config_filefilters.html -->
|
|
||||||
<module name="BeforeExecutionExclusionFileFilter">
|
|
||||||
<property name="fileNamePattern" value="module\-info\.java$"/>
|
|
||||||
</module>
|
|
||||||
|
|
||||||
<!-- Checks whether files end with a new line. -->
|
|
||||||
<!-- See https://checkstyle.org/config_misc.html#NewlineAtEndOfFile -->
|
|
||||||
<module name="NewlineAtEndOfFile"/>
|
|
||||||
|
|
||||||
<!-- Checks that property files contain the same keys. -->
|
|
||||||
<!-- See https://checkstyle.org/config_misc.html#Translation -->
|
|
||||||
<module name="Translation"/>
|
|
||||||
|
|
||||||
<!-- Checks for Size Violations. -->
|
|
||||||
<!-- See https://checkstyle.org/config_sizes.html -->
|
|
||||||
<module name="FileLength"/>
|
|
||||||
<module name="LineLength">
|
|
||||||
<property name="fileExtensions" value="java"/>
|
|
||||||
<property name="max" value="200"/>
|
|
||||||
</module>
|
|
||||||
|
|
||||||
<!-- Checks for whitespace -->
|
|
||||||
<!-- See https://checkstyle.org/config_whitespace.html -->
|
|
||||||
<module name="FileTabCharacter"/>
|
|
||||||
|
|
||||||
<!-- Miscellaneous other checks. -->
|
|
||||||
<!-- See https://checkstyle.org/config_misc.html -->
|
|
||||||
<module name="RegexpSingleline">
|
|
||||||
<property name="format" value="\s+$"/>
|
|
||||||
<property name="minimum" value="0"/>
|
|
||||||
<property name="maximum" value="0"/>
|
|
||||||
<property name="message" value="Line has trailing spaces."/>
|
|
||||||
</module>
|
|
||||||
|
|
||||||
<!-- Checks for Headers -->
|
|
||||||
<!-- See https://checkstyle.org/config_header.html -->
|
|
||||||
<!-- <module name="Header"> -->
|
|
||||||
<!-- <property name="headerFile" value="${checkstyle.header.file}"/> -->
|
|
||||||
<!-- <property name="fileExtensions" value="java"/> -->
|
|
||||||
<!-- </module> -->
|
|
||||||
|
|
||||||
<module name="TreeWalker">
|
|
||||||
|
|
||||||
<!-- Checks for Javadoc comments. -->
|
|
||||||
<!-- See https://checkstyle.org/config_javadoc.html -->
|
|
||||||
<module name="InvalidJavadocPosition"/>
|
|
||||||
<module name="JavadocMethod"/>
|
|
||||||
<module name="JavadocType"/>
|
|
||||||
<module name="JavadocVariable"/>
|
|
||||||
<module name="JavadocStyle"/>
|
|
||||||
<module name="MissingJavadocMethod"/>
|
|
||||||
|
|
||||||
<!-- Checks for Naming Conventions. -->
|
|
||||||
<!-- See https://checkstyle.org/config_naming.html -->
|
|
||||||
<module name="ConstantName"/>
|
|
||||||
<module name="LocalFinalVariableName"/>
|
|
||||||
<module name="LocalVariableName"/>
|
|
||||||
<module name="MemberName"/>
|
|
||||||
<module name="MethodName"/>
|
|
||||||
<module name="PackageName"/>
|
|
||||||
<module name="ParameterName"/>
|
|
||||||
<module name="StaticVariableName"/>
|
|
||||||
<module name="TypeName"/>
|
|
||||||
|
|
||||||
<!-- Checks for imports -->
|
|
||||||
<!-- See https://checkstyle.org/config_imports.html -->
|
|
||||||
<module name="AvoidStarImport"/>
|
|
||||||
<module name="IllegalImport"/> <!-- defaults to sun.* packages -->
|
|
||||||
<module name="RedundantImport"/>
|
|
||||||
<module name="UnusedImports">
|
|
||||||
<property name="processJavadoc" value="true"/>
|
|
||||||
</module>
|
|
||||||
|
|
||||||
<!-- Checks for Size Violations. -->
|
|
||||||
<!-- See https://checkstyle.org/config_sizes.html -->
|
|
||||||
<!-- <module name="MethodLength"/> -->
|
|
||||||
<module name="ParameterNumber"/>
|
|
||||||
|
|
||||||
<!-- Checks for whitespace -->
|
|
||||||
<!-- See https://checkstyle.org/config_whitespace.html -->
|
|
||||||
<module name="EmptyForIteratorPad"/>
|
|
||||||
<module name="GenericWhitespace"/>
|
|
||||||
<module name="MethodParamPad"/>
|
|
||||||
<module name="NoWhitespaceAfter"/>
|
|
||||||
<module name="NoWhitespaceBefore"/>
|
|
||||||
<module name="OperatorWrap"/>
|
|
||||||
<module name="ParenPad"/>
|
|
||||||
<module name="TypecastParenPad"/>
|
|
||||||
<module name="WhitespaceAfter"/>
|
|
||||||
<module name="WhitespaceAround"/>
|
|
||||||
|
|
||||||
<!-- Modifier Checks -->
|
|
||||||
<!-- See https://checkstyle.org/config_modifiers.html -->
|
|
||||||
<module name="ModifierOrder"/>
|
|
||||||
<module name="RedundantModifier"/>
|
|
||||||
|
|
||||||
<!-- Checks for blocks. You know, those {}'s -->
|
|
||||||
<!-- See https://checkstyle.org/config_blocks.html -->
|
|
||||||
<module name="AvoidNestedBlocks"/>
|
|
||||||
<module name="EmptyBlock"/>
|
|
||||||
<module name="LeftCurly"/>
|
|
||||||
<module name="NeedBraces"/>
|
|
||||||
<module name="RightCurly"/>
|
|
||||||
|
|
||||||
<!-- Checks for common coding problems -->
|
|
||||||
<!-- See https://checkstyle.org/config_coding.html -->
|
|
||||||
<module name="EmptyStatement"/>
|
|
||||||
<module name="EqualsHashCode"/>
|
|
||||||
<module name="IllegalInstantiation"/>
|
|
||||||
<module name="InnerAssignment"/>
|
|
||||||
<!-- <module name="MagicNumber"/> -->
|
|
||||||
<module name="MissingSwitchDefault"/>
|
|
||||||
<module name="MultipleVariableDeclarations"/>
|
|
||||||
<module name="SimplifyBooleanExpression"/>
|
|
||||||
<module name="SimplifyBooleanReturn"/>
|
|
||||||
|
|
||||||
<!-- Checks for class design -->
|
|
||||||
<!-- See https://checkstyle.org/config_design.html -->
|
|
||||||
<!-- <module name="DesignForExtension"/> -->
|
|
||||||
<module name="FinalClass"/>
|
|
||||||
<!-- <module name="HideUtilityClassConstructor"/> -->
|
|
||||||
<module name="InterfaceIsType"/>
|
|
||||||
<module name="VisibilityModifier"/>
|
|
||||||
<module name="RequireThis"/>
|
|
||||||
|
|
||||||
<!-- Miscellaneous other checks. -->
|
|
||||||
<!-- See https://checkstyle.org/config_misc.html -->
|
|
||||||
<module name="ArrayTypeStyle"/>
|
|
||||||
<module name="FinalParameters"/>
|
|
||||||
<module name="TodoComment"/>
|
|
||||||
<module name="UpperEll"/>
|
|
||||||
|
|
||||||
</module>
|
|
||||||
</module>
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
<?xml version="1.0"?>
|
|
||||||
|
|
||||||
<!DOCTYPE suppressions PUBLIC
|
|
||||||
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
|
|
||||||
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
|
|
||||||
|
|
||||||
<suppressions>
|
|
||||||
<!-- Fields don't need javadoc -->
|
|
||||||
<suppress files="Effects.java" checks="JavadocVariable"/>
|
|
||||||
<suppress files="Skills.java" checks="JavadocVariable"/>
|
|
||||||
<suppress files="Stats.java" checks="JavadocVariable"/>
|
|
||||||
</suppressions>
|
|
||||||
@@ -68,10 +68,6 @@ class BoostersPlugin : LibReforgePlugin(supportsLrcdb = false) {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getMinimumEcoVersion(): String {
|
|
||||||
return "6.35.1"
|
|
||||||
}
|
|
||||||
|
|
||||||
init {
|
init {
|
||||||
instance = this
|
instance = this
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.willfp.boosters.boosters
|
package com.willfp.boosters.boosters
|
||||||
|
|
||||||
|
import com.sun.tools.javac.jvm.Items
|
||||||
import com.willfp.boosters.BoostersPlugin
|
import com.willfp.boosters.BoostersPlugin
|
||||||
import com.willfp.boosters.getAmountOfBooster
|
import com.willfp.boosters.getAmountOfBooster
|
||||||
import com.willfp.eco.core.config.interfaces.Config
|
import com.willfp.eco.core.config.interfaces.Config
|
||||||
@@ -108,13 +109,15 @@ class Booster(
|
|||||||
|
|
||||||
val guiColumn = config.getInt("gui.position.column")
|
val guiColumn = config.getInt("gui.position.column")
|
||||||
|
|
||||||
override val conditions = config.getSubsections("conditions").mapNotNull {
|
override val conditions = Conditions.compile(
|
||||||
Conditions.compile(it, "Booster $id")
|
config.getSubsections("conditions"),
|
||||||
}.toSet()
|
"Booster $id"
|
||||||
|
)
|
||||||
|
|
||||||
override val effects = config.getSubsections("effects").mapNotNull {
|
override val effects = Effects.compile(
|
||||||
Effects.compile(it, "Booster $id")
|
config.getSubsections("effects"),
|
||||||
}.toSet()
|
"Booster $id"
|
||||||
|
)
|
||||||
|
|
||||||
init {
|
init {
|
||||||
Boosters.addNewBooster(this)
|
Boosters.addNewBooster(this)
|
||||||
|
|||||||
@@ -35,6 +35,13 @@ cannot-afford-type:
|
|||||||
sound: "BLOCK_NOTE_BLOCK_PLING"
|
sound: "BLOCK_NOTE_BLOCK_PLING"
|
||||||
pitch: 0.5
|
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.
|
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"
|
example_point: "Nicely Formatted Point"
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,19 @@ 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%"
|
||||||
|
|
||||||
requires-player: "&cYou must specify a player!"
|
requires-player: "&cYou must specify a player!"
|
||||||
invalid-player: "&cInvalid player!"
|
invalid-player: "&cInvalid player!"
|
||||||
requires-booster: "&cYou must specify a booster!"
|
requires-booster: "&cYou must specify a booster!"
|
||||||
@@ -11,11 +24,7 @@ messages:
|
|||||||
gave-booster: "Gave %player% %booster% &fx%amount%!"
|
gave-booster: "Gave %player% %booster% &fx%amount%!"
|
||||||
already-active: "&cThis booster is already active!"
|
already-active: "&cThis booster is already active!"
|
||||||
dont-have: "&cYou don't have any of these boosters! Get some at &astore.ecomc.net"
|
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"
|
cancelled: "Cancelled the active boosters"
|
||||||
cannot-transmit: "&cYou can't transmit here!"
|
|
||||||
|
|
||||||
no-currently-active: "&cNot Active!"
|
no-currently-active: "&cNot Active!"
|
||||||
no-currently-active-list: "&cThere isn't any booster active!"
|
no-currently-active-list: "&cThere isn't any booster active!"
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#libreforge-updater
|
#libreforge-updater
|
||||||
#Fri Oct 21 19:27:08 BST 2022
|
#Mon Oct 24 17:05:46 BST 2022
|
||||||
version=4.77.1
|
version=4.78.0
|
||||||
plugin-name=Boosters
|
plugin-name=Boosters
|
||||||
|
|||||||
Reference in New Issue
Block a user