Upstream
/
HolographicDisplays
mirror of https://github.com/filoghost/HolographicDisplays.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simplify chunk load state in HologramPosition

This commit is contained in:
filoghost 2021-09-15 11:34:02 +02:00
parent 33c2693172
commit 3935af2bf9
2 changed files with 32 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/HologramPosition.java
View File

@ -6,7 +6,6 @@
package me.filoghost.holographicdisplays.plugin.hologram.base;
import me.filoghost.fcommons.Preconditions;
import me.filoghost.holographicdisplays.plugin.util.CachedBoolean;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Location;
@ -19,7 +18,7 @@ class HologramPosition {
private @NotNull ImmutablePosition position;
private @Nullable World world;
private int chunkX, chunkZ;
private final CachedBoolean chunkLoaded;
private @NotNull ChunkLoadState chunkLoadState;
HologramPosition(@NotNull ImmutablePosition position) {
Preconditions.notNull(position, "position");
@ -27,7 +26,7 @@ class HologramPosition {
this.world = Bukkit.getWorld(position.getWorldName());
this.chunkX = getChunkCoordinate(position.getX());
this.chunkZ = getChunkCoordinate(position.getZ());
this.chunkLoaded = new CachedBoolean(() -> world != null && world.isChunkLoaded(chunkX, chunkZ));
this.chunkLoadState = ChunkLoadState.UNKNOWN;
}
final void set(String worldName, double x, double y, double z) {
@ -43,7 +42,7 @@ class HologramPosition {
}
this.chunkX = chunkX;
this.chunkZ = chunkZ;
this.chunkLoaded.invalidate();
this.chunkLoadState = ChunkLoadState.UNKNOWN;
}
}
@ -54,31 +53,44 @@ class HologramPosition {
void onWorldLoad(World world) {
if (position.isInWorld(world)) {
this.world = world;
chunkLoaded.invalidate();
chunkLoadState = ChunkLoadState.UNKNOWN;
}
}
void onWorldUnload(World world) {
if (position.isInWorld(world)) {
this.world = null;
chunkLoaded.set(false);
chunkLoadState = ChunkLoadState.NOT_LOADED;
}
}
void onChunkLoad(Chunk chunk) {
if (world != null && world == chunk.getWorld() && chunkX == chunk.getX() && chunkZ == chunk.getZ()) {
chunkLoaded.set(true);
if (isInChunk(chunk)) {
chunkLoadState = ChunkLoadState.LOADED;
}
}
void onChunkUnload(Chunk chunk) {
if (world != null && world == chunk.getWorld() && chunkX == chunk.getX() && chunkZ == chunk.getZ()) {
chunkLoaded.set(false);
if (isInChunk(chunk)) {
chunkLoadState = ChunkLoadState.NOT_LOADED;
}
}
private boolean isInChunk(Chunk chunk) {
return world != null && world == chunk.getWorld() && chunkX == chunk.getX() && chunkZ == chunk.getZ();
}
boolean isChunkLoaded() {
return chunkLoaded.get();
// Compute state if unknown
if (chunkLoadState == ChunkLoadState.UNKNOWN) {
if (world != null && world.isChunkLoaded(chunkX, chunkZ)) {
chunkLoadState = ChunkLoadState.LOADED;
} else {
chunkLoadState = ChunkLoadState.NOT_LOADED;
}
}
return chunkLoadState == ChunkLoadState.LOADED;
}
@Nullable World getWorldIfLoaded() {
@ -94,4 +106,13 @@ class HologramPosition {
return position.toString();
}
private enum ChunkLoadState {
LOADED,
NOT_LOADED,
UNKNOWN
}
}

38
plugin/src/main/java/me/filoghost/holographicdisplays/plugin/util/CachedBoolean.java
View File

@ -1,38 +0,0 @@
/*
* Copyright (C) filoghost and contributors
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
package me.filoghost.holographicdisplays.plugin.util;
import java.util.function.BooleanSupplier;
public class CachedBoolean {
private final BooleanSupplier valueGetter;
private boolean value;
private boolean valid;
public CachedBoolean(BooleanSupplier valueGetter) {
this.valueGetter = valueGetter;
}
public void set(boolean value) {
this.valid = true;
this.value = value;
}
public boolean get() {
if (!valid) {
value = valueGetter.getAsBoolean();
valid = true;
}
return value;
}
public void invalidate() {
valid = false;
}
}