Skip to content

Commit 3ca7e6b

Browse files
committed
Fix javadoc issues with link references. Fix many other issues from #221.
Signed-off-by: Gabriel Harris-Rouquette <[email protected]>
1 parent eb58a1a commit 3ca7e6b

File tree

21 files changed

+164
-119
lines changed

21 files changed

+164
-119
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public interface CatalogType {
3939
String getId();
4040

4141
/**
42-
* Gets the unique human-readable name of this individual {@link
43-
* CatalogType}.
42+
* Gets the unique human-readable name of this individual
43+
* {@link CatalogType}.
4444
*
4545
* @return The uniquely identifiable name of this catalog type
4646
*/

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@
9898

9999
/**
100100
* Enumeration of all known {@link CatalogType}s for autocompletion when using the
101-
* {@link GameRegistry#getType(Class, String)} and {@link
102-
* GameRegistry#getAllOf(Class)}.
101+
* {@link GameRegistry#getType(Class, String)} and
102+
* {@link GameRegistry#getAllOf(Class)}.
103103
*/
104104
public final class CatalogTypes {
105105

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ public interface GameRegistry {
106106
<T extends CatalogType> Optional<T> getType(Class<T> typeClass, String id);
107107

108108
/**
109-
* Gets a collection of all available found specific types of {@link
110-
* CatalogType} requested.
109+
* Gets a collection of all available found specific types of
110+
* {@link CatalogType} requested.
111111
*
112112
* <p>The presented {@link CatalogType}s may not exist in default catalogs
113113
* due to various reasons including but not restricted to: mods, plugins,

src/main/java/org/spongepowered/api/block/BlockType.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public interface BlockType extends CatalogType, Translatable {
5050
*
5151
* @return The id
5252
*/
53+
@Override
5354
String getName();
5455

5556
/**

src/main/java/org/spongepowered/api/data/DataHolder.java

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ public interface DataHolder extends DataSerializable {
5656
/**
5757
* Gets or creates a new {@link DataManipulator} that can be accepted by
5858
* this {@link DataHolder}. In the event that there is no data that can
59-
* be represented by the given {@link DataManipulator}, a new {@link
60-
* DataManipulator} object is created with default values.
59+
* be represented by the given {@link DataManipulator}, a new
60+
* {@link DataManipulator} object is created with default values.
6161
*
6262
* <p>In the event the {@link DataManipulator} can not represent any data
6363
* pertaining to this {@link DataHolder}, {@link Optional#absent()} is
@@ -88,8 +88,8 @@ public interface DataHolder extends DataSerializable {
8888
*
8989
* @param manipulatorClass The data class
9090
* @param <T> The type of data
91-
* @return True if this {@link DataHolder} can accept the {@link
92-
* DataManipulator} object
91+
* @return True if this {@link DataHolder} can accept the
92+
* {@link DataManipulator} object
9393
*/
9494
<T extends DataManipulator<T>> boolean isCompatible(Class<T> manipulatorClass);
9595

@@ -100,8 +100,9 @@ public interface DataHolder extends DataSerializable {
100100
* would otherwise overlap existing data on this {@link DataHolder}, a
101101
* default {@link DataPriority#DATA_MANIPULATOR} is used.</p>
102102
*
103-
* <p>If any data is rejected or existing data is replaced, the {@link
104-
* DataTransactionResult} will retain the rejected and replaced data.</p>
103+
* <p>If any data is rejected or existing data is replaced, the
104+
* {@link DataTransactionResult} will retain the rejected and replaced
105+
* data.</p>
105106
*
106107
* @param manipulatorData The manipulator data to offer
107108
* @param <T> The type of manipulator data
@@ -112,8 +113,9 @@ public interface DataHolder extends DataSerializable {
112113
/**
113114
* Offers the given {@link DataManipulator} to this {@link DataHolder}.
114115
*
115-
* <p>If any data is rejected or existing data is replaced, the {@link
116-
* DataTransactionResult} will retain the rejected and replaced data.</p>
116+
* <p>If any data is rejected or existing data is replaced, the
117+
* {@link DataTransactionResult} will retain the rejected and replaced
118+
* data.</p>
117119
*
118120
* @param manipulatorData The manipulator data to offer
119121
* @param <T> The type of manipulator data
@@ -124,19 +126,19 @@ public interface DataHolder extends DataSerializable {
124126

125127
/**
126128
* Gets an copied collection of all known {@link DataManipulator}s
127-
* belonging to this {@link DataHolder}. An individual {@link
128-
* DataManipulator} can be used for creating new data to replace on this
129-
* {@link DataHolder}.
129+
* belonging to this {@link DataHolder}. An individual
130+
* {@link DataManipulator} can be used for creating new data to replace on
131+
* this {@link DataHolder}.
130132
*
131133
* @return A collection of copied data manipulators belonging to this
132134
* data holder
133135
*/
134136
Collection<? extends DataManipulator<?>> getManipulators();
135137

136138
/**
137-
* Attempts to retrieve a specific {@link Property} type of this {@link
138-
* DataHolder}. If the property is not applicable, {@link Optional#absent()}
139-
* is returned.
139+
* Attempts to retrieve a specific {@link Property} type of this
140+
* {@link DataHolder}. If the property is not applicable,
141+
* {@link Optional#absent()} is returned.
140142
*
141143
* <p>{@link Property}s can define various immutable information about a
142144
* {@link DataHolder} that is dependent on the instance of the holder.

src/main/java/org/spongepowered/api/data/DataManipulator.java

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,40 +42,41 @@ public interface DataManipulator<T extends DataManipulator<T>> extends Comparabl
4242
/**
4343
* Attempts to read data from the given {@link DataHolder} and constructs
4444
* a new copy of this {@link DataManipulator} as an instance of
45-
* <code>T</code>. Any data that overlaps between this and the given {@link
46-
* DataHolder} will be resolved by a default {@link DataPriority#PRE_MERGE}
47-
* such that the current data from this {@link DataManipulator} will be
48-
* applied before the existing data from the {@link DataHolder}.
45+
* <code>T</code>. Any data that overlaps between this and the given
46+
* {@link DataHolder} will be resolved by a default
47+
* {@link DataPriority#PRE_MERGE} such that the current data from this
48+
* {@link DataManipulator} will be applied before the existing data from
49+
* the {@link DataHolder}.
4950
*
5051
* <p>Any data that overlaps existing data from the {@link DataHolder} will
5152
* take priority and be overwriten from the pre-existing data from the
52-
* {@link DataHolder}. It is recommended that a call from {@link
53-
* DataHolder#isCompatible(Class)} is checked prior to using this method on
54-
* any {@link DataHolder}.</p>
53+
* {@link DataHolder}. It is recommended that a call from
54+
* {@link DataHolder#isCompatible(Class)} is checked prior to using this
55+
* method on any {@link DataHolder}.</p>
5556
*
5657
* @param dataHolder The {@link DataHolder} to extract data
57-
* @return A new instance of this {@link DataManipulator} with relevant data
58-
* filled from the given {@link DataHolder}
58+
* @return A new instance of this {@link DataManipulator} with relevant
59+
* data filled from the given {@link DataHolder}
5960
*/
6061
Optional<T> fill(DataHolder dataHolder);
6162

6263
/**
6364
* Attempts to read data from the given {@link DataHolder} and constructs
6465
* a new copy of this {@link DataManipulator} as an instance of
65-
* <code>T</code>. Any data overlap that exists in both the {@link
66-
* DataHolder} and this {@link DataManipulator} will be resolved using the
67-
* given {@link DataPriority}.
66+
* <code>T</code>. Any data that overlaps between this and the given
67+
* {@link DataHolder} will be resolved using the given
68+
* {@link DataPriority}.
6869
*
6970
* <p>Any data that overlaps existing data from the {@link DataHolder} will
7071
* take priority and be overwriten from the pre-existing data from the
71-
* {@link DataHolder}. It is recommended that a call from {@link
72-
* DataHolder#isCompatible(Class)} is checked prior to using this method on
73-
* any {@link DataHolder}.</p>
72+
* {@link DataHolder}. It is recommended that a call from
73+
* {@link DataHolder#isCompatible(Class)} is checked prior to using this
74+
* method on any {@link DataHolder}.</p>
7475
*
7576
* @param dataHolder The {@link DataHolder} to extract data
7677
* @param overlap The overlap resolver to decide which data to retain
77-
* @return A new instance of this {@link DataManipulator} with relevant data
78-
* filled from the given {@link DataHolder}
78+
* @return A new instance of this {@link DataManipulator} with relevant
79+
* data filled from the given {@link DataHolder}
7980
*/
8081
Optional<T> fill(DataHolder dataHolder, DataPriority overlap);
8182

src/main/java/org/spongepowered/api/data/DataPriority.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
package org.spongepowered.api.data;
2626

2727
/**
28-
* A data priority enum. When merging existing data from a {@link
29-
* DataHolder} and a {@link DataManipulator}, the priority defines which
30-
* data to retain, and or, merge.
28+
* A data priority enum. When merging existing data from a {@link DataHolder}
29+
* and a {@link DataManipulator}, the priority defines which data to retain,
30+
* and or, merge.
3131
*/
3232
public enum DataPriority {
3333
/**
3434
* The data residing in the {@link DataHolder} should be retained,
35-
* ignoring all overlapping data from thie owning {@link
36-
* DataManipulator}.
35+
* ignoring all overlapping data from the owning
36+
* {@link DataManipulator}.
3737
*/
3838
DATA_HOLDER,
3939
/**
@@ -43,16 +43,16 @@ public enum DataPriority {
4343
DATA_MANIPULATOR,
4444
/**
4545
* All overlapping data from the {@link DataManipulator} will be
46-
* added before the overlapping data existing from the {@link
47-
* DataHolder}. Examples may include prefixing display names,
46+
* added before the overlapping data existing from the
47+
* {@link DataHolder}. Examples may include prefixing display names,
4848
* adding enchantments at the beginning of an enchantment list, etc.
4949
*/
5050
PRE_MERGE,
5151
/**
5252
* All overlapping data from the {@link DataManipulator} will be
53-
* added after the overlapping data existing from the {@link
54-
* DataHolder}. Examples may include suffixing display names,
55-
* adding enchantments at the end of an enchantment list, etc.
53+
* added after the overlapping data existing from the {@link DataHolder}.
54+
* Examples may include suffixing display names, adding enchantments at
55+
* the end of an enchantment list, etc.
5656
*/
5757
POST_MERGE,
5858
;

src/main/java/org/spongepowered/api/data/DataTransactionResult.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ enum Type {
6262

6363
/**
6464
* The {@link DataManipulator} operation failed because an
65-
* <em>unexpected</em> condition occurred. The state of the {@link
66-
* DataManipulator} is undefined.
65+
* <em>unexpected</em> condition occurred. The state of the
66+
* {@link DataManipulator} is undefined.
6767
*/
6868
ERROR,
6969

7070
/**
71-
* An operation was cancelled by a third party (eååg. an {@link
72-
* DataManipulator} event was cancelled). The condition of the {@link
73-
* DataManipulator} is unchanged.
71+
* An operation was cancelled by a third party (eg. a
72+
* {@link DataManipulator} event was cancelled). The condition of the
73+
* {@link DataManipulator} is unchanged.
7474
*/
7575
CANCELLED,
7676
;

src/main/java/org/spongepowered/api/data/manipulators/SingleValueData.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828

2929
/**
3030
* Represents a {@link DataManipulator} that handles a single value with
31-
* default provided methods to {@link #getValue()} and {@link
32-
* #setValue(Object)}.
31+
* default provided methods to {@link #getValue()} and
32+
* {@link #setValue(Object)}.
3333
*
3434
* @param <V> The value of the data
3535
* @param <T> The implementing manipulator for comparison

src/main/java/org/spongepowered/api/entity/Entity.java

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.spongepowered.api.world.Location;
3434
import org.spongepowered.api.world.TeleportHelper;
3535
import org.spongepowered.api.world.World;
36+
import org.spongepowered.api.world.storage.WorldProperties;
3637

3738
import java.util.EnumSet;
3839
import java.util.UUID;
@@ -149,8 +150,8 @@ public interface Entity extends Identifiable, DataHolder, DataSerializable {
149150
* @param location The location to set
150151
* @param rotation The rotation to set
151152
* @param relativePositions The coordinates to set relatively
152-
* @return True if location was set successfully, false if location couldn't
153-
* be set as no safe location was found
153+
* @return True if location was set successfully, false if location
154+
* couldn't be set as no safe location was found
154155
*/
155156
boolean setLocationAndRotationSafely(Location location, Vector3d rotation, EnumSet<RelativePositions> relativePositions);
156157

@@ -159,16 +160,14 @@ public interface Entity extends Identifiable, DataHolder, DataSerializable {
159160
* not have to be loaded (but must at least be enabled).
160161
*
161162
* <p>If the target world is loaded then this is equivalent to
162-
* setting the location via {@link
163-
* TargetedLocationData}.</p>
163+
* setting the location via {@link TargetedLocationData}.</p>
164164
*
165165
* <p>If the target world is unloaded but is enabled according to its
166-
* {@link org.spongepowered.api.world.storage.WorldProperties#isEnabled()}
167-
* then this will first load the world before transferring the entity to
168-
* that world.</p>
166+
* {@link WorldProperties#isEnabled()} then this will first load the world
167+
* before transferring the entity to that world.</p>
169168
*
170-
* <p>If the target world is unloaded and not enabled then the transfer will
171-
* fail.</p>
169+
* <p>If the target world is unloaded and not enabled then the transfer
170+
* will fail.</p>
172171
*
173172
* @param worldName The name of the world to transfer to
174173
* @param position The position in the target world
@@ -181,16 +180,14 @@ public interface Entity extends Identifiable, DataHolder, DataSerializable {
181180
* not have to be loaded (but must at least be enabled).
182181
*
183182
* <p>If the target world is loaded then this is equivalent to
184-
* setting the location via {@link
185-
* TargetedLocationData}.</p>
183+
* setting the location via {@link TargetedLocationData}.</p>
186184
*
187185
* <p>If the target world is unloaded but is enabled according to its
188-
* {@link org.spongepowered.api.world.storage.WorldProperties#isEnabled()}
189-
* then this will first load the world before transferring the entity to
190-
* that world.</p>
186+
* {@link WorldProperties#isEnabled()} then this will first load the world
187+
* before transferring the entity to that world.</p>
191188
*
192-
* <p>If the target world is unloaded and not enabled then the transfer will
193-
* fail.</p>
189+
* <p>If the target world is unloaded and not enabled then the transfer
190+
* will fail.</p>
194191
*
195192
* @param uuid The UUID of the target world to transfer to
196193
* @param position The position in the target world

0 commit comments

Comments
 (0)