Skip to content

Commit b2216ba

Browse files
authored
Update checkstyle and fix style issues (#2237)
1 parent e12007f commit b2216ba

File tree

294 files changed

+1028
-730
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

294 files changed

+1028
-730
lines changed

checkstyle-suppressions.xml

+15-20
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE suppressions PUBLIC
3-
"-//Puppy Crawl//DTD Suppressions 1.2//EN"
4-
"http://checkstyle.sourceforge.net/dtds/suppressions_1_2.dtd">
3+
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
4+
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
55

66
<suppressions>
7-
<suppress checks="JavadocMethod|SummaryJavadoc|AvoidEscapedUnicodeCharacters" files="src[\\/]test[\\/]java[\\/].*"/>
8-
<suppress checks="Indentation" files="package-info\.java"/>
9-
<suppress checks="AbbreviationAsWordInName" files="AI"/>
10-
<suppress checks="AbbreviationAsWordInName" files="TNT"/>
11-
<suppress checks="AbbreviationAsWordInName" files="PVP"/>
12-
<suppress checks="AbbreviationAsWordInName" files="PEBKAC"/>
13-
<suppress checks="AbbreviationAsWordInName" files="AABB"/>
14-
<suppress checks=".*" files="SpongeEventFactory\.java"/>
15-
<suppress checks="LineLength" files="IntegerTraits\.java"/>
16-
<suppress checks="LineLength" files="BooleanTraits\.java"/>
17-
<suppress checks="LineLength" files="SoundTypes\.java"/>
18-
<suppress checks="LineLength" files="CraftingRecipes\.java"/>
19-
<suppress checks="LineLength" files="QueryTypes\.java"/>
20-
<suppress checks="LineLength" files="Keys\.java"/>
21-
<suppress checks="LineLength|OneStatementPerLine|WhitespaceAround" files="TypeTokens\.java"/>
22-
<suppress checks="AvoidStarImport" files="Keys\.java"/>
23-
<suppress checks="AvoidStarImport" files="CatalogEntityData\.java"/>
24-
<suppress checks="AvoidStarImport" files="CatalogTypes\.java"/>
7+
<suppress checks="LineLength"/>
8+
<suppress checks="SummaryJavadoc"/>
9+
<suppress checks="MissingJavadocType"/>
10+
<suppress checks="MissingJavadocMethod"/>
11+
<suppress checks="OverloadMethodsDeclarationOrder"/>
12+
<suppress checks="RequireEmptyLineBeforeBlockTagGroup"/>
13+
<suppress checks="JavadocParagraph"/>
14+
<suppress checks="JavadocTagContinuationIndentation"/>
15+
<suppress checks="NonEmptyAtclauseDescription"/>
16+
<suppress checks="AbbreviationAsWordInName"/>
17+
<suppress checks="MethodTypeParameterName"/>
18+
<suppress checks="CommentsIndentation"/>
19+
<suppress checks="InterfaceTypeParameterName"/>
2520
</suppressions>

checkstyle.xml

+351-14
Large diffs are not rendered by default.

extra/ideal-checkstyle.xml

-279
This file was deleted.

src/main/java/org/spongepowered/api/Client.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
*/
2525
package org.spongepowered.api;
2626

27+
import org.spongepowered.api.client.LocalServer;
2728
import org.spongepowered.api.entity.living.player.client.ClientPlayer;
2829
import org.spongepowered.api.entity.living.player.client.LocalPlayer;
29-
import org.spongepowered.api.client.LocalServer;
3030
import org.spongepowered.api.network.ClientSideConnection;
3131
import org.spongepowered.api.world.client.ClientWorld;
3232

src/main/java/org/spongepowered/api/Engine.java

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public interface Engine extends ScopedRegistryHolder {
3535

3636
/**
3737
* Gets the {@link Game} that launched this engine;
38+
*
3839
* @return The game
3940
*/
4041
Game game();

src/main/java/org/spongepowered/api/Game.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
import org.spongepowered.api.registry.RegistryHolder;
4040
import org.spongepowered.api.registry.ScopedRegistryHolder;
4141
import org.spongepowered.api.scheduler.Scheduler;
42+
import org.spongepowered.api.service.ServiceProvider;
4243
import org.spongepowered.api.sql.SqlManager;
4344
import org.spongepowered.api.util.metric.MetricsConfigManager;
44-
import org.spongepowered.api.service.ServiceProvider;
4545

4646
import java.nio.file.Path;
4747
import java.util.Locale;

src/main/java/org/spongepowered/api/Server.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@
3333
import org.spongepowered.api.entity.living.animal.Animal;
3434
import org.spongepowered.api.entity.living.player.gamemode.GameMode;
3535
import org.spongepowered.api.entity.living.player.server.ServerPlayer;
36-
import org.spongepowered.api.map.MapStorage;
3736
import org.spongepowered.api.event.lifecycle.RegisterCommandEvent;
37+
import org.spongepowered.api.map.MapStorage;
3838
import org.spongepowered.api.network.ServerSideConnection;
3939
import org.spongepowered.api.profile.GameProfileManager;
4040
import org.spongepowered.api.resourcepack.ResourcePack;
4141
import org.spongepowered.api.scoreboard.Scoreboard;
4242
import org.spongepowered.api.service.ServiceProvider;
4343
import org.spongepowered.api.user.UserManager;
4444
import org.spongepowered.api.util.locale.LocaleSource;
45-
import org.spongepowered.api.world.server.ServerLocation;
4645
import org.spongepowered.api.world.difficulty.Difficulty;
4746
import org.spongepowered.api.world.generation.config.WorldGenerationConfig;
47+
import org.spongepowered.api.world.server.ServerLocation;
4848
import org.spongepowered.api.world.server.ServerWorld;
4949
import org.spongepowered.api.world.server.WorldManager;
5050
import org.spongepowered.api.world.storage.ChunkLayout;

src/main/java/org/spongepowered/api/UnsupportedEngineException.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
*/
3030
public class UnsupportedEngineException extends UnsupportedOperationException {
3131

32-
private static final long serialVersionUID = 5671217624171369435L;
32+
private static final long serialVersionUID = 5671217624171369435L;
3333

34-
public UnsupportedEngineException(final String message) {
35-
super(message);
36-
}
34+
public UnsupportedEngineException(final String message) {
35+
super(message);
36+
}
3737
}

src/main/java/org/spongepowered/api/advancement/Advancement.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
import net.kyori.adventure.text.ComponentLike;
2929
import org.checkerframework.checker.nullness.qual.Nullable;
3030
import org.spongepowered.api.ResourceKey;
31-
import org.spongepowered.api.datapack.DataPackSerializable;
3231
import org.spongepowered.api.Sponge;
3332
import org.spongepowered.api.advancement.criteria.AdvancementCriterion;
33+
import org.spongepowered.api.datapack.DataPackSerializable;
3434
import org.spongepowered.api.util.ResourceKeyedBuilder;
3535

3636
import java.util.Collection;

0 commit comments

Comments
 (0)