Skip to content

Commit 4a84f62

Browse files
committed
Fix some incorrect javadoc
1 parent ead8194 commit 4a84f62

File tree

7 files changed

+32
-13
lines changed

7 files changed

+32
-13
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ bin/
1414
bin/*
1515
*/bin/*
1616

17+
doc/
18+
doc/*
19+
*/doc/*
20+
1721
.classpath
1822
*/.classpath
1923

src/main/java/de/bluecolored/bluemap/api/BlueMapAPI.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public abstract class BlueMapAPI {
5555
* Getter for the {@link MarkerAPI}.<br>
5656
* Calling this gives you a fresh loaded {@link MarkerAPI}, so you don't have to call {@link MarkerAPI#load()} right away!
5757
* @return the {@link MarkerAPI}
58+
* @throws IOException if there was an IOException loading the marker.json
5859
*/
5960
public abstract MarkerAPI getMarkerAPI() throws IOException;
6061

@@ -138,7 +139,9 @@ public static synchronized Optional<BlueMapAPI> getInstance() {
138139

139140
/**
140141
* Used by BlueMap to register the API and call the listeners properly.
141-
* @param instance {@link BlueMapAPI}-instance
142+
* @param instance the {@link BlueMapAPI}-instance
143+
* @return <code>true</code> if the instance has been registered, <code>false</code> if there already was an instance registered
144+
* @throws ExecutionException if a {@link BlueMapAPIListener} threw an exception during the registration
142145
*/
143146
protected static synchronized boolean registerInstance(BlueMapAPI instance) throws ExecutionException {
144147
if (BlueMapAPI.instance != null) return false;
@@ -167,6 +170,9 @@ protected static synchronized boolean registerInstance(BlueMapAPI instance) thro
167170

168171
/**
169172
* Used by BlueMap to unregister the API and call the listeners properly.
173+
* @param instance the {@link BlueMapAPI} instance
174+
* @return <code>true</code> if the instance was unregistered, <code>false</code> if there was no or an other instance registered
175+
* @throws ExecutionException if a {@link BlueMapAPIListener} threw an exception during the un-registration
170176
*/
171177
protected static synchronized boolean unregisterInstance(BlueMapAPI instance) throws ExecutionException {
172178
if (BlueMapAPI.instance != instance) return false;

src/main/java/de/bluecolored/bluemap/api/BlueMapAPIListener.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ public interface BlueMapAPIListener {
2929
/**
3030
* Called when BlueMap has been loaded and started and the API is ready to use.<br>
3131
* If {@link BlueMapAPI} is already enabled when this listener is registered this method will be called immediately <i>(on the same thread)</i>!
32-
* <p><i>(Note: This method will likely be called asynchronously, <b>not</b> on the server-thread!</i><p>
32+
* <p><i>(Note: This method will likely be called asynchronously, <b>not</b> on the server-thread!</i></p>
3333
* @param blueMapApi the {@link BlueMapAPI}
3434
*/
3535
default void onEnable(BlueMapAPI blueMapApi) {}
3636

3737
/**
3838
* Called <b>before</b> BlueMap is being unloaded and stopped, after this method returns the API is no longer usable!<br>
3939
* Unlike {@link BlueMapAPIListener#onEnable(BlueMapAPI)}, if {@link BlueMapAPI} is not enabled when this listener is registered this method will <b>not</b> be called immediately.
40-
* <p><i>(Note: This method will likely be called asynchronously, <b>not</b> on the server-thread!</i><p>
41-
* @param blueMapApi
40+
* <p><i>(Note: This method will likely be called asynchronously, <b>not</b> on the server-thread!</i></p>
41+
* @param blueMapApi the {@link BlueMapAPI}
4242
*/
4343
default void onDisable(BlueMapAPI blueMapApi) {}
4444

src/main/java/de/bluecolored/bluemap/api/BlueMapMap.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ public interface BlueMapMap {
6767

6868
/**
6969
* Converts a block-position to a map-tile-coordinate for this map
70+
*
71+
* @param blockX the x-position of the block
72+
* @param blockZ the z-position of the block
73+
* @return the tile position
7074
*/
7175
default Vector2i posToTile(double blockX, double blockZ){
7276
Vector2i offset = getTileOffset();
@@ -80,13 +84,19 @@ default Vector2i posToTile(double blockX, double blockZ){
8084

8185
/**
8286
* Converts a block-position to a map-tile-coordinate for this map
87+
*
88+
* @param pos the position of the block
89+
* @return the tile position
8390
*/
8491
default Vector2i posToTile(Vector3i pos){
8592
return posToTile(pos.getX(), pos.getZ());
8693
}
8794

8895
/**
8996
* Converts a block-position to a map-tile-coordinate for this map
97+
*
98+
* @param pos the position of the block
99+
* @return the tile position
90100
*/
91101
default Vector2i posToTile(Vector3d pos){
92102
return posToTile(pos.getX(), pos.getZ());

src/main/java/de/bluecolored/bluemap/api/BlueMapWorld.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,14 @@ public interface BlueMapWorld {
4141
* <p>
4242
* <b>Implementation notes:</b><br>
4343
* The used UUID highly depends on the implementation
44+
* </p>
4445
* <table>
45-
* <tr><th>Sponge</th><td>The UUID is equal to the returned UUID by world-instances of the Sponge-API, so you can just use <code>spongeWorld.getUniqueId()</code><td><tr>
46-
* <tr><th>Bukkit</th><td>The UUID is equal to the returned UUID by world-instances of the Bukkit-API, so you can just use <code>bukkitWorld.getUID()</code><td><tr>
47-
* <tr><th>Forge</th><td>The UUID is randomly generated, and changes on each reload/restart</code><td><tr>
48-
* <tr><th>CLI</th><td>The UUID is randomly generated, and changes on each reload/restart</code><td><tr>
46+
* <caption>Implementations</caption>
47+
* <tr><th>Sponge</th><td>The UUID is equal to the returned UUID by world-instances of the Sponge-API, so you can just use <code>spongeWorld.getUniqueId()</code></td></tr>
48+
* <tr><th>Bukkit</th><td>The UUID is equal to the returned UUID by world-instances of the Bukkit-API, so you can just use <code>bukkitWorld.getUID()</code></td></tr>
49+
* <tr><th>Forge</th><td>The UUID is randomly generated, and changes on each reload/restart</td></tr>
50+
* <tr><th>CLI</th><td>The UUID is randomly generated, and changes on each reload/restart</td></tr>
4951
* </table>
50-
* </p>
5152
*
5253
* @return the {@link UUID} of the world
5354
*/

src/main/java/de/bluecolored/bluemap/api/marker/ShapeMarker.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ public interface ShapeMarker extends Marker {
7575

7676
/**
7777
* Sets the border- and fill- color.
78-
* @param borderColor
79-
* @param fillColor
78+
* @param borderColor the new border-color
79+
* @param fillColor the new fill-color
8080
* @see #setBorderColor(Color)
8181
* @see #setFillColor(Color)
8282
*/

src/main/java/de/bluecolored/bluemap/api/renderer/RenderAPI.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ default void render(BlueMapWorld world, Vector3i blockPosition) {
6868
* @param mapId the id of the {@link BlueMapMap} to render
6969
* @param blockPosition a {@link Vector3i} for the block-position to render (the whole map-tile will be rendered not only that block)
7070
*
71-
* @return the scheduled {@link RenderTicket}
72-
*
7371
* @throws IllegalArgumentException if there is no map loaded with the provided mapId
7472
*/
7573
void render(String mapId, Vector3i blockPosition);

0 commit comments

Comments
 (0)