Compare commits

..
35 Commits
Author SHA1 Message Date
Cubicake 1a73c2509a Fix the previous commit 2025-08-11 20:49:45 +09:30
Cubicake e3731f76f0 Debug mode logging 2025-08-11 20:49:14 +09:30
Cubicake bd1f6ad482 Don't spawn a new thread for each tile entity update 2025-08-11 20:36:26 +09:30
Cubicake 951e4f4ad9 Fix change delta being ignored 2025-08-11 20:28:22 +09:30
Cubicake 114746aeaf Resolves #11 2025-08-11 20:08:06 +09:30
Cubicake 9dc9652917 Use snapshotChunk 2025-08-11 18:03:29 +09:30
Cubicake b97f675159 Bump version 2025-08-11 18:03:08 +09:30
Cubicake f5e16fc75d Resolves #10
OMFG I hate myself
2025-08-11 18:02:48 +09:30
Cubicake c228cef24a Merge remote-tracking branch 'origin/main' 2025-08-09 16:19:36 +09:30
Cubicake 098aab5e31 Don't hardcode plugin name 2025-08-09 16:19:20 +09:30
Cubicake 31b500bc7b Fix bug in issue #9 2025-08-04 11:35:13 +09:30
Cubicake d5e3281cf2 new config layout, to replace config.yml at a later date 2025-08-04 11:33:47 +09:30
Cubicake 98dbefd576 For future packet handling 2025-08-04 11:33:17 +09:30
Cubicake 4dce9b3278 WIP improved debugging 2025-08-04 11:32:45 +09:30
Cubicake d5bf02b4ea Merge remote-tracking branch 'origin/main' 2025-07-27 18:52:36 +09:30
Cubicake ed98e2abeb Update README.md 2025-07-27 17:39:13 +09:30
Cubicake 9a07bd0119 v1.6.0 release 2025-07-27 17:21:42 +09:30
Cubicake 74aca26910 Update .gitignore 2025-07-27 16:32:49 +09:30
Cubicake 25f5652a12 Kinda crappy way to hopefully fix the missing snapshots while I work on a more permanant fix 2025-07-27 16:08:40 +09:30
Cubicake 7679f08d06 Use the new logger to format messages 2025-07-27 16:07:26 +09:30
Cubicake 7ad99917d1 Might use this later? 2025-07-27 16:06:44 +09:30
Cubicake ce56eb316e Might use this later? 2025-07-27 16:06:39 +09:30
Cubicake 74426d80af Mark as mojmapped 2025-07-27 16:06:13 +09:30
Cubicake fdb1f567ac Snapshot changes 2025-07-26 16:26:14 +09:30
Cubicake e823f7a2f7 Move string operations to their own methods 2025-07-26 16:25:15 +09:30
Cubicake 7c1f7fd2a6 Version bump 2025-07-25 20:35:25 +09:30
Cubicake c26e6a1623 Oops forgot to pass config to movement tracker 2025-07-25 20:35:16 +09:30
Cubicake 8155903342 More readable imports 2025-07-25 20:32:53 +09:30
Cubicake f2ade6b0b8 Merge remote-tracking branch 'origin/main' 2025-07-25 20:31:26 +09:30
Cubicake f486d1fc2e Stop intellij from complaining 2025-07-25 20:30:09 +09:30
Cubicake 50eeab8cfe Bump api version 2025-07-25 20:26:37 +09:30
Cubicake 4009fe6d02 Use built in bukkit chunk keys instead of making custom ones 2025-07-25 20:26:25 +09:30
Cubicake b7e6fa9c5f Stop using * imports, use plugin logger, use built in bukkit chunk keys instead of making custom ones, hopefully fix chunks not being snapshotted. 2025-07-25 20:25:44 +09:30
Cubicake dcc986c232 Stop using * imports 2025-07-23 13:47:52 +09:30
Cubicake 95cea9f875 Stop using * imports 2025-07-23 13:47:20 +09:30
14 changed files with 290 additions and 284 deletions

No files matched your search

