Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-04 23:47:59 +01:00
Code Issues Projects Releases Wiki Activity

Move methods around

Browse Source
This commit is contained in:
TheMode 2021-07-11 03:56:01 +02:00
parent 6cdf8a9ab9
commit 693a5f3d72
1 changed files with 34 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/main/java/net/minestom/server/instance/Instance.java
View File

@ -171,6 +171,16 @@ public abstract class Instance implements BlockGetter, BlockSetter, Tickable, Ta
*/ */
public abstract @NotNull CompletableFuture<@NotNull Chunk> loadChunk(int chunkX, int chunkZ); public abstract @NotNull CompletableFuture<@NotNull Chunk> loadChunk(int chunkX, int chunkZ);
/**
* Loads the chunk at the given {@link Point} with a callback.
*
* @param point the chunk position
*/
public @NotNull CompletableFuture<@NotNull Chunk> loadChunk(@NotNull Point point) {
return loadChunk(ChunkUtils.getChunkCoordinate(point.x()),
ChunkUtils.getChunkCoordinate(point.z()));
}
/** /**
* Loads the chunk if the chunk is already loaded or if * Loads the chunk if the chunk is already loaded or if
* {@link #hasEnabledAutoChunkLoad()} returns true. * {@link #hasEnabledAutoChunkLoad()} returns true.
@ -181,6 +191,18 @@ public abstract class Instance implements BlockGetter, BlockSetter, Tickable, Ta
*/ */
public abstract @NotNull CompletableFuture<@Nullable Chunk> loadOptionalChunk(int chunkX, int chunkZ); public abstract @NotNull CompletableFuture<@Nullable Chunk> loadOptionalChunk(int chunkX, int chunkZ);
/**
* Loads a {@link Chunk} (if {@link #hasEnabledAutoChunkLoad()} returns true)
* at the given {@link Point} with a callback.
*
* @param point the chunk position
* @return a {@link CompletableFuture} completed once the chunk has been processed, null if not loaded
*/
public @NotNull CompletableFuture<@Nullable Chunk> loadOptionalChunk(@NotNull Point point) {
return loadOptionalChunk(ChunkUtils.getChunkCoordinate(point.x()),
ChunkUtils.getChunkCoordinate(point.z()));
}
/** /**
* Schedules the removal of a {@link Chunk}, this method does not promise when it will be done. * Schedules the removal of a {@link Chunk}, this method does not promise when it will be done.
* <p> * <p>
@ -192,6 +214,18 @@ public abstract class Instance implements BlockGetter, BlockSetter, Tickable, Ta
*/ */
public abstract void unloadChunk(@NotNull Chunk chunk); public abstract void unloadChunk(@NotNull Chunk chunk);
/**
* Unloads the chunk at the given position.
*
* @param chunkX the chunk X
* @param chunkZ the chunk Z
*/
public void unloadChunk(int chunkX, int chunkZ) {
final Chunk chunk = getChunk(chunkX, chunkZ);
Check.notNull(chunk, "The chunk at {0}:{1} is already unloaded", chunkX, chunkZ);
unloadChunk(chunk);
}
/** /**
* Gets the loaded {@link Chunk} at a position. * Gets the loaded {@link Chunk} at a position.
* <p> * <p>
@ -485,42 +519,6 @@ public abstract class Instance implements BlockGetter, BlockSetter, Tickable, Ta
return Collections.unmodifiableSet(entities); return Collections.unmodifiableSet(entities);
} }
/**
* Loads the chunk at the given {@link Point} with a callback.
*
* @param point the chunk position
*/
public @NotNull CompletableFuture<@NotNull Chunk> loadChunk(@NotNull Point point) {
final int chunkX = ChunkUtils.getChunkCoordinate(point.x());
final int chunkZ = ChunkUtils.getChunkCoordinate(point.z());
return loadChunk(chunkX, chunkZ);
}
/**
* Loads a {@link Chunk} (if {@link #hasEnabledAutoChunkLoad()} returns true)
* at the given {@link Point} with a callback.
*
* @param point the chunk position
* @return a {@link CompletableFuture} completed once the chunk has been processed, null if not loaded
*/
public @NotNull CompletableFuture<@Nullable Chunk> loadOptionalChunk(@NotNull Point point) {
final int chunkX = ChunkUtils.getChunkCoordinate(point.x());
final int chunkZ = ChunkUtils.getChunkCoordinate(point.z());
return loadOptionalChunk(chunkX, chunkZ);
}
/**
* Unloads the chunk at the given position.
*
* @param chunkX the chunk X
* @param chunkZ the chunk Z
*/
public void unloadChunk(int chunkX, int chunkZ) {
final Chunk chunk = getChunk(chunkX, chunkZ);
Check.notNull(chunk, "The chunk at " + chunkX + ":" + chunkZ + " is already unloaded");
unloadChunk(chunk);
}
@Override @Override
public @NotNull Block getBlock(int x, int y, int z) { public @NotNull Block getBlock(int x, int y, int z) {
final Chunk chunk = getChunkAt(x, z); final Chunk chunk = getChunkAt(x, z);
@ -575,17 +573,6 @@ public abstract class Instance implements BlockGetter, BlockSetter, Tickable, Ta
return getChunkAt(point.x(), point.z()); return getChunkAt(point.x(), point.z());
} }
/**
* Checks if the {@link Chunk} at the position is loaded.
*
* @param chunkX the chunk X
* @param chunkZ the chunk Z
* @return true if the chunk is loaded, false otherwise
*/
public boolean isChunkLoaded(int chunkX, int chunkZ) {
return getChunk(chunkX, chunkZ) != null;
}
/** /**
* Gets the instance unique id. * Gets the instance unique id.
* *