Skip to content

Commit 9e608e5

Browse files
Aaron1011Deamon5550
authored andcommitted
Fix Checkstyle problems for Scoreboard package
1 parent 835ed73 commit 9e608e5

File tree

5 files changed

+33
-29
lines changed

5 files changed

+33
-29
lines changed

src/main/java/org/spongepowered/api/scoreboard/Scoreboard.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public interface Scoreboard {
5555
static Builder builder() {
5656
return Sponge.getRegistry().createBuilder(Builder.class);
5757
}
58+
5859
/**
5960
* Gets an {@link Objective} on this scoreboard by name, if it exists.
6061
*
@@ -63,6 +64,15 @@ static Builder builder() {
6364
*/
6465
Optional<Objective> getObjective(String name);
6566

67+
/**
68+
* Gets the {@link Objective} currently displayed in a {@link DisplaySlot} on this
69+
* scoreboard, if one is present.
70+
*
71+
* @param slot The {@link DisplaySlot}
72+
* @return the {@link Objective} currently displayed, if present
73+
*/
74+
Optional<Objective> getObjective(DisplaySlot slot);
75+
6676
/**
6777
* Adds the specified {@link Objective} to this scoreboard.
6878
*
@@ -73,15 +83,6 @@ static Builder builder() {
7383
*/
7484
void addObjective(Objective objective) throws IllegalArgumentException;
7585

76-
/**
77-
* Gets the {@link Objective} currently displayed in a {@link DisplaySlot} on this
78-
* scoreboard, if one is present.
79-
*
80-
* @param slot The {@link DisplaySlot}
81-
* @return the {@link Objective} currently displayed, if present
82-
*/
83-
Optional<Objective> getObjective(DisplaySlot slot);
84-
8586
/**
8687
* Sets the specified {@link Objective} in the specified {@link DisplaySlot}.
8788
*

src/main/java/org/spongepowered/api/scoreboard/Team.java

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,20 @@
4343
* While any {@link Text} can be added to a team, certain {@link Text}s convey a special
4444
* meaning.</p>
4545
*
46-
* <p>Examples of this include players, whose names gain the prefix and suffix of
47-
* the team they are on.</p>
46+
* <p>Examples of this include players, whose names gain the prefix and suffix
47+
* of the team they are on.</p>
4848
*
4949
* <p>With the exception of {@link #getNameTagVisibility()} (which is handled client-side),
50-
* all of the team options require players to have the same team object (and by extension,
51-
* the same scoreboard).
50+
* all of the team options require players to have the same team object (and by
51+
* extension, the same scoreboard).
5252
*
53-
* For example, consider two players who each have different scoreboards set. Each scoreboard has
54-
* a team registered with identical names, each containing the same players. Both players would
55-
* always be able to attack each other, regardless of the value of {@link #allowFriendlyFire()}.
56-
* For it to work, both players must have the same scoreboard, and be on a team registered
57-
* to said scoreboard.</p>
53+
* For example, consider two players who each have different scoreboards set.
54+
* Each scoreboard has a team registered with identical names, each containing
55+
* the same players. Both players would always be able to attack each other,
56+
* regardless of the value of {@link #allowFriendlyFire()}.
57+
*
58+
* For it to work, both players must have the same scoreboard, and be on a team
59+
* registered to said scoreboard.</p>
5860
*/
5961
public interface Team {
6062

@@ -219,9 +221,10 @@ static Builder builder() {
219221
/**
220222
* Adds the specified {@link Text} to this team.
221223
*
222-
* <p>While any {@link Text} may be added, the {@link Text}
223-
* to use should normally be obtained by calling {@link TeamMember#getTeamRepresentation()}
224-
* on a {@link TeamMember}, such as a {@link Player}.</p>
224+
* <p>While any {@link Text} may be added, the {@link Text} to use should
225+
* normally be obtained by calling
226+
* {@link TeamMember#getTeamRepresentation()} on a {@link TeamMember}, such
227+
* as a {@link Player}.</p>
225228
*
226229
* @param member the {@link Text} to add
227230
*/
@@ -232,7 +235,7 @@ static Builder builder() {
232235
*
233236
* <p>While any {@link Text} may be removed, the {@link Text}
234237
* to use should normally be obtained by calling {@link TeamMember#getTeamRepresentation()}
235-
* on a {@link TeamMember}, such as a {@link Player}.</p
238+
* on a {@link TeamMember}, such as a {@link Player}.</p>
236239
*
237240
* @param member The {@link Text} to remove
238241
* @return Whether the {@link Text} was on this team

src/main/java/org/spongepowered/api/scoreboard/TeamMember.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
public interface TeamMember {
4848

4949
/**
50-
* Gets an {@link Text} representing this team member, suitable for
51-
* adding to an {@link Team} with {@link Team#addMember(Text).
50+
* Gets a {@link Text} representing this team member, suitable for adding
51+
* to an {@link Team} with {@link Team#addMember(Text)}.
5252
*
5353
* @return an {@link Text} representing this team member
5454
*/

src/main/java/org/spongepowered/api/scoreboard/critieria/Criteria.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ public final class Criteria {
4545
public static final Criterion TRIGGER = null;
4646

4747
/**
48-
* Represents a {@link Criteria} which causes an {@link Objective}
49-
* to have a score for a player represent their current health,
50-
* on a scale of 0-20 (can be greater than 20 due to effects
51-
* such as {@link PotionEffectTypes#HEALTH_BOOST}
48+
* Represents a {@link Criteria} which causes an {@link Objective} to have
49+
* a score for a player represent their current health, on a scale of 0-20
50+
* (can be greater than 20 due to effects such as
51+
* {@link PotionEffectTypes#HEALTH_BOOST}).
5252
*/
5353
public static final Criterion HEALTH = null;
5454

src/main/java/org/spongepowered/api/scoreboard/objective/displaymode/ObjectiveDisplayMode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.spongepowered.api.util.annotation.CatalogedBy;
3030

3131
/**
32-
* Represents the mode in which to display scores for an {@link Objective}
32+
* Represents the mode in which to display scores for an {@link Objective}.
3333
*/
3434
@CatalogedBy(ObjectiveDisplayModes.class)
3535
public interface ObjectiveDisplayMode extends CatalogType {

0 commit comments

Comments
 (0)