+3 -1
View File
@@ -1,11 +1,13 @@
# User-specific stuff
.idea/
README.md
*.md
*.iml
*.ipr
*.iws
README.md
# IntelliJ
out/
+1 -1
View File
@@ -1,4 +1,4 @@
Latest version: v1.5.1
Latest version: v1.6.0
The latest version can currently only be found on Modrinth https://modrinth.com/plugin/raycasted-entity-occlusions/
+8 -2
View File
@@ -3,7 +3,7 @@ plugins {
}
group = 'games.cubi'
version = '1.6.0-dev-1'
version = '1.6.1'
repositories {
mavenCentral()
@@ -21,7 +21,7 @@ repositories {
}
dependencies {
compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
compileOnly("io.papermc.paper:paper-api:1.21.8-R0.1-SNAPSHOT")
compileOnly("com.github.retrooper:packetevents-spigot:2.8.0")
}
@@ -50,4 +50,10 @@ processResources {
filesMatching('plugin.yml') {
expand props
}
}
jar {
manifest {
attributes "paperweight-mappings-namespace": "mojang"
}
}
@@ -0,0 +1,60 @@
package games.cubi.raycastedEntityOcclusion;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage;
import org.bukkit.plugin.java.JavaPlugin;
import org.jetbrains.annotations.Range;
public class Logger {
private final static String PREFIX = "<hover:show_text:'Raycasted Entity Occlusions'><click:suggest_command:'/reo'><grey>[<gold>REO<grey>]</click></hover><reset> ";
private final static String PREFIX_WARNING = "<hover:show_text:'Raycasted Entity Occlusions'><click:suggest_command:'/reo'><grey>[<gold>REO<grey>]</click></hover> <yellow><hover:show_text:'<yellow>Something went wrong'>[Warning]</hover> ";
private final static String PREFIX_ERROR = "<hover:show_text:'Raycasted Entity Occlusions'><click:suggest_command:'/reo'><grey>[<gold>REO<grey>]</click></hover> <red><hover:show_text:'<red>Something went wrong'>[Error]</hover> ";
private static JavaPlugin plugin = null;
private enum Level {
INFO,
WARN,
ERROR
}
public static void info(String message) {
forwardLog(/*PREFIX+*/message, Level.INFO);
}
public static void warning(String message) {
forwardLog(/* PREFIX_WARNING + */ message, Level.WARN);
}
public static void error(String message) {
forwardLog(/* PREFIX_ERROR+ */ message, Level.ERROR);
}
public static void debug(String message, @Range(from = 1, to = 10) int level) {
int debugLevel = 2; // TODO: grab real debug level from config
if (debugLevel <= level) {
forwardLog(message, Level.INFO);
}
}
private static void forwardLog(String message, Level severity) {
if (plugin == null) {
plugin = JavaPlugin.getProvidingPlugin(Logger.class);
}
Component messageComponent = MiniMessage.miniMessage().deserialize(message);
switch (severity) {
case INFO:
plugin.getComponentLogger().info(messageComponent);
break;
case WARN:
plugin.getComponentLogger().warn(messageComponent);
break;
case ERROR:
plugin.getComponentLogger().error(messageComponent);
break;
default:
plugin.getComponentLogger().error("{} | Additionally, severity {} is not supported by the logger.", messageComponent, severity);
}
//Bukkit.getConsoleSender().sendRichMessage(message);
//Bukkit.broadcast(MiniMessage.miniMessage().deserialize(message), "raycastedentityocclusions.receivelogmessages");
}
}
@@ -16,13 +16,15 @@ public class PacketsListener implements PacketListener {
@Override
public void onPacketSend(PacketSendEvent event) {
if (event.getPacketType() == PacketType.Play.Server.PLAYER_INFO_REMOVE) {
if (packetProcessor == null) {
// Initialize the PacketProcessor if it hasn't been initialized yet since the initialization of the PacketsListener is on load, not on enable.
packetProcessor = plugin.getPacketProcessor();
}
initializePacketProcessor();
packetProcessor.processPlayerInfoRemovePacket(event);
}
}
private void initializePacketProcessor() {
if (packetProcessor == null) {
packetProcessor = plugin.getPacketProcessor();
}
}
@@ -1,28 +1,39 @@
package games.cubi.raycastedEntityOcclusion.Raycast;
import games.cubi.raycastedEntityOcclusion.Logger;
import games.cubi.raycastedEntityOcclusion.Snapshot.ChunkSnapshotManager;
import games.cubi.raycastedEntityOcclusion.ConfigManager;
import games.cubi.raycastedEntityOcclusion.RaycastedEntityOcclusion;
import games.cubi.raycastedEntityOcclusion.Snapshot.EntitySnapshotManager;
import io.papermc.paper.threadedregions.scheduler.AsyncScheduler;
import io.papermc.paper.threadedregions.scheduler.ScheduledTask;
import org.bukkit.*;
import org.bukkit.Location;
import org.bukkit.Particle;
import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.Color;
import org.bukkit.Chunk;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.BlockState;
import org.bukkit.block.TileState;
import org.bukkit.block.data.BlockData;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitTask;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Consumer;
import java.util.Set;
import java.util.List;
import java.util.concurrent.ConcurrentLinkedQueue;
public class Engine {
public static ConcurrentHashMap<Location, Set<Player>> canSeeTileEntity = new ConcurrentHashMap<>();
public static Set<Chunk> syncRecheck = ConcurrentHashMap.newKeySet();
private final static BlockData STONE = Material.STONE.createBlockData();
private final static BlockData DEEPSLATE = Material.DEEPSLATE.createBlockData();
private static class RayJob {
final Player player;
@@ -49,30 +60,33 @@ public class Engine {
visible = v;
}
}
private static class PlayerInfo {
private static class TileResult {
final Player player;
final Location location;
final Location predLoc;
final Location loc;
final boolean visible;
PlayerInfo(Player p, Location loc, Location pred) {
TileResult(Player p, Location location, boolean v) {
player = p;
location = loc;
predLoc = pred;
loc = location;
visible = v;
}
}
private static Consumer<ScheduledTask> raycastEntitiesAroundPlayer(Player player, Location eye, Location predEye){
return task -> { /* This is needed for it to return, idk why*/ };
}
Map<UUID, RayResult> results = new ConcurrentHashMap<>();
public static void runEngine(ConfigManager cfg, ChunkSnapshotManager snapMgr, MovementTracker tracker, EntitySnapshotManager entitySnapshotManager, RaycastedEntityOcclusion plugin) {
public static void runEngine(ConfigManager cfg, ChunkSnapshotManager snapMgr, MovementTracker tracker, RaycastedEntityOcclusion plugin) {
// ----- PHASE 1: SYNC GATHER -----
List<PlayerInfo> info = new ArrayList<>();
// TODO: Store players in EntitySnapshotManager and use that to avoid iterating through all players every tick
AsyncScheduler asyncScheduler = plugin.getServer().getAsyncScheduler();
if (!syncRecheck.isEmpty()) {
Logger.warning(syncRecheck.size() + " chunks failed to snapshot asynchronously, rechecking them now.");
for (Chunk c : syncRecheck) {
if (c.isLoaded()) {
plugin.getChunkSnapshotManager().snapshotChunk(c);
syncRecheck.remove(c);
Logger.info("Successfully rechecked chunk " + c.getX() + ", " + c.getZ() + " in world " + c.getWorld().getName());
}
}
}
List<RayJob> jobs = new ArrayList<>();
for (Player p : Bukkit.getOnlinePlayers()) {
if (p.hasPermission("raycastedentityocclusions.bypass")) continue;
Location eye = p.getEyeLocation().clone();
@@ -81,20 +95,12 @@ public class Engine {
// getPredictedLocation returns null if insufficient data or too slow
predEye = tracker.getPredictedLocation(p);
}
asyncScheduler.runNow(plugin, raycastEntitiesAroundPlayer(p, eye, predEye));
}
// ----- PHASE 2: ASYNC RAYCASTS -----
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
List<RayResult> results = new ArrayList<>();
for (Entity e : entitySnapshotManager.getBukkitEntitiesNear(eye, cfg.searchRadius, cfg.searchRadius, cfg.searchRadius)) {
for (Entity e : p.getNearbyEntities(cfg.searchRadius, cfg.searchRadius, cfg.searchRadius)) {
if (e == p) continue;
// Cull-players logic
if (e instanceof Player pl && (!cfg.cullPlayers || (cfg.onlyCullSneakingPlayers && !pl.isSneaking()))) {
//TODO: Add to result that player should be shown
p.showEntity(plugin, e);
continue;
}
@@ -104,22 +110,16 @@ public class Engine {
p.showEntity(plugin, e);
} else if (dist > cfg.raycastRadius) {
p.hideEntity(plugin, e);
} else if (p.canSee(e) && plugin.tick % cfg.recheckInterval != 0) {
// player can see entity, no need to raycast
} else {
} else if (!p.canSee(e) || plugin.tick % cfg.recheckInterval == 0) {
// schedule for async raycast (with or without predEye)
jobs.add(new RayJob(p, e, eye, predEye, target));
}
}
}
// ----- PHASE 2: ASYNC RAYCASTS -----
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
List<RayResult> results = new ArrayList<>(jobs.size());
for (RayJob job : jobs) {
// if the player is not in the same world as the target, skip
if (!job.player.getWorld().equals(job.target.getWorld())) {
@@ -158,14 +158,17 @@ public class Engine {
}
private static ConcurrentLinkedQueue<TileResult> results = new ConcurrentLinkedQueue<>();
public static void runTileEngine(ConfigManager cfg, ChunkSnapshotManager snapMgr, MovementTracker tracker, RaycastedEntityOcclusion plugin) {
if (cfg.checkTileEntities) {
for (Player p : Bukkit.getOnlinePlayers()) {
if (p.hasPermission("raycastedentityocclusions.bypass")) continue;
String world = p.getWorld().getName();
World world = p.getWorld();
//get player's chunk location
int chunkX = p.getLocation().getBlockX() >> 4;
int chunkZ = p.getLocation().getBlockZ() >> 4;
//async run with vars passed in
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
int chunksRadius = (cfg.searchRadius + 15) / 16;
@@ -186,26 +189,25 @@ public class Engine {
double distSquared = loc.distanceSquared(p.getLocation());
if (distSquared > cfg.searchRadius * cfg.searchRadius) {
hideTileEntity(p, loc);
results.add(new TileResult(p, loc,false));
continue;
}
if (distSquared < cfg.alwaysShowRadius * cfg.alwaysShowRadius) {
showTileEntity(p, loc);
results.add(new TileResult(p, loc,true));
continue;
}
boolean result = RaycastUtil.raycast(p.getEyeLocation(), loc, cfg.maxOccludingCount, cfg.debugMode, snapMgr);
if (cfg.engineMode == 2) {
boolean visible = RaycastUtil.raycast(p.getEyeLocation(), loc, cfg.maxOccludingCount, cfg.debugMode, snapMgr);
if (cfg.engineMode == 2 && !visible) {
Location predEye = tracker.getPredictedLocation(p);
if (predEye != null) {
boolean result2 = RaycastUtil.raycast(predEye, loc, cfg.maxOccludingCount, cfg.debugMode, snapMgr);
if (result2) {
result = true;
visible = true;
}
}
}
syncToggleTileEntity(p, loc, result, plugin);
if (result) {
if (visible) {
canSeeTileEntity.computeIfAbsent(loc, k -> ConcurrentHashMap.newKeySet()).add(p);
} else {
Set<Player> seenPlayers = canSeeTileEntity.get(loc);
@@ -216,36 +218,46 @@ public class Engine {
}
}
}
results.add(new TileResult(p, loc, visible));
}
});
}
}
}
for (TileResult r : results) {
Player p = r.player;
Location loc = r.loc;
boolean visible = r.visible;
public static void hideTileEntity(Player p, Location location) {
if (p.hasPermission("raycastedentityocclusions.bypass")) return;
BlockData fake;
if (location.getBlockY() < 0) {
fake = Material.DEEPSLATE.createBlockData();
}
else {
fake = Material.STONE.createBlockData();
}
p.sendBlockChange(location, fake);
}
public static void showTileEntity(Player p, Location location) {
Block block = location.getBlock();
BlockData data = block.getBlockData();
p.sendBlockChange(location, data);
}
public static void syncToggleTileEntity(Player p, Location loc, boolean bool, RaycastedEntityOcclusion plugin) {
Bukkit.getScheduler().runTask(plugin, () -> {
if (bool) {
showTileEntity(p, loc);
} else {
hideTileEntity(p, loc);
syncToggleTileEntity(p, loc, visible, plugin);
results.remove(r);
}
}
}
public static void hideTileEntity(Player p, Location location, RaycastedEntityOcclusion plugin) {
Bukkit.getScheduler().runTask(plugin, () -> {
if (p.hasPermission("raycastedentityocclusions.bypass")) return;
if (location.getBlockY() < 0) p.sendBlockChange(location, DEEPSLATE);
else p.sendBlockChange(location, STONE);
});
}
public static void showTileEntity(Player p, Location location, RaycastedEntityOcclusion plugin) {
Bukkit.getScheduler().runTask(plugin, () -> {
Block block = location.getBlock();
BlockState data = block.getState();
if (data instanceof TileState tileData) {
p.sendBlockChange(location, block.getBlockData());
p.sendBlockUpdate(location, tileData);
}
else throw new RuntimeException("Attempting to show a block which isn't a tile entity");
});
}
public static void syncToggleTileEntity(Player p, Location loc, boolean show, RaycastedEntityOcclusion plugin) {
if (show) {
showTileEntity(p, loc, plugin);
} else {
hideTileEntity(p, loc, plugin);
}
}
}
@@ -36,7 +36,6 @@ public class MovementTracker {
* Predicts location 5 ticks ahead based on last 5 ticks. Returns null if insufficient or too slow.
*/
public Location getPredictedLocation(Player p) {
//TODO: Make the predicted location incorporate ping
Deque<Location> dq = history.get(p);
if (dq == null || dq.size() < 5) return null;
Location old = dq.peekFirst();
@@ -7,10 +7,13 @@ import org.bukkit.Particle;
import org.bukkit.util.Vector;
public class RaycastUtil {
private static final Particle.DustOptions DUST_RED = new Particle.DustOptions(org.bukkit.Color.RED, 1f);
private static final Particle.DustOptions DUST_GREEN = new Particle.DustOptions(org.bukkit.Color.GREEN, 1f);;
public static boolean raycast(Location start, Location end, int maxOccluding, boolean debug, ChunkSnapshotManager snap) {
Particle.DustOptions dustRed = null;
Particle.DustOptions dustGreen = null;
if (debug) {
dustRed = new Particle.DustOptions(org.bukkit.Color.RED, 1f);
dustGreen = new Particle.DustOptions(org.bukkit.Color.GREEN, 1f);
}
double total = start.distance(end);
double traveled = 0;
Location curr = start.clone();
@@ -25,12 +28,12 @@ public class RaycastUtil {
if (mat.isOccluding()) {
maxOccluding--;
if (debug) {
start.getWorld().spawnParticle(Particle.DUST, curr, 1, DUST_RED);
start.getWorld().spawnParticle(Particle.DUST, curr, 1, dustRed);
}
if (maxOccluding < 1) return false;
}
else if (debug) {
start.getWorld().spawnParticle(Particle.DUST, curr, 1, DUST_GREEN);
start.getWorld().spawnParticle(Particle.DUST, curr, 1, dustGreen);
}
}
return true;
@@ -7,7 +7,6 @@ import games.cubi.raycastedEntityOcclusion.Packets.Registrar;
import games.cubi.raycastedEntityOcclusion.Raycast.Engine;
import games.cubi.raycastedEntityOcclusion.Raycast.MovementTracker;
import games.cubi.raycastedEntityOcclusion.Snapshot.ChunkSnapshotManager;
import games.cubi.raycastedEntityOcclusion.Snapshot.EntitySnapshotManager;
import io.papermc.paper.command.brigadier.CommandSourceStack;
import io.papermc.paper.command.brigadier.Commands;
import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents;
@@ -21,12 +20,10 @@ import games.cubi.raycastedEntityOcclusion.bStats.MetricsCollector;
public class RaycastedEntityOcclusion extends JavaPlugin implements CommandExecutor {
private ConfigManager cfg;
private ChunkSnapshotManager snapMgr;
private EntitySnapshotManager entitySnapshotManager;
private MovementTracker tracker;
private CommandsManager commands;
private boolean packetEventsPresent = false;
private PacketProcessor packetProcessor = null;
private UpdateChecker updateChecker;
public int tick = 0;
@@ -49,8 +46,7 @@ public class RaycastedEntityOcclusion extends JavaPlugin implements CommandExecu
snapMgr = new ChunkSnapshotManager(this);
tracker = new MovementTracker(this, cfg);
commands = new CommandsManager(this, cfg);
updateChecker = new UpdateChecker(this);
entitySnapshotManager = new EntitySnapshotManager();
new UpdateChecker(this);
getServer().getPluginManager().registerEvents(new EventListener(this, snapMgr, cfg), this);
//Brigadier API
LiteralCommandNode<CommandSourceStack> buildCommand = commands.registerCommand();
@@ -76,7 +72,7 @@ public class RaycastedEntityOcclusion extends JavaPlugin implements CommandExecu
@Override
public void run() {
tick++;
Engine.runEngine(cfg, snapMgr, tracker, entitySnapshotManager, RaycastedEntityOcclusion.this);
Engine.runEngine(cfg, snapMgr, tracker, RaycastedEntityOcclusion.this);
Engine.runTileEngine(cfg, snapMgr, tracker, RaycastedEntityOcclusion.this);
}
}.runTaskTimer(this, 0L, 1L);
@@ -87,7 +83,7 @@ public class RaycastedEntityOcclusion extends JavaPlugin implements CommandExecu
if (packetEventsPresent && Bukkit.getPluginManager().isPluginEnabled("packetevents")) {
cfg.setPacketEventsPresent(true);
packetProcessor = new PacketProcessor(RaycastedEntityOcclusion.this);
getLogger().info("PacketEvents is enabled, enabling packet-based tablist modification.");
Logger.info("PacketEvents is enabled, enabling packet-based tablist modification.");
}
}
}.runTaskLater(this, 1L);
@@ -1,19 +1,29 @@
package games.cubi.raycastedEntityOcclusion.Snapshot;
import games.cubi.raycastedEntityOcclusion.ConfigManager;
import games.cubi.raycastedEntityOcclusion.Logger;
import games.cubi.raycastedEntityOcclusion.Raycast.Engine;
import games.cubi.raycastedEntityOcclusion.RaycastedEntityOcclusion;
import org.bukkit.*;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Chunk;
import org.bukkit.ChunkSnapshot;
import org.bukkit.block.BlockState;
import org.bukkit.block.TileState;
import org.bukkit.scheduler.BukkitRunnable;
import java.util.*;
import java.util.Set;
import java.util.Map;
import java.util.Collections;
import java.util.concurrent.ConcurrentHashMap;
public class ChunkSnapshotManager {
public static class Data {
public final ChunkSnapshot snapshot;
public final Map<Location, Material> delta = new ConcurrentHashMap<>();
public final ConcurrentHashMap<Location, Material> delta = new ConcurrentHashMap<>();
public final Set<Location> tileEntities = ConcurrentHashMap.newKeySet();
public long lastRefresh;
public int minHeight;
@@ -25,15 +35,17 @@ public class ChunkSnapshotManager {
}
}
private final Map<String, Data> dataMap = new ConcurrentHashMap<>();
private static final ConcurrentHashMap<String, Data> dataMap = new ConcurrentHashMap<>();
private final ConfigManager cfg;
private final RaycastedEntityOcclusion plugin;
public ChunkSnapshotManager(RaycastedEntityOcclusion plugin) {
cfg = plugin.getConfigManager();
this.plugin = plugin;
//get loaded chunks and add them to dataMap
for (World w : plugin.getServer().getWorlds()) {
for (Chunk c : w.getLoadedChunks()) {
dataMap.put(key(c), takeSnapshot(c, System.currentTimeMillis()));
snapshotChunk(c);
}
}
@@ -47,49 +59,55 @@ public class ChunkSnapshotManager {
if (now - e.getValue().lastRefresh >= cfg.snapshotRefreshInterval * 1000L && chunksRefreshed < chunksToRefreshMaximum) {
chunksRefreshed++;
String key = e.getKey();
String[] parts = key.split(":");
World w = plugin.getServer().getWorld(parts[0]);
if (w == null) {
plugin.getLogger().warning("ChunkSnapshotManager: World " + parts[0] + " not found. Please report this on our discord (discord.cubi.games)'");
continue;
}
Chunk c = w.getChunkAt(
Integer.parseInt(parts[1]),
Integer.parseInt(parts[2])
);
e.setValue(takeSnapshot(c, now));
snapshotChunk(key);
}
}
if (cfg.debugMode) {
plugin.getLogger().info("ChunkSnapshotManager: Refreshed " + chunksRefreshed + " chunks out of " + chunksToRefreshMaximum + " maximum.");
Logger.info("ChunkSnapshotManager: Refreshed " + chunksRefreshed + " chunks out of " + chunksToRefreshMaximum + " maximum.");
}
}
}.runTaskTimerAsynchronously(plugin, cfg.snapshotRefreshInterval * 2L, cfg.snapshotRefreshInterval * 2L /* This runs 10 times per refreshInterval, spreading out the refreshes */);
}
public void onChunkLoad(Chunk c) {
dataMap.put(key(c), takeSnapshot(c, System.currentTimeMillis()));
snapshotChunk(c);
}
public void onChunkUnload(Chunk c) {
removeChunkSnapshot(c);
}
public void snapshotChunk(Chunk c) {
if (cfg.debugMode) {
//Logger.info("ChunkSnapshotManager: Taking snapshot of chunk " + c.getWorld().getName() + ":" + c.getX() + ":" + c.getZ());
}
dataMap.put(key(c), takeSnapshot(c, System.currentTimeMillis()));
}
public void snapshotChunk(String key) {
snapshotChunk(getKeyChunk(key));
}
public void removeChunkSnapshot(Chunk c) {
if (cfg.debugMode) {
Logger.info("ChunkSnapshotManager: Removing snapshot of chunk " + c.getWorld().getName() + ":" + c.getX() + ":" + c.getZ());
}
dataMap.remove(key(c));
}
// Used by EventListener to update the delta map when a block is placed or broken
public void onBlockChange(Location loc, Material m) {
if (cfg.debugMode) {
Bukkit.getLogger().info("ChunkSnapshotManager: Block change at " + loc + " to " + m);
Logger.info("ChunkSnapshotManager: Block change at " + loc + " to " + m);
}
Data d = dataMap.get(key(loc.getChunk()));
if (d != null) {
d.delta.put(loc, m);
d.delta.put(blockLoc(loc), m);
if (cfg.checkTileEntities) {
// Check if the block is a tile entity
BlockState data = loc.getBlock().getState();
loc = loc.clone().add(0.5, 0.5, 0.5);
if (data instanceof TileState) {
if (cfg.debugMode){
Bukkit.getLogger().info("ChunkSnapshotManager: Tile entity at " + loc);
Logger.info("ChunkSnapshotManager: Tile entity at " + loc);
}
d.tileEntities.add(loc);
} else {
@@ -97,6 +115,7 @@ public class ChunkSnapshotManager {
}
}
}
else {Logger.error("Data map value empty, ignoring block update!");}
}
private Data takeSnapshot(Chunk c, long now) {
@@ -124,24 +143,44 @@ public class ChunkSnapshotManager {
return data;
}
private String key(Chunk c) {
public String key(Chunk c) {
return c.getWorld().getName() + ":" + c.getX() + ":" + c.getZ();
}
public String key(World world, int x, int z) {
return world.getName() + ":" + x + ":" + z;
}
public int getKeyX(String key) {
String[] parts = key.split(":");
return Integer.parseInt(parts[1]);
}
public int getKeyZ(String key) {
String[] parts = key.split(":");
return Integer.parseInt(parts[2]);
}
public World getKeyWorld(String key) {
String[] parts = key.split(":");
return Bukkit.getWorld(parts[0]);
}
public Chunk getKeyChunk(String key) {
return getKeyWorld(key).getChunkAt(getKeyX(key), getKeyZ(key));
}
public Material getMaterialAt(Location loc) {
Data d = dataMap.get(key(loc.getChunk()));
Chunk chunk = loc.getChunk();
Data d = dataMap.get(key(chunk));
if (d == null) {
Chunk c = loc.getChunk();
//dataMap.put(key(c), takeSnapshot(c, System.currentTimeMillis())); infinite loop
System.err.println("ChunkSnapshotManager: No snapshot for " + c+ " Please report this on our discord (discord.cubi.games)'");
Logger.error("ChunkSnapshotManager: No snapshot for " + c+ " If this error persists, please report this on our discord (discord.cubi.games)");
Engine.syncRecheck.add(chunk);
return loc.getBlock().getType();
}
double yLevel = loc.getY();
if (yLevel < d.minHeight || yLevel > d.maxHeight) {
return null;
}
Material dm = d.delta.get(loc);
Material dm = d.delta.get(blockLoc(loc));
if (dm != null) {
if (cfg.debugMode) Logger.info("Using delta");
return dm;
}
int x = loc.getBlockX() & 0xF;
@@ -152,8 +191,8 @@ public class ChunkSnapshotManager {
}
//get TileEntity Locations in chunk
public Set<Location> getTileEntitiesInChunk(String worldName, int x, int z) {
Data d = dataMap.get(worldName + ":" + x + ":" + z);
public Set<Location> getTileEntitiesInChunk(World world, int x, int z) {
Data d = dataMap.get(key(world, x, z));
if (d == null) {
return Collections.emptySet();
}
@@ -165,4 +204,11 @@ public class ChunkSnapshotManager {
//created to use in a debug command maybe
}
public static Location blockLoc(Location fullLoc) {
Location blockLoc = fullLoc.toBlockLocation();
blockLoc.setYaw(0);
blockLoc.setPitch(0);
return blockLoc;
}
}
@@ -1,148 +0,0 @@
package games.cubi.raycastedEntityOcclusion.Snapshot;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import javax.annotation.Nullable;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
public class EntitySnapshotManager {
public static class EntityData {
//Entity data for a single entity in a world.
private volatile Location location;
/** Player UUID → can-see flag (true/false). Absence = NOT_SET. */
private final Map<UUID, Boolean> visibility = new ConcurrentHashMap<>();
public EntityData(Location initial) {
this.location = initial.clone();
}
/* ---- location ---- */
public Location getLocation() { return location.clone(); }
public void setLocation(Location loc) { this.location = loc.clone(); }
/* ---- visibility ---- */
public void setVisibleFor(UUID playerId, boolean canSee) {
visibility.put(playerId, canSee);
}
public void clearVisibility(UUID playerId) { visibility.remove(playerId); }
public Boolean getVisibility(UUID playerId) {
return visibility.get(playerId); // may be null
}
}
// Cache: world-name → (entity-UUID → data)
private final Map<String, Map<UUID, EntityData>> cache = new ConcurrentHashMap<>();
public void addEntity(Entity entity) {
Objects.requireNonNull(entity, "EntitySnapshotManager: Cannot add null entity");
cache.computeIfAbsent(entity.getWorld().getName(),
w -> new ConcurrentHashMap<>())
.putIfAbsent(entity.getUniqueId(),
new EntityData(entity.getLocation()));
}
public void removeEntity(Entity entity) {
Map<UUID, EntityData> entitiesInWorld = cache.get(entity.getWorld().getName());
if (entitiesInWorld != null) {
entitiesInWorld.remove(entity.getUniqueId());
if (entitiesInWorld.isEmpty()) cache.remove(entity.getWorld().getName());
}
}
/** Updates (or inserts) the latest location for the entity. */
public void updateLocation(Entity entity) {
cache.computeIfAbsent(entity.getWorld().getName(),
w -> new ConcurrentHashMap<>())
.compute(entity.getUniqueId(), (id, data) -> {
if (data == null) return new EntityData(entity.getLocation());
data.setLocation(entity.getLocation());
return data;
});
}
// put anywhere inside EntitySnapshotManager
public @Nullable Location getLocation(Entity entity) {
Map<UUID, EntityData> entitiesInWorld = cache.get(entity.getWorld().getName());
if (entitiesInWorld == null) return null;
EntityData data = entitiesInWorld.get(entity.getUniqueId());
return (data == null) ? null : data.getLocation();
}
/* ---- visibility helpers ---- */
public void setVisibility(Entity entity, Player player, boolean canSee) {
Map<UUID, EntityData> entitiesInWorld = cache.get(entity.getWorld().getName());
if (entitiesInWorld != null) {
EntityData d = entitiesInWorld.get(entity.getUniqueId());
if (d != null) d.setVisibleFor(player.getUniqueId(), canSee);
}
}
public void clearVisibility(Entity entity, Player player) {
Map<UUID, EntityData> entitiesInWorld = cache.get(entity.getWorld().getName());
if (entitiesInWorld != null) {
EntityData d = entitiesInWorld.get(entity.getUniqueId());
if (d != null) d.clearVisibility(player.getUniqueId());
}
}
public Boolean getVisibility(Entity entity, Player player) {
Map<UUID, EntityData> entitiesInWorld = cache.get(entity.getWorld().getName());
if (entitiesInWorld == null) return null;
EntityData d = entitiesInWorld.get(entity.getUniqueId());
return (d == null) ? null : d.getVisibility(player.getUniqueId());
}
/* ---- miscellaneous ---- */
public Collection<EntityData> getEntitiesInWorld(World world) {
Map<UUID, EntityData> entitiesInWorld = cache.get(world.getName());
return (entitiesInWorld == null) ? Collections.emptyList() : entitiesInWorld.values();
}
public List<Entity> getBukkitEntitiesNear(Location origin, int radiusX, int radiusY, int radiusZ) {
World world = origin.getWorld();
Map<UUID, EntityData> entitiesInWorld = cache.get(world.getName());
if (entitiesInWorld == null || entitiesInWorld.isEmpty()) {
return Collections.emptyList();
}
double ox = origin.getX(), oy = origin.getY(), oz = origin.getZ();
double minX = ox - radiusX, maxX = ox + radiusX;
double minY = oy - radiusY, maxY = oy + radiusY;
double minZ = oz - radiusZ, maxZ = oz + radiusZ;
List<Entity> result = new ArrayList<>();
for (Map.Entry<UUID, EntityData> entry : entitiesInWorld.entrySet()) {
EntityData data = entry.getValue();
Location loc = data.getLocation();
double x = loc.getX(), y = loc.getY(), z = loc.getZ();
if (x < minX || x > maxX || y < minY || y > maxY || z < minZ || z > maxZ) {
Entity live = world.getEntity(entry.getKey());
if (live != null) {
if (!live.isDead()) {
result.add(live);
}
else removeEntity(live);
}
}
}
return result;
}
public int size() {
return cache.values().stream().mapToInt(Map::size).sum();
}
}
@@ -4,9 +4,9 @@ package games.cubi.raycastedEntityOcclusion;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import net.kyori.adventure.audience.Audience;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@@ -15,7 +15,6 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URL;
import java.util.concurrent.CompletableFuture;
import java.util.function.Supplier;
public class UpdateChecker {
@@ -23,7 +22,6 @@ public class UpdateChecker {
public UpdateChecker(RaycastedEntityOcclusion plugin) {
this.plugin = plugin;
plugin.getLogger().info("Checking for updates...");
checkForUpdates(plugin, Bukkit.getConsoleSender());
}
@@ -33,7 +31,7 @@ public class UpdateChecker {
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
final String url = "https://api.modrinth.com/v2/project/raycasted-entity-occlusions/version?featured=true";
final String url = "https://api.modrinth.com/v2/project/bCjNZu0C/version?featured=true";
try (final InputStreamReader reader = new InputStreamReader(new URL(url).openConnection().getInputStream())) {
final JsonArray array = new JsonArray();
array.add(new BufferedReader(reader).readLine());
@@ -57,12 +55,9 @@ public class UpdateChecker {
}
public static void checkForUpdates(RaycastedEntityOcclusion plugin, CommandSender audience) {
//plugin.getLogger().info("Fetching latest version from Modrinth...");
fetchFeaturedVersion(plugin).thenAccept(version -> {
//plugin.getLogger().info("Latest version fetched: " + version);
// This runs synchronously when the version is fetched
Bukkit.getScheduler().runTask(plugin, () -> {
//plugin.getLogger().info("Checking if current version matches the latest version...");
if (plugin.getDescription().getVersion().equals(version)) {
audience.sendRichMessage("<green>You are using the latest version of Raycasted Entity Occlusions.");
} else {
@@ -72,7 +67,7 @@ public class UpdateChecker {
}).exceptionally(ex -> {
// Handle error (e.g., log the exception)
Bukkit.getScheduler().runTask(plugin, () -> {
plugin.getLogger().warning("Failed to fetch version: " + ex.getMessage());
Logger.warning("Failed to fetch version: " + ex.getMessage());
});
return null;
});
+30
View File
@@ -0,0 +1,30 @@
config-version: 1.0 # Do not change this value, it is used internally by the plugin to determine if the config is up to date.
checks:
entities:
enabled: true
max-occluding-count: 3
raycast-radius: 48
always-show-radius: 16 # radius to always show entities
recheck-interval: 50 # ticks between forced rechecks for visible entities
engine-mode: 1 # 1 = straight-line; 2 = predictive and straight-line
tile-entities:
enabled: true
max-occluding-count: 3
raycast-radius: 48
always-show-radius: 16
recheck-interval: 0 # seconds between forced rechecks for visible tile entities. If set to 0, they will never be rechecked.
engine-mode: 1 # 1 = straight-line; 2 = predictive and straight-line
players:
enabled: false
only-cull-sneaking: false
max-occluding-count: 3
raycast-radius: 48
always-show-radius: 16
recheck-interval: 50 # ticks between forced rechecks for visible players
engine-mode: 1 # 1 = straight-line; 2 = predictive and straight-line
snapshots:
chunk-refresh-interval: 60 # seconds between chunk snapshot refresh, won't change without restart
debug:
log-level: 1 # Scale from 0-10, where larger numbers mean more verbose logging and 0 disables logging
particles: false # enable debug particles
+3
View File
@@ -16,5 +16,8 @@ permissions:
raycastedentityocclusions.updatecheck:
description: Permission to check for plugin updates
default: op
raycastedentityocclusions.receivelogmessages:
description: Permission to receive log messages which are sent to the console
default: false
softdepend:
- packetevents