trueog/SpongeAPI-CTS
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update checkstyle and fix style issues (#2237)

Browse Source
This commit is contained in:
Morpheus authored and GitHub committed 2021-03-28 12:07:15 +00:00
1 parent e12007f328
commit b2216ba4eb
294 files changed
+1028 -730
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

checkstyle-suppressions.xml
+15 -20
View File
@@ -1,25 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE suppressions PUBLIC
"-//Puppy Crawl//DTD Suppressions 1.2//EN"
"http://checkstyle.sourceforge.net/dtds/suppressions_1_2.dtd">
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
<suppressions>
<suppress checks="JavadocMethod|SummaryJavadoc|AvoidEscapedUnicodeCharacters" files="src[\\/]test[\\/]java[\\/].*"/>
<suppress checks="Indentation" files="package-info\.java"/>
<suppress checks="AbbreviationAsWordInName" files="AI"/>
<suppress checks="AbbreviationAsWordInName" files="TNT"/>
<suppress checks="AbbreviationAsWordInName" files="PVP"/>
<suppress checks="AbbreviationAsWordInName" files="PEBKAC"/>
<suppress checks="AbbreviationAsWordInName" files="AABB"/>
<suppress checks=".*" files="SpongeEventFactory\.java"/>
<suppress checks="LineLength" files="IntegerTraits\.java"/>
<suppress checks="LineLength" files="BooleanTraits\.java"/>
<suppress checks="LineLength" files="SoundTypes\.java"/>
<suppress checks="LineLength" files="CraftingRecipes\.java"/>
<suppress checks="LineLength" files="QueryTypes\.java"/>
<suppress checks="LineLength" files="Keys\.java"/>
<suppress checks="LineLength|OneStatementPerLine|WhitespaceAround" files="TypeTokens\.java"/>
<suppress checks="AvoidStarImport" files="Keys\.java"/>
<suppress checks="AvoidStarImport" files="CatalogEntityData\.java"/>
<suppress checks="AvoidStarImport" files="CatalogTypes\.java"/>
<suppress checks="LineLength"/>
<suppress checks="SummaryJavadoc"/>
<suppress checks="MissingJavadocType"/>
<suppress checks="MissingJavadocMethod"/>
<suppress checks="OverloadMethodsDeclarationOrder"/>
<suppress checks="RequireEmptyLineBeforeBlockTagGroup"/>
<suppress checks="JavadocParagraph"/>
<suppress checks="JavadocTagContinuationIndentation"/>
<suppress checks="NonEmptyAtclauseDescription"/>
<suppress checks="AbbreviationAsWordInName"/>
<suppress checks="MethodTypeParameterName"/>
<suppress checks="CommentsIndentation"/>
<suppress checks="InterfaceTypeParameterName"/>
</suppressions>
checkstyle.xml
+351 -14
View File
@@ -1,16 +1,17 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
"https://checkstyle.org/dtds/configuration_1_3.dtd">
<!--
Checkstyle configuration that checks the Google coding conventions from Google Java Style
that can be found at https://google.github.io/styleguide/javaguide.html.
that can be found at https://google.github.io/styleguide/javaguide.html
Checkstyle is very configurable. Be sure to read the documentation at
http://checkstyle.sf.net (or in your downloaded distribution).
http://checkstyle.org (or in your downloaded distribution).
To completely disable a check, just comment it out or delete it from the file.
To suppress certain violations please review suppression filters.
Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
-->
@@ -18,24 +19,360 @@
<module name = "Checker">
<property name="charset" value="UTF-8"/>
<!--<property name="severity" value="warning"/>-->
<property name="severity" value="${severity}"/>
<property name="severity" value="warning"/>
<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>
<!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
<module name="SuppressionFilter">
<property name="file" value="${org.checkstyle.google.suppressionfilter.config}"
default="checkstyle-suppressions.xml" />
<property name="optional" value="true"/>
</module>
<!-- Checks for whitespace -->
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
<!-- See http://checkstyle.org/config_whitespace.html -->
<module name="FileTabCharacter">
<property name="eachLine" value="true"/>
</module>
<module name="LineLength">
<property name="fileExtensions" value="java"/>
<!-- Sponge - Bump max line length to 150 -->
<property name="max" value="150"/>
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
</module>
<module name="TreeWalker">
<module name="OuterTypeFilename"/>
<module name="IllegalTokenText">
<property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
<property name="format"
value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
<property name="message"
value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
</module>
<module name="AvoidEscapedUnicodeCharacters">
<property name="allowEscapesForControlCharacters" value="true"/>
<property name="allowByTailComment" value="true"/>
<property name="allowNonPrintableEscapes" value="true"/>
</module>
<module name="AvoidStarImport"/>
<module name="OneTopLevelClass"/>
<module name="NoLineWrap">
<property name="tokens" value="PACKAGE_DEF, IMPORT, STATIC_IMPORT"/>
</module>
<module name="EmptyBlock">
<property name="option" value="TEXT"/>
<property name="tokens"
value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
</module>
<module name="NeedBraces">
<property name="tokens"
value="LITERAL_DO, LITERAL_ELSE, LITERAL_FOR, LITERAL_IF, LITERAL_WHILE"/>
</module>
<module name="LeftCurly">
<property name="tokens"
value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_CONSTANT_DEF, ENUM_DEF,
INTERFACE_DEF, LAMBDA, LITERAL_CASE, LITERAL_CATCH, LITERAL_DEFAULT,
LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF,
LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF,
OBJBLOCK, STATIC_INIT, RECORD_DEF, COMPACT_CTOR_DEF"/>
</module>
<module name="RightCurly">
<property name="id" value="RightCurlySame"/>
<property name="tokens"
value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE,
LITERAL_DO"/>
</module>
<module name="RightCurly">
<property name="id" value="RightCurlyAlone"/>
<property name="option" value="alone"/>
<property name="tokens"
value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT,
INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF, INTERFACE_DEF, RECORD_DEF,
COMPACT_CTOR_DEF"/>
</module>
<module name="SuppressionXpathSingleFilter">
<!-- suppresion is required till https://github.com/checkstyle/checkstyle/issues/7541 -->
<property name="id" value="RightCurlyAlone"/>
<property name="query" value="//RCURLY[parent::SLIST[count(./*)=1]
or preceding-sibling::*[last()][self::LCURLY]]"/>
</module>
<module name="WhitespaceAfter">
<property name="tokens"
value="COMMA, SEMI, TYPECAST, LITERAL_IF, LITERAL_ELSE,
LITERAL_WHILE, LITERAL_DO, LITERAL_FOR, DO_WHILE"/>
</module>
<module name="WhitespaceAround">
<property name="allowEmptyConstructors" value="true"/>
<property name="allowEmptyLambdas" value="true"/>
<property name="allowEmptyMethods" value="true"/>
<property name="allowEmptyTypes" value="true"/>
<property name="allowEmptyLoops" value="true"/>
<property name="ignoreEnhancedForColon" value="false"/>
<property name="tokens"
value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR,
BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, DO_WHILE, EQUAL, GE, GT, LAMBDA, LAND,
LCURLY, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY,
LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SWITCH, LITERAL_SYNCHRONIZED,
LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN,
NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR,
SR_ASSIGN, STAR, STAR_ASSIGN, LITERAL_ASSERT, TYPE_EXTENSION_AND"/>
<message key="ws.notFollowed"
value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
<message key="ws.notPreceded"
value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
</module>
<module name="OneStatementPerLine"/>
<module name="MultipleVariableDeclarations"/>
<module name="ArrayTypeStyle"/>
<module name="MissingSwitchDefault"/>
<module name="FallThrough"/>
<module name="UpperEll"/>
<module name="ModifierOrder"/>
<module name="EmptyLineSeparator">
<!-- Sponge - Allow NoEmptyLine for PACKAGE_DEF -->
<property name="tokens"
value="IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF,
COMPACT_CTOR_DEF"/>
<property name="allowNoEmptyLineBetweenFields" value="true"/>
</module>
<module name="SeparatorWrap">
<property name="id" value="SeparatorWrapDot"/>
<property name="tokens" value="DOT"/>
<property name="option" value="nl"/>
</module>
<module name="SeparatorWrap">
<property name="id" value="SeparatorWrapComma"/>
<property name="tokens" value="COMMA"/>
<property name="option" value="EOL"/>
</module>
<module name="SeparatorWrap">
<!-- ELLIPSIS is EOL until https://github.com/google/styleguide/issues/259 -->
<property name="id" value="SeparatorWrapEllipsis"/>
<property name="tokens" value="ELLIPSIS"/>
<property name="option" value="EOL"/>
</module>
<module name="SeparatorWrap">
<!-- ARRAY_DECLARATOR is EOL until https://github.com/google/styleguide/issues/258 -->
<property name="id" value="SeparatorWrapArrayDeclarator"/>
<property name="tokens" value="ARRAY_DECLARATOR"/>
<property name="option" value="EOL"/>
</module>
<module name="SeparatorWrap">
<property name="id" value="SeparatorWrapMethodRef"/>
<property name="tokens" value="METHOD_REF"/>
<property name="option" value="nl"/>
</module>
<module name="PackageName">
<property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
<message key="name.invalidPattern"
value="Package name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="TypeName">
<property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
ANNOTATION_DEF, RECORD_DEF"/>
<message key="name.invalidPattern"
value="Type name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="MemberName">
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
<message key="name.invalidPattern"
value="Member name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="ParameterName">
<!-- Sponge - Allow x or xTo -->
<property name="format" value="^[a-z]([a-zA-Z0-9]*)?$"/>
<message key="name.invalidPattern"
value="Parameter name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="LambdaParameterName">
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
<message key="name.invalidPattern"
value="Lambda parameter name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="CatchParameterName">
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
<message key="name.invalidPattern"
value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="LocalVariableName">
<!-- Sponge - Allow x or xTo -->
<property name="format" value="^[a-z]([a-zA-Z0-9]*)?$"/>
<message key="name.invalidPattern"
value="Local variable name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="PatternVariableName">
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
<message key="name.invalidPattern"
value="Pattern variable name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="ClassTypeParameterName">
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
<message key="name.invalidPattern"
value="Class type name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="RecordComponentName">
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
<message key="name.invalidPattern"
value="Record component name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="RecordTypeParameterName">
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
<message key="name.invalidPattern"
value="Record type name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="MethodTypeParameterName">
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
<message key="name.invalidPattern"
value="Method type name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="InterfaceTypeParameterName">
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
<message key="name.invalidPattern"
value="Interface type name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="NoFinalizer"/>
<module name="GenericWhitespace">
<message key="ws.followed"
value="GenericWhitespace ''{0}'' is followed by whitespace."/>
<message key="ws.preceded"
value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
<message key="ws.illegalFollow"
value="GenericWhitespace ''{0}'' should followed by whitespace."/>
<message key="ws.notPreceded"
value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
</module>
<module name="Indentation">
<!-- Sponge - Bump basicOffset to 4 -->
<property name="basicOffset" value="4"/>
<!-- Sponge - TODO-->
<!-- <property name="braceAdjustment" value="2"/>-->
<!-- <property name="caseIndent" value="2"/>-->
<!-- <property name="throwsIndent" value="4"/>-->
<!-- <property name="lineWrappingIndentation" value="4"/>-->
<!-- <property name="arrayInitIndent" value="2"/>-->
</module>
<module name="AbbreviationAsWordInName">
<property name="ignoreFinal" value="false"/>
<property name="allowedAbbreviationLength" value="0"/>
<property name="tokens"
value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF,
PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF,
RECORD_COMPONENT_DEF"/>
</module>
<module name="OverloadMethodsDeclarationOrder"/>
<module name="VariableDeclarationUsageDistance"/>
<module name="CustomImportOrder">
<property name="sortImportsInGroupAlphabetically" value="true"/>
<property name="separateLineBetweenGroups" value="true"/>
<!-- Sponge - Custom import order -->
<property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS"/>
<property name="tokens" value="IMPORT, STATIC_IMPORT, PACKAGE_DEF"/>
</module>
<module name="MethodParamPad">
<property name="tokens"
value="CTOR_DEF, LITERAL_NEW, METHOD_CALL, METHOD_DEF,
SUPER_CTOR_CALL, ENUM_CONSTANT_DEF, RECORD_DEF"/>
</module>
<module name="NoWhitespaceBefore">
<property name="tokens"
value="COMMA, SEMI, POST_INC, POST_DEC, DOT,
LABELED_STAT, METHOD_REF"/>
<property name="allowLineBreaks" value="true"/>
</module>
<module name="ParenPad">
<property name="tokens"
value="ANNOTATION, ANNOTATION_FIELD_DEF, CTOR_CALL, CTOR_DEF, DOT, ENUM_CONSTANT_DEF,
EXPR, LITERAL_CATCH, LITERAL_DO, LITERAL_FOR, LITERAL_IF, LITERAL_NEW,
LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_WHILE, METHOD_CALL,
METHOD_DEF, QUESTION, RESOURCE_SPECIFICATION, SUPER_CTOR_CALL, LAMBDA,
RECORD_DEF"/>
</module>
<module name="OperatorWrap">
<property name="option" value="NL"/>
<property name="tokens"
value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR,
LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF,
TYPE_EXTENSION_AND "/>
</module>
<module name="AnnotationLocation">
<property name="id" value="AnnotationLocationMostCases"/>
<property name="tokens"
value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF,
RECORD_DEF, COMPACT_CTOR_DEF"/>
</module>
<module name="AnnotationLocation">
<property name="id" value="AnnotationLocationVariables"/>
<property name="tokens" value="VARIABLE_DEF"/>
<property name="allowSamelineMultipleAnnotations" value="true"/>
</module>
<module name="NonEmptyAtclauseDescription"/>
<module name="InvalidJavadocPosition"/>
<module name="JavadocTagContinuationIndentation"/>
<module name="SummaryJavadoc">
<property name="forbiddenSummaryFragments"
value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
</module>
<module name="JavadocParagraph"/>
<module name="RequireEmptyLineBeforeBlockTagGroup"/>
<module name="AtclauseOrder">
<property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
<property name="target"
value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
</module>
<module name="JavadocMethod">
<property name="scope" value="public"/>
<property name="allowMissingParamTags" value="true"/>
<property name="allowMissingReturnTag" value="true"/>
<property name="allowedAnnotations" value="Override, Test"/>
<property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF, COMPACT_CTOR_DEF"/>
</module>
<module name="MissingJavadocMethod">
<property name="scope" value="public"/>
<property name="minLineCount" value="2"/>
<property name="allowedAnnotations" value="Override, Test"/>
<property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF,
COMPACT_CTOR_DEF"/>
</module>
<module name="MissingJavadocType">
<property name="scope" value="protected"/>
<property name="tokens"
value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
RECORD_DEF, ANNOTATION_DEF"/>
<property name="excludeScope" value="nothing"/>
</module>
<module name="MethodName">
<!-- Sponge - Allow y or yScale -->
<property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
<message key="name.invalidPattern"
value="Method name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="SingleLineJavadoc"/>
<module name="EmptyCatchBlock">
<!-- Sponge - expected -> ignored -->
<property name="exceptionVariableName" value="ignored"/>
</module>
<module name="CommentsIndentation">
<property name="tokens" value="SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN"/>
</module>
<!-- https://checkstyle.org/config_filters.html#SuppressionXpathFilter -->
<module name="SuppressionXpathFilter">
<property name="file" value="${org.checkstyle.google.suppressionxpathfilter.config}"
default="checkstyle-xpath-suppressions.xml" />
<property name="optional" value="true"/>
</module>
<!--Sponge - start-->
<module name="RequireThis">
<property name="checkMethods" value="true"/>
<property name="checkFields" value="true"/>
</module>
<module name="FinalLocalVariable"/>
</module>
<module name="NewlineAtEndOfFile"/>
<module name="SuppressionFilter">
<property name="file" value="${suppressions}"/>
</module>
<property name="basedir" value="${basedir}"/>
</module>
extra/ideal-checkstyle.xml
-279
View File
@@ -1,279 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
<!--
Checkstyle configuration that checks the Google coding conventions from Google Java Style
that can be found at https://google.github.io/styleguide/javaguide.html.
Checkstyle is very configurable. Be sure to read the documentation at
http://checkstyle.sf.net (or in your downloaded distribution).
To completely disable a check, just comment it out or delete it from the file.
Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
-->
<module name = "Checker">
<property name="charset" value="UTF-8"/>
<!--<property name="severity" value="warning"/>-->
<property name="severity" value="${severity}"/>
<property name="fileExtensions" value="java, properties, xml"/>
<!-- Checks for whitespace -->
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
<module name="FileTabCharacter">
<property name="eachLine" value="true"/>
</module>
<module name="TreeWalker">
<module name="OuterTypeFilename"/>
<module name="IllegalTokenText">
<property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
<property name="format" value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
<property name="message" value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
</module>
<module name="AvoidEscapedUnicodeCharacters">
<property name="allowEscapesForControlCharacters" value="true"/>
<property name="allowByTailComment" value="true"/>
<property name="allowNonPrintableEscapes" value="true"/>
</module>
<module name="LineLength">
<property name="id" value="LineLengthCode"/>
<property name="max" value="150"/>
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
<message key="maxLineLen" value="Code line is longer than {0,number,integer} characters (found {1,number,integer})."/>
</module>
<module name="LineLength">
<property name="id" value="LineLengthComment"/>
<property name="max" value="80"/>
<property name="ignorePattern" value="^[ \t]*([a-zA-Z0-9\{\}\+\|\&amp;\&quot;@\(\)&gt;&lt;\.]|//)|@link|@see"/>
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
<message key="maxLineLen" value="Comment line is longer than {0,number,integer} characters (found {1,number,integer})."/>
</module>
<module name="AvoidStarImport"/>
<module name="OneTopLevelClass"/>
<module name="NoLineWrap"/>
<module name="EmptyBlock">
<property name="option" value="TEXT"/>
<property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
</module>
<module name="NeedBraces"/>
<module name="LeftCurly"/>
<module name="RightCurly">
<property name="id" value="RightCurlySame"/>
<property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_DO"/>
</module>
<module name="RightCurly">
<property name="id" value="RightCurlyAlone"/>
<property name="option" value="alone"/>
<property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
</module>
<module name="WhitespaceAround">
<property name="allowEmptyConstructors" value="true"/>
<property name="allowEmptyMethods" value="true"/>
<property name="allowEmptyTypes" value="true"/>
<property name="allowEmptyLoops" value="true"/>
<message key="ws.notFollowed"
value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
<message key="ws.notPreceded"
value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
</module>
<module name="OneStatementPerLine"/>
<module name="MultipleVariableDeclarations"/>
<module name="ArrayTypeStyle"/>
<module name="MissingSwitchDefault"/>
<module name="FallThrough"/>
<module name="UpperEll"/>
<module name="ModifierOrder"/>
<module name="EmptyLineSeparator">
<property name="allowNoEmptyLineBetweenFields" value="true"/>
<!-- No new line after the license header -->
<property name="tokens" value="IMPORT, CLASS_DEF, ENUM_DEF, INTERFACE_DEF, CTOR_DEF, METHOD_DEF, STATIC_INIT, INSTANCE_INIT, VARIABLE_DEF"/>
</module>
<module name="SeparatorWrap">
<property name="id" value="SeparatorWrapDot"/>
<property name="tokens" value="DOT"/>
<property name="option" value="nl"/>
</module>
<module name="SeparatorWrap">
<property name="id" value="SeparatorWrapComma"/>
<property name="tokens" value="COMMA"/>
<property name="option" value="EOL"/>
</module>
<module name="SeparatorWrap">
<!-- ELLIPSIS is EOL until https://github.com/google/styleguide/issues/258 -->
<property name="id" value="SeparatorWrapEllipsis"/>
<property name="tokens" value="ELLIPSIS"/>
<property name="option" value="EOL"/>
</module>
<module name="SeparatorWrap">
<!-- ARRAY_DECLARATOR is EOL until https://github.com/google/styleguide/issues/259 -->
<property name="id" value="SeparatorWrapArrayDeclarator"/>
<property name="tokens" value="ARRAY_DECLARATOR"/>
<property name="option" value="EOL"/>
</module>
<module name="SeparatorWrap">
<property name="id" value="SeparatorWrapMethodRef"/>
<property name="tokens" value="METHOD_REF"/>
<property name="option" value="nl"/>
</module>
<module name="PackageName">
<property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
<message key="name.invalidPattern"
value="Package name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="TypeName">
<message key="name.invalidPattern"
value="Type name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="MemberName">
<!--<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>-->
<property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
<message key="name.invalidPattern"
value="Member name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="ParameterName">
<!--<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>-->
<property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
<message key="name.invalidPattern"
value="Parameter name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="CatchParameterName">
<!--<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>-->
<property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
<message key="name.invalidPattern"
value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="LocalVariableName">
<property name="tokens" value="VARIABLE_DEF"/>
<!--<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>-->
<property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
<property name="allowOneCharVarInForLoop" value="true"/>
<message key="name.invalidPattern"
value="Local variable name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="ClassTypeParameterName">
<property name="format" value="(^[A-Z][0-9]?)$|(T[A-Z][a-zA-Z0-9]*$)"/>
<message key="name.invalidPattern"
value="Class type name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="MethodTypeParameterName">
<property name="format" value="(^[A-Z][0-9]?)$|(T[A-Z][a-zA-Z0-9]*$)"/>
<message key="name.invalidPattern"
value="Method type name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="InterfaceTypeParameterName">
<property name="format" value="(^[A-Z][0-9]?)$|(T[A-Z][a-zA-Z0-9]*$)"/>
<message key="name.invalidPattern"
value="Interface type name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="NoFinalizer"/>
<module name="GenericWhitespace">
<message key="ws.followed"
value="GenericWhitespace ''{0}'' is followed by whitespace."/>
<message key="ws.preceded"
value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
<message key="ws.illegalFollow"
value="GenericWhitespace ''{0}'' should followed by whitespace."/>
<message key="ws.notPreceded"
value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
</module>
<module name="Indentation">
<!--<property name="basicOffset" value="2"/>-->
<property name="basicOffset" value="4"/>
<property name="braceAdjustment" value="0"/>
<!--<property name="caseIndent" value="2"/>-->
<property name="caseIndent" value="4"/>
<property name="throwsIndent" value="4"/>
<property name="lineWrappingIndentation" value="4"/>
<!--<property name="arrayInitIndent" value="2"/>-->
<property name="arrayInitIndent" value="4"/>
</module>
<module name="AbbreviationAsWordInName">
<property name="ignoreFinal" value="false"/>
<property name="allowedAbbreviationLength" value="1"/>
<property name="allowedAbbreviations" value="AI, UTF, PVP"/>
</module>
<module name="OverloadMethodsDeclarationOrder"/>
<module name="VariableDeclarationUsageDistance"/>
<module name="CustomImportOrder">
<!--<property name="specialImportsRegExp" value="com.google"/>-->
<property name="sortImportsInGroupAlphabetically" value="true"/>
<property name="customImportOrderRules" value="STATIC###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/>
<property name="thirdPartyPackageRegExp" value=".*"/>
</module>
<module name="MethodParamPad"/>
<module name="NoWhitespaceBefore">
<property name="tokens" value="COMMA, SEMI, POST_INC, POST_DEC, DOT, ELLIPSIS, METHOD_REF"/>
<property name="allowLineBreaks" value="true"/>
</module>
<module name="ParenPad"/>
<module name="OperatorWrap">
<property name="option" value="NL"/>
<property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF "/>
</module>
<module name="AnnotationLocation">
<property name="id" value="AnnotationLocationMostCases"/>
<property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
</module>
<module name="AnnotationLocation">
<property name="id" value="AnnotationLocationVariables"/>
<property name="tokens" value="VARIABLE_DEF"/>
<property name="allowSamelineMultipleAnnotations" value="true"/>
</module>
<module name="NonEmptyAtclauseDescription"/>
<module name="JavadocTagContinuationIndentation"/>
<module name="SummaryJavadoc">
<property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
</module>
<module name="JavadocParagraph"/>
<module name="AtclauseOrder">
<property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
<property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
</module>
<module name="JavadocMethod">
<property name="scope" value="public"/>
<!--
<property name="allowMissingParamTags" value="true"/>
<property name="allowMissingThrowsTags" value="true"/>
<property name="allowMissingReturnTag" value="true"/>
<property name="minLineCount" value="2"/>
-->
<property name="allowedAnnotations" value="Override, Test"/>
<property name="allowThrowsTagsForSubclasses" value="true"/>
</module>
<module name="MethodName">
<!--<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>-->
<property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
<message key="name.invalidPattern"
value="Method name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="SingleLineJavadoc">
<property name="ignoreInlineTags" value="false"/>
</module>
<module name="EmptyCatchBlock">
<property name="exceptionVariableName" value="expected"/>
</module>
<module name="CommentsIndentation"/>
<module name="RedundantImport"/>
<module name="RedundantModifier"/>
<module name="RequireThis">
<property name="checkMethods" value="false"/>
</module>
</module>
<module name="NewlineAtEndOfFile"/>
<module name="SuppressionFilter">
<property name="file" value="${suppressions}"/>
</module>
<property name="basedir" value="${basedir}"/>
</module>
src/main/java/org/spongepowered/api/Client.java
+1 -1
View File
@@ -24,9 +24,9 @@
*/
package org.spongepowered.api;
import org.spongepowered.api.client.LocalServer;
import org.spongepowered.api.entity.living.player.client.ClientPlayer;
import org.spongepowered.api.entity.living.player.client.LocalPlayer;
import org.spongepowered.api.client.LocalServer;
import org.spongepowered.api.network.ClientSideConnection;
import org.spongepowered.api.world.client.ClientWorld;
src/main/java/org/spongepowered/api/Engine.java
+1
View File
@@ -35,6 +35,7 @@ public interface Engine extends ScopedRegistryHolder {
/**
* Gets the {@link Game} that launched this engine;
*
* @return The game
*/
Game game();
src/main/java/org/spongepowered/api/Game.java
+1 -1
View File
@@ -39,9 +39,9 @@ import org.spongepowered.api.registry.GameRegistry;
import org.spongepowered.api.registry.RegistryHolder;
import org.spongepowered.api.registry.ScopedRegistryHolder;
import org.spongepowered.api.scheduler.Scheduler;
import org.spongepowered.api.service.ServiceProvider;
import org.spongepowered.api.sql.SqlManager;
import org.spongepowered.api.util.metric.MetricsConfigManager;
import org.spongepowered.api.service.ServiceProvider;
import java.nio.file.Path;
import java.util.Locale;
src/main/java/org/spongepowered/api/Server.java
+2 -2
View File
@@ -33,8 +33,8 @@ import org.spongepowered.api.entity.living.Hostile;
import org.spongepowered.api.entity.living.animal.Animal;
import org.spongepowered.api.entity.living.player.gamemode.GameMode;
import org.spongepowered.api.entity.living.player.server.ServerPlayer;
import org.spongepowered.api.map.MapStorage;
import org.spongepowered.api.event.lifecycle.RegisterCommandEvent;
import org.spongepowered.api.map.MapStorage;
import org.spongepowered.api.network.ServerSideConnection;
import org.spongepowered.api.profile.GameProfileManager;
import org.spongepowered.api.resourcepack.ResourcePack;
@@ -42,9 +42,9 @@ import org.spongepowered.api.scoreboard.Scoreboard;
import org.spongepowered.api.service.ServiceProvider;
import org.spongepowered.api.user.UserManager;
import org.spongepowered.api.util.locale.LocaleSource;
import org.spongepowered.api.world.server.ServerLocation;
import org.spongepowered.api.world.difficulty.Difficulty;
import org.spongepowered.api.world.generation.config.WorldGenerationConfig;
import org.spongepowered.api.world.server.ServerLocation;
import org.spongepowered.api.world.server.ServerWorld;
import org.spongepowered.api.world.server.WorldManager;
import org.spongepowered.api.world.storage.ChunkLayout;
src/main/java/org/spongepowered/api/UnsupportedEngineException.java
+4 -4
View File
@@ -29,9 +29,9 @@ package org.spongepowered.api;
*/
public class UnsupportedEngineException extends UnsupportedOperationException {
private static final long serialVersionUID = 5671217624171369435L;
private static final long serialVersionUID = 5671217624171369435L;
public UnsupportedEngineException(final String message) {
super(message);
}
public UnsupportedEngineException(final String message) {
super(message);
}
}
src/main/java/org/spongepowered/api/advancement/Advancement.java
+1 -1
View File
@@ -28,9 +28,9 @@ import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.ComponentLike;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.datapack.DataPackSerializable;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.advancement.criteria.AdvancementCriterion;
import org.spongepowered.api.datapack.DataPackSerializable;
import org.spongepowered.api.util.ResourceKeyedBuilder;
import java.util.Collection;
src/main/java/org/spongepowered/api/advancement/AdvancementTypes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.advancement;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of all the available {@link AdvancementType}s in Minecraft.
src/main/java/org/spongepowered/api/advancement/criteria/trigger/Triggers.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.advancement.criteria.trigger;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of all the available {@link Trigger}s in minecraft.
src/main/java/org/spongepowered/api/asset/Asset.java
+2 -2
View File
@@ -146,9 +146,9 @@ public interface Asset {
* @return The file name
*/
default String fileName() {
String path = this.url().getPath();
final String path = this.url().getPath();
//We don't need to worry about file system specific file separators as we are dealing with a substring of URL
int end = path.lastIndexOf('/');
final int end = path.lastIndexOf('/');
if (end < 0) {
return path;
}
src/main/java/org/spongepowered/api/block/BlockSnapshot.java
+1 -1
View File
@@ -33,8 +33,8 @@ import org.spongepowered.api.data.persistence.DataView;
import org.spongepowered.api.data.value.Value;
import org.spongepowered.api.world.BlockChangeFlag;
import org.spongepowered.api.world.LocatableSnapshot;
import org.spongepowered.api.world.server.ServerLocation;
import org.spongepowered.api.world.schematic.Schematic;
import org.spongepowered.api.world.server.ServerLocation;
import org.spongepowered.api.world.server.storage.ServerWorldProperties;
import org.spongepowered.math.vector.Vector3i;
src/main/java/org/spongepowered/api/block/BlockType.java
+1
View File
@@ -47,6 +47,7 @@ public interface BlockType extends DefaultedRegistryValue, ComponentLike, StateC
/**
* Return the {@link ItemType} that represents this block.
*
* @return The item type or {@link Optional#empty()} otherwise
*/
Optional<ItemType> item();
src/main/java/org/spongepowered/api/block/BlockTypes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.block;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of all possible {@link BlockType}s in vanilla minecraft.
src/main/java/org/spongepowered/api/block/entity/BlockEntity.java
+1 -1
View File
@@ -33,8 +33,8 @@ import org.spongepowered.api.util.mirror.Mirror;
import org.spongepowered.api.util.rotation.Rotation;
import org.spongepowered.api.world.Locatable;
import org.spongepowered.api.world.LocatableBlock;
import org.spongepowered.api.world.server.ServerLocation;
import org.spongepowered.api.world.schematic.Schematic;
import org.spongepowered.api.world.server.ServerLocation;
import java.util.function.Supplier;
src/main/java/org/spongepowered/api/block/entity/BlockEntityTypes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.block.entity;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of all {@link BlockEntityType}s in vanilla Minecraft.
src/main/java/org/spongepowered/api/block/entity/CommandBlock.java
+1 -1
View File
@@ -28,8 +28,8 @@ import net.kyori.adventure.text.Component;
import org.spongepowered.api.data.Keys;
import org.spongepowered.api.data.value.Value;
import org.spongepowered.api.service.permission.Subject;
import org.spongepowered.api.util.locale.LocaleSource;
import org.spongepowered.api.util.Nameable;
import org.spongepowered.api.util.locale.LocaleSource;
import java.util.Optional;
src/main/java/org/spongepowered/api/block/entity/Comparator.java
+1
View File
@@ -35,6 +35,7 @@ public interface Comparator extends BlockEntity {
/**
* {@link Keys#COMPARATOR_MODE}
*
* @return The mode of the Comparator.
*/
default Value.Mutable<ComparatorMode> mode() {
src/main/java/org/spongepowered/api/block/entity/Jukebox.java
+1
View File
@@ -36,6 +36,7 @@ public interface Jukebox extends BlockEntity {
/**
* {@link Keys#ITEM_STACK_SNAPSHOT}
*
* @return A snapshot of the disc in the jukebox.
*/
default Value.Mutable<ItemStackSnapshot> item() {
src/main/java/org/spongepowered/api/block/entity/NameableBlockEntity.java
+2
View File
@@ -30,12 +30,14 @@ import org.spongepowered.api.data.value.Value;
/**
* Represents a {@link BlockEntity} which may have a display name.
*
* @see Keys#DISPLAY_NAME
*/
public interface NameableBlockEntity extends BlockEntity {
/**
* {@link Keys#DISPLAY_NAME}
*
* @return The display name of this {@link BlockEntity}.
*/
default Value.Mutable<Component> displayName() {
src/main/java/org/spongepowered/api/block/entity/Piston.java
+2
View File
@@ -39,6 +39,7 @@ public interface Piston extends BlockEntity {
/**
* {@link Keys#BLOCK_STATE}
*
* @return The BlockState representing the block being pushed.
*/
default Value.Mutable<BlockState> blockState() {
@@ -47,6 +48,7 @@ public interface Piston extends BlockEntity {
/**
* {@link Keys#IS_EXTENDED}
*
* @return Whether this piston is extending or retracting.
*/
default Value.Mutable<Boolean> extending() {
src/main/java/org/spongepowered/api/block/entity/StructureBlock.java
+9
View File
@@ -45,6 +45,7 @@ public interface StructureBlock extends BlockEntity {
/**
* {@link Keys#STRUCTURE_MODE}
*
* @return The structure mode of this structure block.
*/
default Value.Mutable<StructureMode> mode() {
@@ -53,6 +54,7 @@ public interface StructureBlock extends BlockEntity {
/**
* {@link Keys#STRUCTURE_POWERED}
*
* @return Whether this structure block is powered.
*/
default Value.Mutable<Boolean> powered() {
@@ -74,6 +76,7 @@ public interface StructureBlock extends BlockEntity {
/**
* {@link Keys#STRUCTURE_SHOW_AIR}
*
* @return Whether the air within the structure should be visible.
*/
default Value.Mutable<Boolean> showAir() {
@@ -82,6 +85,7 @@ public interface StructureBlock extends BlockEntity {
/**
* {@link Keys#STRUCTURE_IGNORE_ENTITIES}
*
* @return Whether this structure block should ignore entities.
*/
default Value.Mutable<Boolean> ignoreEntities() {
@@ -90,6 +94,7 @@ public interface StructureBlock extends BlockEntity {
/**
* {@link Keys#STRUCTURE_SIZE}
*
* @return The size of the structure.
*/
default Value.Mutable<Vector3i> size() {
@@ -98,6 +103,7 @@ public interface StructureBlock extends BlockEntity {
/**
* {@link Keys#STRUCTURE_POSITION}
*
* @return The position of the structure.
*/
default Value.Mutable<Vector3i> position() {
@@ -106,6 +112,7 @@ public interface StructureBlock extends BlockEntity {
/**
* {@link Keys#STRUCTURE_SEED}
*
* @return The seed of the structure to be generated.
*/
default Value.Mutable<Long> seed() {
@@ -114,6 +121,7 @@ public interface StructureBlock extends BlockEntity {
/**
* {@link Keys#STRUCTURE_INTEGRITY}
*
* @return The integrity of the structure.
*/
default Value.Mutable<Double> integrity() {
@@ -122,6 +130,7 @@ public interface StructureBlock extends BlockEntity {
/**
* {@link Keys#STRUCTURE_AUTHOR}
*
* @return The author of the structure loaded by the structure block.
*/
default Optional<Value.Mutable<String>> author() {
src/main/java/org/spongepowered/api/block/entity/carrier/BrewingStand.java
+1
View File
@@ -47,6 +47,7 @@ public interface BrewingStand extends NameableCarrierBlockEntity {
/**
* {@link Keys#REMAINING_BREW_TIME}
*
* @return The remaining brewing time in ticks.
*/
default Value.Mutable<Ticks> remainingBrewTime() {
src/main/java/org/spongepowered/api/block/entity/carrier/chest/Chest.java
+1
View File
@@ -60,6 +60,7 @@ public interface Chest extends NameableCarrierBlockEntity {
/**
* {@link Keys#CHEST_ATTACHMENT_TYPE}
*
* @return The attachment type of this chest.
*/
default Value.Mutable<ChestAttachmentType> attachmentType() {
src/main/java/org/spongepowered/api/block/transaction/BlockTransactionReceipt.java
+1 -2
View File
@@ -69,7 +69,6 @@ public final class BlockTransactionReceipt implements DataSerializable {
.set(Queries.CONTENT_VERSION, this.contentVersion())
.set(Queries.ORIGINAL, this.originalBlock.toContainer())
.set(Queries.FINAL_REPLACEMENT, this.finalBlock.toContainer())
.set(Queries.BLOCK_OPERATION, resourceKey)
;
.set(Queries.BLOCK_OPERATION, resourceKey);
}
}
src/main/java/org/spongepowered/api/block/transaction/Operations.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.block.transaction;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
@SuppressWarnings("unused")
@RegistryScopes(scopes = RegistryScope.GAME)
src/main/java/org/spongepowered/api/command/CommandResults.java
+2 -2
View File
@@ -32,12 +32,12 @@ public final class CommandResults {
/**
* Indicates that the command executed successfully.
*/
public final static CommandResult SUCCESS = CommandResult.builder().result(1).build();
public static final CommandResult SUCCESS = CommandResult.builder().result(1).build();
/**
* Indicates that the command executed but was unable to carry out its task.
*/
public final static CommandResult EMPTY = CommandResult.builder().build();
public static final CommandResult EMPTY = CommandResult.builder().build();
private CommandResults() {
throw new AssertionError("You shouldn't be trying to instantiate this");
src/main/java/org/spongepowered/api/command/parameter/CommonParameters.java
+7 -7
View File
@@ -100,7 +100,7 @@ public final class CommonParameters {
*
* @see ResourceKeyedValueParameters#WORLD
*/
public final static Parameter.Value<ServerWorld> WORLD = Parameter.world().key("world").build();
public static final Parameter.Value<ServerWorld> WORLD = Parameter.world().key("world").build();
/**
* A {@link Parameter.Value} that parses a {@link Boolean} with the key name
@@ -108,7 +108,7 @@ public final class CommonParameters {
*
* @see ResourceKeyedValueParameters#BOOLEAN
*/
public final static Parameter.Value<Boolean> BOOLEAN = Parameter.bool().key("true/false").build();
public static final Parameter.Value<Boolean> BOOLEAN = Parameter.bool().key("true/false").build();
/**
* A {@link Parameter.Value} that parses a world and a position and stores
@@ -116,7 +116,7 @@ public final class CommonParameters {
*
* @see ResourceKeyedValueParameters#LOCATION
*/
public final static Parameter.Value<ServerLocation> LOCATION_ONLINE_ONLY = Parameter.location().key("location").build();
public static final Parameter.Value<ServerLocation> LOCATION_ONLINE_ONLY = Parameter.location().key("location").build();
/**
* A {@link Parameter.Value} that parses the remainder of the string under
@@ -124,7 +124,7 @@ public final class CommonParameters {
*
* @see ResourceKeyedValueParameters#REMAINING_JOINED_STRINGS
*/
public final static Parameter.Value<String> MESSAGE = Parameter.remainingJoinedStrings().key("message").build();
public static final Parameter.Value<String> MESSAGE = Parameter.remainingJoinedStrings().key("message").build();
/**
* A {@link Parameter.Value} that parses a player name or selector and
@@ -132,7 +132,7 @@ public final class CommonParameters {
*
* @see ResourceKeyedValueParameters#PLAYER
*/
public final static Parameter.Value<ServerPlayer> PLAYER = Parameter.player().key("player").build();
public static final Parameter.Value<ServerPlayer> PLAYER = Parameter.player().key("player").build();
/**
* A {@link Parameter.Value} that parses a player name or selector and
@@ -141,7 +141,7 @@ public final class CommonParameters {
*
* @see ResourceKeyedValueParameters#PLAYER
*/
public final static Parameter.Value<ServerPlayer> PLAYER_OPTIONAL = Parameter.player().optional().key("player").build();
public static final Parameter.Value<ServerPlayer> PLAYER_OPTIONAL = Parameter.player().optional().key("player").build();
/**
* A {@link Parameter.Value} that parses a position and stores it as a
@@ -149,7 +149,7 @@ public final class CommonParameters {
*
* @see ResourceKeyedValueParameters#VECTOR3D
*/
public final static Parameter.Value<Vector3d> POSITION = Parameter.vector3d().key("position").build();
public static final Parameter.Value<Vector3d> POSITION = Parameter.vector3d().key("position").build();
// SORTFIELDS:OFF
src/main/java/org/spongepowered/api/command/parameter/managed/clientcompletion/ClientCompletionTypes.java
+1 -1
View File
@@ -28,10 +28,10 @@ import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.command.parameter.managed.ValueParser;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* Supported {@link ClientCompletionTypes}.
src/main/java/org/spongepowered/api/command/parameter/managed/standard/VariableValueParameters.java
+3 -2
View File
@@ -36,11 +36,11 @@ import org.spongepowered.api.command.parameter.Parameter;
import org.spongepowered.api.command.parameter.managed.ValueParameter;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.DefaultedRegistryType;
import org.spongepowered.api.registry.RegistryType;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.Registry;
import org.spongepowered.api.registry.RegistryHolder;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryType;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.util.Builder;
import java.util.Collection;
@@ -149,6 +149,7 @@ public final class VariableValueParameters {
/**
* Creates a builder that builds a {@link ValueParameter} that tries to
* construct a {@link Component} from an argument.
*
* @return The new builder
*/
public static TextBuilder textBuilder() {
src/main/java/org/spongepowered/api/command/registrar/tree/ClientCompletionKeys.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.command.registrar.tree;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
@SuppressWarnings("unused")
@RegistryScopes(scopes = RegistryScope.GAME)
src/main/java/org/spongepowered/api/command/selector/SelectorSortAlgorithms.java
+1 -1
View File
@@ -28,10 +28,10 @@ import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.entity.Entity;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* Sort algorithms for selectors
src/main/java/org/spongepowered/api/command/selector/SelectorTypes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.command.selector;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* All {@link SelectorType}s available in Minecraft.
src/main/java/org/spongepowered/api/data/DataRegistrationNotFoundException.java
+2 -2
View File
@@ -24,10 +24,10 @@
*/
package org.spongepowered.api.data;
import java.util.Optional;
import org.checkerframework.checker.nullness.qual.Nullable;
import java.util.Optional;
public class DataRegistrationNotFoundException extends DataException {
private static final long serialVersionUID = -1671720083547789746L;
src/main/java/org/spongepowered/api/data/DataTransactionResult.java
+4 -1
View File
@@ -65,7 +65,10 @@ public final class DataTransactionResult {
@Override
public BinaryOperator<Builder> combiner() {
return (left, right) -> { left.absorbResult(right.build()); return left; };
return (left, right) -> {
left.absorbResult(right.build());
return left;
};
}
@Override
src/main/java/org/spongepowered/api/data/ImmutableDataProviderBuilder.java
+3
View File
@@ -35,10 +35,13 @@ public interface ImmutableDataProviderBuilder<H extends DataHolder, V extends Va
Builder<DataProvider<? extends Value<E>, E>, ImmutableDataProviderBuilder<H, V, E>> {
<NV extends Value<NE>, NE> ImmutableDataProviderBuilder<H, NV, NE> key(Key<NV> key);
<NH extends H> ImmutableDataProviderBuilder<NH, V, E> dataHolder(TypeToken<NH> holder);
<NH extends H> ImmutableDataProviderBuilder<NH, V, E> dataHolder(Class<NH> holder);
ImmutableDataProviderBuilder<H, V, E> get(Function<H, E> get);
ImmutableDataProviderBuilder<H, V, E> set(BiFunction<H, E, H> set);
ImmutableDataProviderBuilder<H, V, E> supports(final Function<H, Boolean> supports);
src/main/java/org/spongepowered/api/data/Keys.java
+2 -2
View File
@@ -63,6 +63,7 @@ import org.spongepowered.api.data.type.HandPreference;
import org.spongepowered.api.data.type.HorseColor;
import org.spongepowered.api.data.type.HorseStyle;
import org.spongepowered.api.data.type.InstrumentType;
import org.spongepowered.api.data.type.ItemTier;
import org.spongepowered.api.data.type.LlamaType;
import org.spongepowered.api.data.type.MatterType;
import org.spongepowered.api.data.type.MooshroomType;
@@ -83,7 +84,6 @@ import org.spongepowered.api.data.type.SpellType;
import org.spongepowered.api.data.type.SpellTypes;
import org.spongepowered.api.data.type.StairShape;
import org.spongepowered.api.data.type.StructureMode;
import org.spongepowered.api.data.type.ItemTier;
import org.spongepowered.api.data.type.TropicalFishShape;
import org.spongepowered.api.data.type.VillagerType;
import org.spongepowered.api.data.type.WireAttachmentType;
@@ -224,8 +224,8 @@ import org.spongepowered.api.util.Ticks;
import org.spongepowered.api.util.TypeTokens;
import org.spongepowered.api.util.orientation.Orientation;
import org.spongepowered.api.util.weighted.WeightedSerializableObject;
import org.spongepowered.api.world.server.ServerLocation;
import org.spongepowered.api.world.explosion.Explosion;
import org.spongepowered.api.world.server.ServerLocation;
import org.spongepowered.api.world.server.ServerWorld;
import org.spongepowered.api.world.weather.WeatherType;
import org.spongepowered.api.world.weather.WeatherTypes;
src/main/java/org/spongepowered/api/data/MutableDataProviderBuilder.java
+10
View File
@@ -38,17 +38,27 @@ public interface MutableDataProviderBuilder<H extends DataHolder.Mutable, V exte
Builder<DataProvider<V, E>, MutableDataProviderBuilder<H, V, E>> {
<NV extends Value<NE>, NE> MutableDataProviderBuilder<H, NV, NE> key(Key<NV> key);
<NH extends H> MutableDataProviderBuilder<NH, V, E> dataHolder(TypeToken<NH> holder);
<NH extends H> MutableDataProviderBuilder<NH, V, E> dataHolder(Class<NH> holder);
MutableDataProviderBuilder<H, V, E> get(Function<H, E> get);
MutableDataProviderBuilder<H, V, E> set(BiConsumer<H, E> set);
MutableDataProviderBuilder<H, V, E> setAnd(BiFunction<H, E, Boolean> setAnd);
MutableDataProviderBuilder<H, V, E> delete(Consumer<H> delete);
MutableDataProviderBuilder<H, V, E> deleteAnd(Function<H, Boolean> delete);
MutableDataProviderBuilder<H, V, E> deleteAndGet(Function<H, DataTransactionResult> delete);
MutableDataProviderBuilder<H, V, E> resetOnDelete(Supplier<E> resetOnDeleteTo);
MutableDataProviderBuilder<H, V, E> resetOnDelete(Function<H, E> resetOnDeleteTo);
MutableDataProviderBuilder<H, V, E> setAndGet(BiFunction<H, E, DataTransactionResult> setAndGet);
MutableDataProviderBuilder<H, V, E> supports(final Function<H, Boolean> supports);
src/main/java/org/spongepowered/api/data/persistence/AbstractDataBuilder.java
+1 -1
View File
@@ -68,7 +68,7 @@ public abstract class AbstractDataBuilder<T extends DataSerializable> implements
if (container.contains(Queries.CONTENT_VERSION)) {
final int contentVersion = container.getInt(Queries.CONTENT_VERSION).get();
if (contentVersion < this.supportedVersion) {
Optional<DataContentUpdater> updater = Sponge.dataManager().wrappedContentUpdater(this.requiredClass, contentVersion,
final Optional<DataContentUpdater> updater = Sponge.dataManager().wrappedContentUpdater(this.requiredClass, contentVersion,
this.supportedVersion);
if (!updater.isPresent()) {
throw new InvalidDataException("Could not get an updater for " + this.requiredClass.getName()
src/main/java/org/spongepowered/api/data/persistence/DataFormats.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.persistence;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* A pseudo-enum of supported {@link DataFormat}s.
src/main/java/org/spongepowered/api/data/persistence/DataStore.java
+1 -1
View File
@@ -232,7 +232,7 @@ public interface DataStore {
SerializersStep holder(Class<? extends DataHolder>... types);
}
interface SerializersStep extends HolderStep, ResettableBuilder<DataStore, Builder>{
interface SerializersStep extends HolderStep, ResettableBuilder<DataStore, Builder> {
/**
* Adds one or more keys using the default implemented serializers for the given key.
src/main/java/org/spongepowered/api/data/persistence/DataView.java
+2 -2
View File
@@ -345,11 +345,11 @@ public interface DataView {
if (!strings.isPresent()) {
return Optional.empty();
}
List<ResourceKey> keys = new ArrayList<>();
final List<ResourceKey> keys = new ArrayList<>();
for (final String s : strings.get()) {
try {
keys.add(ResourceKey.resolve(s));
} catch (final Exception ignore) {
} catch (final Exception ignored) {
}
}
src/main/java/org/spongepowered/api/data/type/ArmorMaterials.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
@SuppressWarnings("unused")
@RegistryScopes(scopes = RegistryScope.GAME)
src/main/java/org/spongepowered/api/data/type/ArtTypes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link ArtType}s.
src/main/java/org/spongepowered/api/data/type/AttachmentSurfaces.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link AttachmentSurface}s.
src/main/java/org/spongepowered/api/data/type/BannerPatternShapes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link BannerPatternShape}s.
src/main/java/org/spongepowered/api/data/type/BoatTypes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link BoatType}s.
src/main/java/org/spongepowered/api/data/type/BodyParts.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link BodyPart}s.
src/main/java/org/spongepowered/api/data/type/CatTypes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link CatType}s.
src/main/java/org/spongepowered/api/data/type/ChestAttachmentTypes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link ChestAttachmentType}s.
src/main/java/org/spongepowered/api/data/type/ComparatorModes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link ComparatorMode}s.
src/main/java/org/spongepowered/api/data/type/DoorHinges.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link DoorHinge}s.
src/main/java/org/spongepowered/api/data/type/DyeColors.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link DyeColor}s.
src/main/java/org/spongepowered/api/data/type/FoxTypes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link FoxType}s.
src/main/java/org/spongepowered/api/data/type/HandPreferences.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link HandPreference}s.
src/main/java/org/spongepowered/api/data/type/HandTypes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link HandType}s.
src/main/java/org/spongepowered/api/data/type/HorseColors.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link HorseColor}s.
src/main/java/org/spongepowered/api/data/type/HorseStyles.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link HorseStyle}s.
src/main/java/org/spongepowered/api/data/type/InstrumentTypes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link InstrumentType}s.
src/main/java/org/spongepowered/api/data/type/ItemTiers.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link ItemTier}s.
src/main/java/org/spongepowered/api/data/type/LlamaTypes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link LlamaType}s.
src/main/java/org/spongepowered/api/data/type/MooshroomTypes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link MooshroomType}s.
src/main/java/org/spongepowered/api/data/type/NotePitches.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link NotePitch}es.
src/main/java/org/spongepowered/api/data/type/PandaGenes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link PandaGene}s.
src/main/java/org/spongepowered/api/data/type/ParrotTypes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link ParrotType}s.
src/main/java/org/spongepowered/api/data/type/PhantomPhases.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
@SuppressWarnings("unused")
@RegistryScopes(scopes = RegistryScope.GAME)
src/main/java/org/spongepowered/api/data/type/PickupRules.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link PickupRule}s.
src/main/java/org/spongepowered/api/data/type/PistonTypes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla known {@link PistonType}s.
src/main/java/org/spongepowered/api/data/type/PortionTypes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
@SuppressWarnings("unused")
@RegistryScopes(scopes = RegistryScope.GAME)
src/main/java/org/spongepowered/api/data/type/ProfessionTypes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link ProfessionType}s.
src/main/java/org/spongepowered/api/data/type/RabbitTypes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link RabbitType}s.
src/main/java/org/spongepowered/api/data/type/RaidStatuses.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
@SuppressWarnings("unused")
@RegistryScopes(scopes = RegistryScope.GAME)
src/main/java/org/spongepowered/api/data/type/RailDirections.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link RailDirection}s.
src/main/java/org/spongepowered/api/data/type/SkinParts.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link SkinPart}s.
src/main/java/org/spongepowered/api/data/type/SlabPortions.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link SlabPortion}s.
src/main/java/org/spongepowered/api/data/type/SpellTypes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
@SuppressWarnings("unused")
@RegistryScopes(scopes = RegistryScope.GAME)
src/main/java/org/spongepowered/api/data/type/StairShapes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link StairShape}s.
src/main/java/org/spongepowered/api/data/type/StructureModes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link StructureMode}s.
src/main/java/org/spongepowered/api/data/type/TropicalFishShape.java
+1
View File
@@ -38,6 +38,7 @@ public interface TropicalFishShape extends DefaultedRegistryValue {
/**
* Whether this shape represents a large {@link TropicalFish}.
*
* @return True if this shape represents a large tropical fish.
*/
boolean isLarge();
src/main/java/org/spongepowered/api/data/type/TropicalFishShapes.java
+1 -1
View File
@@ -28,10 +28,10 @@ import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.entity.living.aquatic.fish.school.TropicalFish;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla shapes for {@link TropicalFish}.
src/main/java/org/spongepowered/api/data/type/VillagerTypes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
@SuppressWarnings("unused")
@RegistryScopes(scopes = RegistryScope.GAME)
src/main/java/org/spongepowered/api/data/type/WireAttachmentTypes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link WireAttachmentType}s.
src/main/java/org/spongepowered/api/effect/particle/ParticleOptions.java
+1 -1
View File
@@ -30,10 +30,10 @@ import org.spongepowered.api.block.BlockState;
import org.spongepowered.api.effect.potion.PotionEffectType;
import org.spongepowered.api.item.inventory.ItemStackSnapshot;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.util.Color;
import org.spongepowered.api.util.Direction;
import org.spongepowered.math.vector.Vector3d;
src/main/java/org/spongepowered/api/effect/particle/ParticleTypes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.effect.particle;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of all possible {@link ParticleType}s in vanilla minecraft.
src/main/java/org/spongepowered/api/effect/potion/PotionEffectTypes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.effect.potion;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of all possible {@link PotionEffectType}s in vanilla Minecraft.
src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.effect.sound;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of vanilla {@link SoundType}s.
src/main/java/org/spongepowered/api/effect/sound/music/MusicDiscs.java
+1 -1
View File
@@ -27,10 +27,10 @@ package org.spongepowered.api.effect.sound.music;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
@SuppressWarnings("unused")
@RegistryScopes(scopes = RegistryScope.GAME)
src/main/java/org/spongepowered/api/entity/AreaEffectCloud.java
+11
View File
@@ -40,6 +40,7 @@ public interface AreaEffectCloud extends Entity {
/**
* {@link Keys#COLOR}
*
* @return The color of this cloud
*/
default Value.Mutable<Color> color() {
@@ -48,6 +49,7 @@ public interface AreaEffectCloud extends Entity {
/**
* {@link Keys#RADIUS}
*
* @return The initial radius of this cloud
*/
default Value.Mutable<Double> radius() {
@@ -56,6 +58,7 @@ public interface AreaEffectCloud extends Entity {
/**
* {@link Keys#PARTICLE_EFFECT}
*
* @return The particle type
* @see org.spongepowered.api.effect.particle.ParticleTypes
*/
@@ -65,6 +68,7 @@ public interface AreaEffectCloud extends Entity {
/**
* {@link Keys#DURATION}
*
* @return The duration of which this cloud will linger
*/
default Value.Mutable<Ticks> duration() {
@@ -73,6 +77,7 @@ public interface AreaEffectCloud extends Entity {
/**
* {@link Keys#WAIT_TIME}
*
* @return The wait time before applying to an entity
*/
default Value.Mutable<Ticks> waitTime() {
@@ -81,6 +86,7 @@ public interface AreaEffectCloud extends Entity {
/**
* {@link Keys#RADIUS_ON_USE}
*
* @return The radius decrease per use
*/
default Value.Mutable<Double> radiusOnUse() {
@@ -89,6 +95,7 @@ public interface AreaEffectCloud extends Entity {
/**
* {@link Keys#RADIUS_PER_TICK}
*
* @return The radius decrease per tick
*/
default Value.Mutable<Double> radiusPerTick() {
@@ -97,6 +104,7 @@ public interface AreaEffectCloud extends Entity {
/**
* {@link Keys#DURATION_ON_USE}
*
* @return The duration of the potion effects when an entity gets a potion applied
*/
default Value.Mutable<Ticks> durationOnUse() {
@@ -105,6 +113,7 @@ public interface AreaEffectCloud extends Entity {
/**
* {@link Keys#REAPPLICATION_DELAY}
*
* @return The delay for an entity to have a potion effect applied while standing in this cloud
*/
default Value.Mutable<Ticks> applicationDelay() {
@@ -113,6 +122,7 @@ public interface AreaEffectCloud extends Entity {
/**
* {@link Keys#POTION_EFFECTS}
*
* @return The list of potion effects being applied
*/
default ListValue.Mutable<PotionEffect> effects() {
@@ -121,6 +131,7 @@ public interface AreaEffectCloud extends Entity {
/**
* {@link Keys#AGE}
*
* @return The age of this cloud
*/
default Value.Mutable<Integer> age() {
src/main/java/org/spongepowered/api/entity/Entity.java
+15 -1
View File
@@ -41,9 +41,9 @@ import org.spongepowered.api.util.Ticks;
import org.spongepowered.api.util.Transform;
import org.spongepowered.api.util.annotation.DoNotStore;
import org.spongepowered.api.world.Locatable;
import org.spongepowered.api.world.server.ServerLocation;
import org.spongepowered.api.world.World;
import org.spongepowered.api.world.schematic.Schematic;
import org.spongepowered.api.world.server.ServerLocation;
import org.spongepowered.api.world.server.ServerWorld;
import org.spongepowered.math.imaginary.Quaterniond;
import org.spongepowered.math.vector.Vector3d;
@@ -329,6 +329,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
/**
* {@link Keys#DISPLAY_NAME}
*
* @return The display name of this entity
*/
default Value.Mutable<Component> displayName() {
@@ -337,6 +338,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
/**
* {@link Keys#FALL_DISTANCE}
*
* @return The fall distance
*/
default Value.Mutable<Double> fallDistance() {
@@ -345,6 +347,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
/**
* {@link Keys#PASSENGERS}
*
* @return The list of passengers that may be riding this entity
*/
default ListValue.Mutable<Entity> passengers() {
@@ -353,6 +356,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
/**
* {@link Keys#VEHICLE}
*
* @return The vehicle this entity may be riding
*/
default Optional<Value.Mutable<Entity>> vehicle() {
@@ -361,6 +365,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
/**
* {@link Keys#BASE_VEHICLE}
*
* @return The "base vehicle" of the entity vehicle riding chain
*/
default Optional<Value.Mutable<Entity>> baseVehicle() {
@@ -369,6 +374,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
/**
* {@link Keys#ON_GROUND}
*
* @return Whether this entity is on the ground
*/
default Value.Mutable<Boolean> onGround() {
@@ -377,6 +383,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
/**
* {@link Keys#VELOCITY}
*
* @return The velocity of this entity
*/
default Value.Mutable<Vector3d> velocity() {
@@ -385,6 +392,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
/**
* {@link Keys#IS_GRAVITY_AFFECTED}
*
* @return Whether this entity is affected by gravity
*/
default Value.Mutable<Boolean> gravityAffected() {
@@ -393,6 +401,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
/**
* {@link Keys#IS_SILENT}
*
* @return Whether this entity is silent
*/
default Value.Mutable<Boolean> silent() {
@@ -401,6 +410,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
/**
* {@link Keys#CREATOR}
*
* @return The unique id of the creator of this entity
*/
default Optional<Value.Mutable<UUID>> creator() {
@@ -409,6 +419,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
/**
* {@link Keys#NOTIFIER}
*
* @return The unique id of the notifier of this entity
*/
default Optional<Value.Mutable<UUID>> notifier() {
@@ -417,6 +428,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
/**
* {@link Keys#FIRE_TICKS}
*
* @return The amount of time in ticks an Entity is will continue burn for.
*/
default Optional<Value.Mutable<Ticks>> fireTicks() {
@@ -425,6 +437,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
/**
* {@link Keys#FIRE_DAMAGE_DELAY}
*
* @return The amount of time to delay in ticks before an Entity will be burned by fire.
*/
default Optional<Value.Mutable<Ticks>> fireImmuneTicks() {
@@ -433,6 +446,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
/**
* {@link Keys#TRANSIENT}
*
* @return The transient state
*/
default Optional<Value.Mutable<Boolean>> isTransient() {
src/main/java/org/spongepowered/api/entity/EntityArchetype.java
+2
View File
@@ -48,6 +48,7 @@ public interface EntityArchetype extends Archetype<EntitySnapshot, Entity> {
/**
* Creates a new {@link EntityArchetype} with the specified {@link EntityType}.
*
* @param type Type of the entity
* @return An archetype of the given entity type
*/
@@ -57,6 +58,7 @@ public interface EntityArchetype extends Archetype<EntitySnapshot, Entity> {
/**
* Creates a new {@link EntityArchetype} with the specified {@link EntityType}.
*
* @param type Type of the entity
* @return An archetype of the given entity type
*/
src/main/java/org/spongepowered/api/entity/EntityPredicates.java
+1 -1
View File
@@ -51,7 +51,7 @@ public final class EntityPredicates {
final double xDist = pos.getX() - x;
final double yDist = pos.getY() - y;
final double zDist = pos.getZ() - z;
return xDist*xDist + yDist * yDist + zDist * zDist <= distSqrd;
return xDist * xDist + yDist * yDist + zDist * zDist <= distSqrd;
};
}
src/main/java/org/spongepowered/api/entity/EntitySnapshot.java
+1 -1
View File
@@ -30,9 +30,9 @@ import org.spongepowered.api.data.DataHolderBuilder;
import org.spongepowered.api.data.persistence.DataBuilder;
import org.spongepowered.api.util.Transform;
import org.spongepowered.api.world.LocatableSnapshot;
import org.spongepowered.api.world.server.ServerLocation;
import org.spongepowered.api.world.World;
import org.spongepowered.api.world.schematic.Schematic;
import org.spongepowered.api.world.server.ServerLocation;
import org.spongepowered.api.world.server.storage.ServerWorldProperties;
import org.spongepowered.api.world.storage.WorldProperties;
import org.spongepowered.math.vector.Vector3d;
src/main/java/org/spongepowered/api/entity/EntityType.java
+4
View File
@@ -37,24 +37,28 @@ public interface EntityType<A extends Entity> extends DefaultedRegistryValue, Co
/**
* If true {@link Entity entities} of this type will not be saved to disk.
*
* @return If the type is transient
*/
boolean isTransient();
/**
* If true {@link Entity entities} of this type may be summoned naturally or via command.
*
* @return If the type is summonable
*/
boolean isSummonable();
/**
* If true {@link Entity entities} of this type may be caught on fire.
*
* @return If the type is flammable
*/
boolean isFlammable();
/**
* If true {@link Entity entities} of this type may spawn out of range from {@link ServerPlayer players}.
*
* @return If the type can spawn far away from a player
*/
boolean canSpawnAwayFromPlayer();
src/main/java/org/spongepowered/api/entity/EntityTypes.java
+1 -1
View File
@@ -132,10 +132,10 @@ import org.spongepowered.api.entity.vehicle.minecart.carrier.ChestMinecart;
import org.spongepowered.api.entity.vehicle.minecart.carrier.HopperMinecart;
import org.spongepowered.api.entity.weather.LightningBolt;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
/**
* An enumeration of all possible {@link EntityType}s available in vanilla minecraft.
src/main/java/org/spongepowered/api/entity/ExperienceOrb.java
+1
View File
@@ -34,6 +34,7 @@ public interface ExperienceOrb extends Entity {
/**
* {@link Keys#EXPERIENCE}
*
* @return The amount of experience contained in this entity
*/
default Value.Mutable<Integer> experience() {
src/main/java/org/spongepowered/api/entity/FallingBlock.java
+7
View File
@@ -37,6 +37,7 @@ public interface FallingBlock extends Entity {
/**
* {@link Keys#BLOCK_STATE}
*
* @return The blockstate
*/
default Value.Mutable<BlockState> blockState() {
@@ -45,6 +46,7 @@ public interface FallingBlock extends Entity {
/**
* {@link Keys#DAMAGE_PER_BLOCK}
*
* @return The rate of damage increase per block fallen
*/
default Value.Mutable<Double> damagePerBlock() {
@@ -53,6 +55,7 @@ public interface FallingBlock extends Entity {
/**
* {@link Keys#MAX_FALL_DAMAGE}
*
* @return The maximum fall damage
*/
default Value.Mutable<Double> maxFallDamage() {
@@ -61,6 +64,7 @@ public interface FallingBlock extends Entity {
/**
* {@link Keys#CAN_PLACE_AS_BLOCK}
*
* @return Whether this can place a block on landing or not
*/
default Value.Mutable<Boolean> placeAsBlock() {
@@ -69,6 +73,7 @@ public interface FallingBlock extends Entity {
/**
* {@link Keys#CAN_DROP_AS_ITEM}
*
* @return Whether this will drop as an item or not
*/
default Value.Mutable<Boolean> dropAsItem() {
@@ -77,6 +82,7 @@ public interface FallingBlock extends Entity {
/**
* {@link Keys#FALL_TIME}
*
* @return The fall time
*/
default Value.Mutable<Ticks> fallTime() {
@@ -85,6 +91,7 @@ public interface FallingBlock extends Entity {
/**
* {@link Keys#CAN_HURT_ENTITIES}
*
* @return Whether this block will hurt entities on it's way down
*/
default Value.Mutable<Boolean> hurtEntities() {
src/main/java/org/spongepowered/api/entity/Item.java
+1
View File
@@ -37,6 +37,7 @@ public interface Item extends Entity {
/**
* {@link Keys#ITEM_STACK_SNAPSHOT}
*
* @return The item being represented by this entity
*/
default Value.Mutable<ItemStackSnapshot> item() {
src/main/java/org/spongepowered/api/entity/ai/goal/GoalBuilder.java
+1 -2
View File
@@ -35,8 +35,7 @@ import org.spongepowered.api.util.ResettableBuilder;
* @param <G> The type of goal
* @param <B> The type of builder, self-referencing
*/
public interface GoalBuilder<O extends Agent, G extends Goal<O>, B extends GoalBuilder<O, G, B>> extends CopyableBuilder<G, B>, ResettableBuilder<G
, B> {
public interface GoalBuilder<O extends Agent, G extends Goal<O>, B extends GoalBuilder<O, G, B>> extends CopyableBuilder<G, B>, ResettableBuilder<G, B> {
/**
* Builds the {@link Goal}.
src/main/java/org/spongepowered/api/entity/ai/goal/GoalExecutorTypes.java
+1 -1
View File
@@ -28,10 +28,10 @@ import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.entity.living.Agent;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
@SuppressWarnings("unused")
@RegistryScopes(scopes = RegistryScope.GAME)
Loaded 100 of 294 files, more files were not shown because too many files have changed in this diff. Show more