Skip to content

Commit 787851c

Browse files
committed
Merge branch 'refs/heads/walshy/mc-1.21' into walshy/mc-1.21-sfi
# Conflicts: # pom.xml # src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/GPSNetwork.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/CarbonPress.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricPress.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/HeatedPressureChamber.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/EnderTalisman.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java
2 parents b646376 + 6f02cae commit 787851c

File tree

103 files changed

+594
-628
lines changed

Some content is hidden

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

103 files changed

+594
-628
lines changed

pom.xml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -355,9 +355,9 @@
355355

356356
<!-- Shaded packages -->
357357
<dependency>
358-
<groupId>com.github.baked-libs.dough</groupId>
358+
<groupId>com.github.Slimefun.dough</groupId>
359359
<artifactId>dough-api</artifactId>
360-
<version>f8ff25187d</version>
360+
<version>cb22e71335</version>
361361
<scope>compile</scope>
362362
</dependency>
363363
<dependency>
@@ -395,9 +395,9 @@
395395
</dependency>
396396
<!-- This needs to be before Spigot because MockBukkit will fail otherwise. -->
397397
<dependency>
398-
<groupId>com.github.MockBukkit</groupId>
399-
<artifactId>MockBukkit</artifactId>
400-
<version>v3.133.2</version>
398+
<groupId>com.github.seeseemelk</groupId>
399+
<artifactId>MockBukkit-v1.21</artifactId>
400+
<version>3.133.2</version>
401401
<scope>test</scope>
402402

403403
<exclusions>
@@ -410,13 +410,6 @@
410410
</exclusions>
411411
</dependency>
412412

413-
<dependency>
414-
<groupId>org.projectlombok</groupId>
415-
<artifactId>lombok</artifactId>
416-
<version>1.18.32</version>
417-
<scope>provided</scope>
418-
</dependency>
419-
420413
<!-- Third party plugin integrations / soft dependencies -->
421414
<dependency>
422415
<groupId>com.sk89q.worldedit</groupId>

