Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Improve RayVisualizerCommand

Browse Source
This commit is contained in:
YoyoNow
2025-09-29 10:48:24 +02:00
parent 394e043db3
commit bfe9c7559e
1 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/rayvisualizer/RayVisualizerCommand.java
+29 -20
View File
@@ -30,6 +30,7 @@ import de.steamwar.entity.REntityServer;
import de.steamwar.linkage.Linked; import de.steamwar.linkage.Linked;
import de.steamwar.linkage.MinVersion; import de.steamwar.linkage.MinVersion;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.block.data.BlockData;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.TNTPrimed; import org.bukkit.entity.TNTPrimed;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@@ -38,15 +39,15 @@ import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.util.RayTraceResult; import org.bukkit.util.RayTraceResult;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Linked @Linked
@MinVersion(20) @MinVersion(20)
public class RayVisualizerCommand extends SWCommand implements Listener { public class RayVisualizerCommand extends SWCommand implements Listener {
private BlockData VISIBLE = Material.LIME_CONCRETE.createBlockData();
private BlockData BLOCKED = Material.RED_CONCRETE.createBlockData();
private class CRayData { private class CRayData {
private CRay[] rays = new CRay[27 * 400]; private CRay[] rays = new CRay[27 * 400];
private boolean[] used = new boolean[27 * 400]; private boolean[] used = new boolean[27 * 400];
@@ -108,28 +109,23 @@ public class RayVisualizerCommand extends SWCommand implements Listener {
Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> { Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
if (server.getPlayers().isEmpty()) return; if (server.getPlayers().isEmpty()) return;
Map<Integer, List<TNTPrimed>> primedList = WORLD.getEntitiesByClass(TNTPrimed.class) List<TNTPrimed> primedList = WORLD.getEntitiesByClass(TNTPrimed.class)
.stream() .stream().toList();
.collect(Collectors.groupingBy(TNTPrimed::getFuseTicks));
rayData.reset(); rayData.reset();
if (primedList.isEmpty()) return; if (primedList.isEmpty()) return;
calculateRays(primedList, primedList);
List<Integer> fuseTicks = primedList.keySet().stream().sorted().collect(Collectors.toList());
List<TNTPrimed> current = new ArrayList<>();
for (int i = 0; i < fuseTicks.size(); i++) {
List<TNTPrimed> tnts = primedList.get(fuseTicks.get(i));
calculateRays(current, tnts);
current.addAll(tnts);
}
}, 1, 1); }, 1, 1);
} }
private void calculateRays(List<TNTPrimed> fromTNTs, List<TNTPrimed> toTNTs) { private void calculateRays(List<TNTPrimed> fromTNTs, List<TNTPrimed> toTNTs) {
for (TNTPrimed from : fromTNTs) { for (TNTPrimed to : toTNTs) {
if (!from.isInWater()) continue; int hitting = 0;
for (TNTPrimed to : toTNTs) { int total = 0;
for (TNTPrimed from : fromTNTs) {
if (from == to) continue; if (from == to) continue;
if (from.getFuseTicks() >= to.getFuseTicks()) continue;
if (to.getLocation().distanceSquared(from.getLocation()) > 25) continue; if (to.getLocation().distanceSquared(from.getLocation()) > 25) continue;
if (!from.isInWater()) continue;
Location fromLoc = from.getLocation(); Location fromLoc = from.getLocation();
Location toLoc = to.getLocation().clone().add(-0.49, 0, -0.49); Location toLoc = to.getLocation().clone().add(-0.49, 0, -0.49);
@@ -143,16 +139,29 @@ public class RayVisualizerCommand extends SWCommand implements Listener {
for (int dz = 0; dz < 3; dz++) { for (int dz = 0; dz < 3; dz++) {
Location end = toLoc.clone().add(minX + dx * spacing, 0 + dy * spacing, minZ + dz * spacing); Location end = toLoc.clone().add(minX + dx * spacing, 0 + dy * spacing, minZ + dz * spacing);
RayTraceResult result = fromLoc.getWorld().rayTraceBlocks(fromLoc, end.clone().subtract(fromLoc).toVector(), end.distance(fromLoc), FluidCollisionMode.NEVER, true); RayTraceResult result = fromLoc.getWorld().rayTraceBlocks(fromLoc, end.clone().subtract(fromLoc).toVector(), end.distance(fromLoc), FluidCollisionMode.NEVER, true);
if (result != null && result.getHitBlock() != null) {
continue;
}
CRay cRay = rayData.get(fromLoc, end); CRay cRay = rayData.get(fromLoc, end);
if (cRay == null) continue; if (cRay == null) continue;
cRay.setFrom(fromLoc); cRay.setFrom(fromLoc);
cRay.setTo(end); cRay.setTo(end);
if (result != null && result.getHitBlock() != null) {
cRay.setBlock(BLOCKED);
} else {
cRay.setBlock(VISIBLE);
hitting++;
}
} }
} }
} }
total += 27;
}
if (total == 0) {
to.setCustomNameVisible(false);
} else {
int remainder = hitting % 27;
int whole = hitting / 27;
to.setCustomNameVisible(true);
to.setCustomName("§e" + whole + " " + remainder + "/27");
} }
} }
} }