src/main/java/io/github/thebusybiscuit/slimefun4/api/geo/ResourceManager.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
/**
3939
* The {@link ResourceManager} is responsible for registering and managing a {@link GEOResource}.
4040
* You have to use the {@link ResourceManager} if you want to generate or consume a {@link GEOResource} too.
41-
*
41+
*
4242
* @author TheBusyBiscuit
43-
*
43+
*
4444
* @see GEOResource
4545
* @see GEOMiner
4646
* @see GEOScanner
@@ -53,7 +53,7 @@ public class ResourceManager {
5353

5454
/**
5555
* This will create a new {@link ResourceManager}.
56-
*
56+
*
5757
* @param plugin
5858
* Our {@link Slimefun} instance
5959
*/
@@ -64,7 +64,7 @@ public ResourceManager(@Nonnull Slimefun plugin) {
6464
/**
6565
* This method registers the given {@link GEOResource}.
6666
* It may never be called directly, use {@link GEOResource#register()} instead.
67-
*
67+
*
6868
* @param resource
6969
* The {@link GEOResource} to register
7070
*/
@@ -93,7 +93,7 @@ void register(@Nonnull GEOResource resource) {
9393
* This method returns the amount of a certain {@link GEOResource} found in a given {@link Chunk}.
9494
* The result is an {@link OptionalInt} which will be empty if this {@link GEOResource}
9595
* has not been generated at that {@link Location} yet.
96-
*
96+
*
9797
* @param resource
9898
* The {@link GEOResource} to query
9999
* @param world
@@ -102,7 +102,7 @@ void register(@Nonnull GEOResource resource) {
102102
* The {@link Chunk} x coordinate
103103
* @param z
104104
* The {@link Chunk} z coordinate
105-
*
105+
*
106106
* @return An {@link OptionalInt}, either empty or containing the amount of the given {@link GEOResource}
107107
*/
108108
public @Nonnull OptionalInt getSupplies(@Nonnull GEOResource resource, @Nonnull World world, int x, int z) {
@@ -121,7 +121,7 @@ void register(@Nonnull GEOResource resource) {
121121

122122
/**
123123
* This method will set the supplies in a given {@link Chunk} to the specified value.
124-
*
124+
*
125125
* @param resource
126126
* The {@link GEOResource}
127127
* @param world
@@ -147,7 +147,7 @@ public void setSupplies(@Nonnull GEOResource resource, @Nonnull World world, int
147147
* <p>
148148
* This method will invoke {@link #setSupplies(GEOResource, World, int, int, int)} and also calls a
149149
* {@link GEOResourceGenerationEvent}.
150-
*
150+
*
151151
* @param resource
152152
* The {@link GEOResource} to generate
153153
* @param world
@@ -156,7 +156,7 @@ public void setSupplies(@Nonnull GEOResource resource, @Nonnull World world, int
156156
* The x coordinate of that {@link Chunk}
157157
* @param z
158158
* The z coordinate of that {@link Chunk}
159-
*
159+
*
160160
* @return The new supply value
161161
*/
162162
private int generate(@Nonnull GEOResource resource, @Nonnull World world, int x, int y, int z) {
@@ -199,11 +199,11 @@ private int generate(@Nonnull GEOResource resource, @Nonnull World world, int x,
199199
/**
200200
* This method will start a geo-scan at the given {@link Block} and display the result
201201
* of that scan to the given {@link Player}.
202-
*
202+
*
203203
* Note that scans are always per {@link Chunk}, not per {@link Block}, the {@link Block}
204204
* parameter only determines the {@link Location} that was clicked but it will still scan
205205
* the entire {@link Chunk}.
206-
*
206+
*
207207
* @param p
208208
* The {@link Player} who requested these results
209209
* @param block
@@ -227,7 +227,7 @@ public void scan(@Nonnull Player p, @Nonnull Block block, int page) {
227227
menu.addItem(slot, ChestMenuUtils.getBackground(), ChestMenuUtils.getEmptyClickHandler());
228228
}
229229

230-
menu.addItem(4, new CustomItemStack(HeadTexture.MINECRAFT_CHUNK.getAsItemStack(), ChatColor.YELLOW + Slimefun.getLocalization().getResourceString(p, "tooltips.chunk"), "", "&8\u21E8 &7" + Slimefun.getLocalization().getResourceString(p, "tooltips.world") + ": " + block.getWorld().getName(), "&8\u21E8 &7X: " + x + " Z: " + z), ChestMenuUtils.getEmptyClickHandler());
230+
menu.addItem(4, CustomItemStack.create(HeadTexture.MINECRAFT_CHUNK.getAsItemStack(), ChatColor.YELLOW + Slimefun.getLocalization().getResourceString(p, "tooltips.chunk"), "", "&8\u21E8 &7" + Slimefun.getLocalization().getResourceString(p, "tooltips.world") + ": " + block.getWorld().getName(), "&8\u21E8 &7X: " + x + " Z: " + z), ChestMenuUtils.getEmptyClickHandler());
231231
List<GEOResource> resources = new ArrayList<>(Slimefun.getRegistry().getGEOResources().values());
232232
resources.sort(Comparator.comparing(a -> a.getName(p).toLowerCase(Locale.ROOT)));
233233

@@ -240,7 +240,7 @@ public void scan(@Nonnull Player p, @Nonnull Block block, int page) {
240240
int supplies = optional.orElseGet(() -> generate(resource, block.getWorld(), x, block.getY(), z));
241241
String suffix = Slimefun.getLocalization().getResourceString(p, ChatUtils.checkPlurality("tooltips.unit", supplies));
242242

243-
ItemStack item = new CustomItemStack(resource.getItem(), "&f" + resource.getName(p), "&8\u21E8 &e" + supplies + ' ' + suffix);
243+
ItemStack item = CustomItemStack.create(resource.getItem(), "&f" + resource.getName(p), "&8\u21E8 &e" + supplies + ' ' + suffix);
244244

245245
if (supplies > 1) {
246246
item.setAmount(Math.min(supplies, item.getMaxStackSize()));

src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/GPSNetwork.java

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
* The {@link GPSNetwork} is a manager class for all {@link GPSTransmitter Transmitters} and waypoints.
4545
* There can only be one instance of this class per {@link Server}.
4646
* It is also responsible for teleportation and resource management.
47-
*
47+
*
4848
* @author TheBusyBiscuit
49-
*
49+
*
5050
* @see TeleportationManager
5151
* @see ResourceManager
5252
*
@@ -64,7 +64,7 @@ public class GPSNetwork {
6464
/**
6565
* This constructs a new {@link GPSNetwork}.
6666
* Note that this network is per {@link Server} and not per {@link Player}.
67-
*
67+
*
6868
* @param plugin
6969
* Our {@link Slimefun} instance
7070
*/
@@ -74,7 +74,7 @@ public GPSNetwork(@Nonnull Slimefun plugin) {
7474

7575
/**
7676
* This method updates the status of a {@link GPSTransmitter}.
77-
*
77+
*
7878
* @param l
7979
* The {@link Location} of the {@link GPSTransmitter}
8080
* @param uuid
@@ -96,10 +96,10 @@ public void updateTransmitter(@Nonnull Location l, @Nonnull UUID uuid, boolean o
9696
* This method calculates the GPS complexity for the given {@link UUID}.
9797
* The complexity is determined by the Y level of each {@link GPSTransmitter}
9898
* multiplied by the multiplier of that transmitter.
99-
*
99+
*
100100
* @param uuid
101101
* The {@link UUID} who to calculate it for
102-
*
102+
*
103103
* @return The network complexity for that {@link UUID}
104104
*/
105105
public int getNetworkComplexity(@Nonnull UUID uuid) {
@@ -124,10 +124,10 @@ public int getNetworkComplexity(@Nonnull UUID uuid) {
124124
/**
125125
* This method returns the amount of {@link GPSTransmitter Transmitters} for the
126126
* given {@link UUID}.
127-
*
127+
*
128128
* @param uuid
129129
* The {@link UUID} who these transmitters belong to
130-
*
130+
*
131131
* @return The amount of transmitters
132132
*/
133133
public int countTransmitters(@Nonnull UUID uuid) {
@@ -138,7 +138,7 @@ public int countTransmitters(@Nonnull UUID uuid) {
138138
/**
139139
* This method opens the {@link GPSTransmitter} control panel to the given
140140
* {@link Player}.
141-
*
141+
*
142142
* @param p
143143
* The {@link Player}
144144
*/
@@ -149,18 +149,18 @@ public void openTransmitterControlPanel(@Nonnull Player p) {
149149
menu.addItem(slot, ChestMenuUtils.getBackground(), ChestMenuUtils.getEmptyClickHandler());
150150
}
151151

152-
menu.addItem(2, new CustomItemStack(SlimefunItems.GPS_TRANSMITTER.item(), im -> {
152+
menu.addItem(2, CustomItemStack.create(SlimefunItems.GPS_TRANSMITTER.item(), im -> {
153153
im.setDisplayName(ChatColor.GRAY + Slimefun.getLocalization().getMessage(p, "machines.GPS_CONTROL_PANEL.transmitters"));
154154
im.setLore(null);
155155
}));
156156

157157
menu.addMenuClickHandler(2, ChestMenuUtils.getEmptyClickHandler());
158158

159159
int complexity = getNetworkComplexity(p.getUniqueId());
160-
menu.addItem(4, new CustomItemStack(SlimefunItems.GPS_CONTROL_PANEL.item(), "&7Network Info", "", "&8\u21E8 &7Status: " + getStatusText(p, complexity), "&8\u21E8 &7Complexity: &f" + complexity));
160+
menu.addItem(4, CustomItemStack.create(SlimefunItems.GPS_CONTROL_PANEL.item(), "&7Network Info", "", "&8\u21E8 &7Status: " + getStatusText(p, complexity), "&8\u21E8 &7Complexity: &f" + complexity));
161161
menu.addMenuClickHandler(4, ChestMenuUtils.getEmptyClickHandler());
162162

163-
menu.addItem(6, new CustomItemStack(HeadTexture.GLOBE_OVERWORLD.getAsItemStack(), "&7" + Slimefun.getLocalization().getMessage(p, "machines.GPS_CONTROL_PANEL.waypoints"), "", ChatColor.GRAY + "\u21E8 " + Slimefun.getLocalization().getMessage(p, "guide.tooltips.open-itemgroup")));
163+
menu.addItem(6, CustomItemStack.create(HeadTexture.GLOBE_OVERWORLD.getAsItemStack(), "&7" + Slimefun.getLocalization().getMessage(p, "machines.GPS_CONTROL_PANEL.waypoints"), "", ChatColor.GRAY + "\u21E8 " + Slimefun.getLocalization().getMessage(p, "guide.tooltips.open-itemgroup")));
164164
menu.addMenuClickHandler(6, (pl, slot, item, action) -> {
165165
openWaypointControlPanel(pl);
166166
return false;
@@ -177,7 +177,7 @@ public void openTransmitterControlPanel(@Nonnull Player p) {
177177
if (sfi instanceof GPSTransmitter transmitter) {
178178
int slot = inventory[index];
179179

180-
menu.addItem(slot, new CustomItemStack(SlimefunItems.GPS_TRANSMITTER.item(), "&bGPS Transmitter", "&8\u21E8 &7World: &f" + l.getWorld().getName(), "&8\u21E8 &7X: &f" + l.getX(), "&8\u21E8 &7Y: &f" + l.getY(), "&8\u21E8 &7Z: &f" + l.getZ(), "", "&8\u21E8 &7Signal Strength: &f" + transmitter.getMultiplier(l.getBlockY()), "&8\u21E8 &7Ping: &f" + NumberUtils.roundDecimalNumber(1000D / l.getY()) + "ms"));
180+
menu.addItem(slot, CustomItemStack.create(SlimefunItems.GPS_TRANSMITTER.item(), "&bGPS Transmitter", "&8\u21E8 &7World: &f" + l.getWorld().getName(), "&8\u21E8 &7X: &f" + l.getX(), "&8\u21E8 &7Y: &f" + l.getY(), "&8\u21E8 &7Z: &f" + l.getZ(), "", "&8\u21E8 &7Signal Strength: &f" + transmitter.getMultiplier(l.getBlockY()), "&8\u21E8 &7Ping: &f" + NumberUtils.roundDecimalNumber(1000D / l.getY()) + "ms"));
181181
menu.addMenuClickHandler(slot, ChestMenuUtils.getEmptyClickHandler());
182182

183183
index++;
@@ -192,14 +192,14 @@ public void openTransmitterControlPanel(@Nonnull Player p) {
192192
* The icon is dependent on the {@link Environment} of the waypoint's {@link World}.
193193
* However if the name of this waypoint indicates that this is actually a deathmarker
194194
* then a different texture will be used.
195-
*
195+
*
196196
* Otherwise it will return a globe, a nether or end sphere according to the {@link Environment}.
197-
*
197+
*
198198
* @param name
199199
* The name of a waypoint
200200
* @param environment
201201
* The {@link Environment} of the waypoint's {@link World}
202-
*
202+
*
203203
* @return An icon for this waypoint
204204
*/
205205
@ParametersAreNonnullByDefault
@@ -232,17 +232,17 @@ public void openWaypointControlPanel(@Nonnull Player p) {
232232
menu.addItem(slot, ChestMenuUtils.getBackground(), ChestMenuUtils.getEmptyClickHandler());
233233
}
234234

235-
menu.addItem(2, new CustomItemStack(SlimefunItems.GPS_TRANSMITTER.item(), "&7" + Slimefun.getLocalization().getMessage(p, "machines.GPS_CONTROL_PANEL.transmitters"), "", ChatColor.GRAY + "\u21E8 " + Slimefun.getLocalization().getMessage(p, "guide.tooltips.open-itemgroup")));
235+
menu.addItem(2, CustomItemStack.create(SlimefunItems.GPS_TRANSMITTER.item(), "&7" + Slimefun.getLocalization().getMessage(p, "machines.GPS_CONTROL_PANEL.transmitters"), "", ChatColor.GRAY + "\u21E8 " + Slimefun.getLocalization().getMessage(p, "guide.tooltips.open-itemgroup")));
236236
menu.addMenuClickHandler(2, (pl, slot, item, action) -> {
237237
openTransmitterControlPanel(pl);
238238
return false;
239239
});
240240

241241
int complexity = getNetworkComplexity(p.getUniqueId());
242-
menu.addItem(4, new CustomItemStack(SlimefunItems.GPS_CONTROL_PANEL.item(), "&7Network Info", "", "&8\u21E8 &7Status: " + (complexity > 0 ? "&2&lONLINE" : "&4&lOFFLINE"), "&8\u21E8 &7Complexity: &f" + complexity));
242+
menu.addItem(4, CustomItemStack.create(SlimefunItems.GPS_CONTROL_PANEL.item(), "&7Network Info", "", "&8\u21E8 &7Status: " + (complexity > 0 ? "&2&lONLINE" : "&4&lOFFLINE"), "&8\u21E8 &7Complexity: &f" + complexity));
243243
menu.addMenuClickHandler(4, ChestMenuUtils.getEmptyClickHandler());
244244

245-
menu.addItem(6, new CustomItemStack(HeadTexture.GLOBE_OVERWORLD.getAsItemStack(), "&7" + Slimefun.getLocalization().getMessage(p, "machines.GPS_CONTROL_PANEL.waypoints")));
245+
menu.addItem(6, CustomItemStack.create(HeadTexture.GLOBE_OVERWORLD.getAsItemStack(), "&7" + Slimefun.getLocalization().getMessage(p, "machines.GPS_CONTROL_PANEL.waypoints")));
246246
menu.addMenuClickHandler(6, ChestMenuUtils.getEmptyClickHandler());
247247

248248
int index = 0;
@@ -254,7 +254,7 @@ public void openWaypointControlPanel(@Nonnull Player p) {
254254
int slot = inventory[index];
255255

256256
Location l = waypoint.getLocation();
257-
menu.addItem(slot, new CustomItemStack(waypoint.getIcon(), waypoint.getName().replace("player:death ", ""), "&8\u21E8 &7World: &f" + l.getWorld().getName(), "&8\u21E8 &7X: &f" + l.getX(), "&8\u21E8 &7Y: &f" + l.getY(), "&8\u21E8 &7Z: &f" + l.getZ(), "", "&8\u21E8 &cClick to delete"));
257+
menu.addItem(slot, CustomItemStack.create(waypoint.getIcon(), waypoint.getName().replace("player:death ", ""), "&8\u21E8 &7World: &f" + l.getWorld().getName(), "&8\u21E8 &7X: &f" + l.getX(), "&8\u21E8 &7Y: &f" + l.getY(), "&8\u21E8 &7Z: &f" + l.getZ(), "", "&8\u21E8 &cClick to delete"));
258258
menu.addMenuClickHandler(slot, (pl, s, item, action) -> {
259259
profile.removeWaypoint(waypoint);
260260
SoundEffect.GPS_NETWORK_OPEN_PANEL_SOUND.playFor(p);
@@ -273,7 +273,7 @@ public void openWaypointControlPanel(@Nonnull Player p) {
273273
/**
274274
* This method will prompt the given {@link Player} to enter a name for a waypoint.
275275
* After entering the name, it will be added to his waypoint list.
276-
*
276+
*
277277
* @param p
278278
* The {@link Player} who should get a new waypoint
279279
* @param l
@@ -298,7 +298,7 @@ public void createWaypoint(@Nonnull Player p, @Nonnull Location l) {
298298

299299
/**
300300
* This method adds a new waypoint with the given name and {@link Location} for that {@link Player}.
301-
*
301+
*
302302
* @param p
303303
* The {@link Player} to get the new waypoint
304304
* @param name
@@ -343,10 +343,10 @@ public void addWaypoint(@Nonnull Player p, @Nonnull String name, @Nonnull Locati
343343
/**
344344
* This method returns a {@link Set} of {@link Location Locations} for all {@link GPSTransmitter Transmitters}
345345
* owned by the given {@link UUID}.
346-
*
346+
*
347347
* @param uuid
348348
* The {@link UUID} owning those transmitters
349-
*
349+
*
350350
* @return A {@link Set} with all {@link Location Locations} of transmitters for this {@link UUID}
351351
*/
352352
@Nonnull
@@ -357,7 +357,7 @@ public Set<Location> getTransmitters(@Nonnull UUID uuid) {
357357
/**
358358
* This returns the {@link TeleportationManager} for this {@link GPSNetwork}.
359359
* It is responsible for all actions that relate to the {@link Teleporter}.
360-
*
360+
*
361361
* @return The {@link TeleportationManager} for this {@link GPSNetwork}
362362
*/
363363
@Nonnull
@@ -368,7 +368,7 @@ public TeleportationManager getTeleportationManager() {
368368
/**
369369
* This returns the {@link ResourceManager} for this {@link GPSNetwork}.
370370
* Use this to access {@link GEOResource GEOResources}.
371-
*
371+
*
372372
* @return The {@link ResourceManager} for this {@link GPSNetwork}
373373
*/
374374
@Nonnull

src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/TeleportationManager.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
/**
3535
* The {@link TeleportationManager} handles the process of teleportation for a {@link Player}
3636
* who is using a {@link Teleporter}.
37-
*
37+
*
3838
* @author TheBusyBiscuit
39-
*
39+
*
4040
* @see GPSNetwork
4141
* @see Teleporter
4242
*
@@ -79,7 +79,7 @@ public void openTeleporterGUI(Player p, UUID ownerUUID, Block b, int complexity)
7979
menu.addItem(slot, ChestMenuUtils.getBackground(), ChestMenuUtils.getEmptyClickHandler());
8080
}
8181

82-
menu.addItem(4, new CustomItemStack(HeadTexture.GLOBE_OVERWORLD.getAsItemStack(), ChatColor.YELLOW + Slimefun.getLocalization().getMessage(p, "machines.TELEPORTER.gui.title")));
82+
menu.addItem(4, CustomItemStack.create(HeadTexture.GLOBE_OVERWORLD.getAsItemStack(), ChatColor.YELLOW + Slimefun.getLocalization().getMessage(p, "machines.TELEPORTER.gui.title")));
8383
menu.addMenuClickHandler(4, ChestMenuUtils.getEmptyClickHandler());
8484

8585
Location source = new Location(b.getWorld(), b.getX() + 0.5D, b.getY() + 2D, b.getZ() + 0.5D);
@@ -107,7 +107,7 @@ public void openTeleporterGUI(Player p, UUID ownerUUID, Block b, int complexity)
107107
};
108108
// @formatter:on
109109

110-
menu.addItem(slot, new CustomItemStack(waypoint.getIcon(), waypoint.getName().replace("player:death ", ""), lore));
110+
menu.addItem(slot, CustomItemStack.create(waypoint.getIcon(), waypoint.getName().replace("player:death ", ""), lore));
111111
menu.addMenuClickHandler(slot, (pl, s, item, action) -> {
112112
pl.closeInventory();
113113
teleport(pl.getUniqueId(), complexity, source, l, false);
@@ -136,21 +136,21 @@ public void teleport(UUID uuid, int complexity, Location source, Location destin
136136
* to the destination {@link Location}, given the specified complexity.
137137
* <p>
138138
* The returned time will be measured in 500ms intervals.
139-
*
139+
*
140140
* <ul>
141141
* <li>A returned time of {@literal 100} will mean 50,000ms (50s) of real-life time.</li>
142142
* <li>A returned time of {@literal 10} will mean 5,000ms (5s) of real-life time.</li>
143143
* <li>A returned time of {@literal 2} will mean 1,000ms (1s) of real-life time.</li>
144144
* <li>and so on...</li>
145145
* </ul>
146-
*
146+
*
147147
* @param complexity
148148
* The complexity of the {@link GPSNetwork}
149149
* @param source
150150
* The source {@link Location}
151151
* @param destination
152152
* The destination {@link Location}
153-
*
153+
*
154154
* @return The amount of time the teleportation will take
155155
*/
156156
public int getTeleportationTime(int complexity, @Nonnull Location source, @Nonnull Location destination) {

0 commit comments

Comments
 (0)