xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2215 from mlbv/master

Browse Source 
mk5 performance improvement
This commit is contained in:
HbmMods 2025-06-17 08:14:36 +02:00 committed by GitHub
commit 983f91edc5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 225 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

335
src/main/java/com/hbm/explosion/ExplosionNukeRayParallelized.java
View File

@ -3,8 +3,8 @@ package com.hbm.explosion;
import com.hbm.config.BombConfig; import com.hbm.config.BombConfig;
import com.hbm.interfaces.IExplosionRay; import com.hbm.interfaces.IExplosionRay;
import com.hbm.main.MainRegistry; import com.hbm.main.MainRegistry;
import com.hbm.util.ChunkKey;
import com.hbm.util.ConcurrentBitSet; import com.hbm.util.ConcurrentBitSet;
import com.hbm.util.SubChunkKey;
import com.hbm.util.SubChunkSnapshot; import com.hbm.util.SubChunkSnapshot;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
@ -16,12 +16,15 @@ import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.storage.ExtendedBlockStorage; import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Level;
import java.util.*; import java.util.ArrayList;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.*; import java.util.concurrent.*;
import java.util.concurrent.atomic.DoubleAdder; import java.util.concurrent.atomic.DoubleAdder;
/** /**
* Threaded DDA raytracer for the nuke explosion. * Threaded DDA raytracer for mk5 explosion.
* *
* @author mlbv * @author mlbv
*/ */
@ -29,6 +32,10 @@ public class ExplosionNukeRayParallelized implements IExplosionRay {
private static final int WORLD_HEIGHT = 256; private static final int WORLD_HEIGHT = 256;
private static final int BITSET_SIZE = 16 * WORLD_HEIGHT * 16; private static final int BITSET_SIZE = 16 * WORLD_HEIGHT * 16;
private static final int SUBCHUNK_PER_CHUNK = WORLD_HEIGHT >> 4;
private static final float NUKE_RESISTANCE_CUTOFF = 2_000_000F;
private static final float INITIAL_ENERGY_FACTOR = 0.3F; // Scales crater, no impact on performance
private static final double RESOLUTION_FACTOR = 1.0; // Scales ray density, no impact on crater radius
protected final World world; protected final World world;
private final double explosionX, explosionY, explosionZ; private final double explosionX, explosionY, explosionZ;
@ -36,19 +43,19 @@ public class ExplosionNukeRayParallelized implements IExplosionRay {
private final int strength; private final int strength;
private final int radius; private final int radius;
private volatile List<Vec3> directions;
private final CompletableFuture<List<Vec3>> directionsFuture; private final CompletableFuture<List<Vec3>> directionsFuture;
private final ConcurrentMap<ChunkCoordIntPair, ConcurrentBitSet> destructionMap; private final ConcurrentMap<ChunkCoordIntPair, ConcurrentBitSet> destructionMap;
private final ConcurrentMap<ChunkCoordIntPair, ChunkDamageAccumulator> accumulatedDamageMap; private final ConcurrentMap<ChunkCoordIntPair, ConcurrentMap<Integer, DoubleAdder>> damageMap;
private final ConcurrentMap<SubChunkKey, SubChunkSnapshot> snapshots;
private final ConcurrentMap<ChunkKey, SubChunkSnapshot> snapshots; private final ConcurrentMap<SubChunkKey, ConcurrentLinkedQueue<RayTask>> waitingRoom;
private final BlockingQueue<RayTask> rayQueue; private final BlockingQueue<RayTask> rayQueue;
private final BlockingQueue<ChunkKey> cacheQueue;
private final ExecutorService pool; private final ExecutorService pool;
private final CountDownLatch latch; private final CountDownLatch latch;
private final Thread latchWatcherThread; private final Thread latchWatcherThread;
private final List<ChunkCoordIntPair> orderedChunks; private final List<ChunkCoordIntPair> orderedChunks;
private final BlockingQueue<SubChunkKey> highPriorityReactiveQueue; // cache queue for rays
private final Iterator<SubChunkKey> lowPriorityProactiveIterator;
private volatile List<Vec3> directions;
private volatile boolean collectFinished = false; private volatile boolean collectFinished = false;
private volatile boolean consolidationFinished = false; private volatile boolean consolidationFinished = false;
private volatile boolean destroyFinished = false; private volatile boolean destroyFinished = false;
@ -66,22 +73,30 @@ public class ExplosionNukeRayParallelized implements IExplosionRay {
this.strength = strength; this.strength = strength;
this.radius = radius; this.radius = radius;
int rayCount = Math.max(0, (int) (2.5 * Math.PI * strength * strength)); int rayCount = Math.max(0, (int) (2.5 * Math.PI * strength * strength * RESOLUTION_FACTOR));
this.latch = new CountDownLatch(rayCount); this.latch = new CountDownLatch(rayCount);
this.destructionMap = new ConcurrentHashMap<>(); List<SubChunkKey> sortedSubChunks = getAllSubChunks();
this.accumulatedDamageMap = new ConcurrentHashMap<>(); this.lowPriorityProactiveIterator = sortedSubChunks.iterator();
this.snapshots = new ConcurrentHashMap<>(); this.highPriorityReactiveQueue = new LinkedBlockingQueue<>();
int initialChunkCapacity = (int) sortedSubChunks.stream().map(SubChunkKey::getPos).distinct().count();
this.destructionMap = new ConcurrentHashMap<>(initialChunkCapacity);
this.damageMap = new ConcurrentHashMap<>(initialChunkCapacity);
int subChunkCount = sortedSubChunks.size();
this.snapshots = new ConcurrentHashMap<>(subChunkCount);
this.waitingRoom = new ConcurrentHashMap<>(subChunkCount);
this.orderedChunks = new ArrayList<>(); this.orderedChunks = new ArrayList<>();
this.rayQueue = new LinkedBlockingQueue<>(); List<RayTask> initialRayTasks = new ArrayList<>(rayCount);
this.cacheQueue = new LinkedBlockingQueue<>(); for (int i = 0; i < rayCount; i++) initialRayTasks.add(new RayTask(i));
this.rayQueue = new LinkedBlockingQueue<>(initialRayTasks);
int workers = Math.max(1, Runtime.getRuntime().availableProcessors() - 1); int workers = Math.max(1, Runtime.getRuntime().availableProcessors() - 1);
this.pool = Executors.newWorkStealingPool(workers); this.pool = Executors.newWorkStealingPool(workers);
this.directionsFuture = CompletableFuture.supplyAsync(() -> generateSphereRays(rayCount)); this.directionsFuture = CompletableFuture.supplyAsync(() -> generateSphereRays(rayCount));
for (int i = 0; i < rayCount; i++) rayQueue.add(new RayTask(i));
for (int i = 0; i < workers; i++) pool.submit(new Worker()); for (int i = 0; i < workers; i++) pool.submit(new Worker());
this.latchWatcherThread = new Thread(() -> { this.latchWatcherThread = new Thread(() -> {
@ -91,11 +106,8 @@ public class ExplosionNukeRayParallelized implements IExplosionRay {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} finally { } finally {
collectFinished = true; collectFinished = true;
if (BombConfig.explosionAlgorithm == 2) { if (BombConfig.explosionAlgorithm == 2) pool.submit(this::runConsolidation);
pool.submit(this::runConsolidation); else consolidationFinished = true;
} else {
consolidationFinished = true;
}
} }
}, "ExplosionNuke-LatchWatcher-" + System.nanoTime()); }, "ExplosionNuke-LatchWatcher-" + System.nanoTime());
this.latchWatcherThread.setDaemon(true); this.latchWatcherThread.setDaemon(true);
@ -105,25 +117,70 @@ public class ExplosionNukeRayParallelized implements IExplosionRay {
private static float getNukeResistance(Block b) { private static float getNukeResistance(Block b) {
if (b.getMaterial().isLiquid()) return 0.1F; if (b.getMaterial().isLiquid()) return 0.1F;
if (b == Blocks.sandstone) return Blocks.stone.getExplosionResistance(null); if (b == Blocks.sandstone) return Blocks.stone.getExplosionResistance(null);
if (b == Blocks.obsidian) return Blocks.stone.getExplosionResistance(null) * 3; if (b == Blocks.obsidian) return Blocks.stone.getExplosionResistance(null) * 3.0F;
return b.getExplosionResistance(null); return b.getExplosionResistance(null);
} }
private List<SubChunkKey> getAllSubChunks() {
List<SubChunkKey> keys = new ArrayList<>();
int cr = (radius + 15) >> 4;
int minCX = (originX >> 4) - cr;
int maxCX = (originX >> 4) + cr;
int minCZ = (originZ >> 4) - cr;
int maxCZ = (originZ >> 4) + cr;
int minSubY = Math.max(0, (originY - radius) >> 4);
int maxSubY = Math.min(SUBCHUNK_PER_CHUNK - 1, (originY + radius) >> 4);
int originSubY = originY >> 4;
for (int cx = minCX; cx <= maxCX; cx++) {
for (int cz = minCZ; cz <= maxCZ; cz++) {
for (int subY = minSubY; subY <= maxSubY; subY++) {
int chunkCenterX = (cx << 4) + 8;
int chunkCenterY = (subY << 4) + 8;
int chunkCenterZ = (cz << 4) + 8;
double dx = chunkCenterX - explosionX;
double dy = chunkCenterY - explosionY;
double dz = chunkCenterZ - explosionZ;
if (dx * dx + dy * dy + dz * dz <= (radius + 14) * (radius + 14)) { // +14 for margin of error
keys.add(new SubChunkKey(cx, cz, subY));
}
}
}
}
keys.sort(Comparator.comparingInt(key -> {
int distCX = key.getPos().chunkXPos - (originX >> 4);
int distCZ = key.getPos().chunkZPos - (originZ >> 4);
int distSubY = key.getSubY() - originSubY;
return distCX * distCX + distCZ * distCZ + distSubY * distSubY;
}));
return keys;
}
@Override @Override
public void cacheChunksTick(int timeBudgetMs) { public void cacheChunksTick(int timeBudgetMs) {
if (collectFinished || this.cacheQueue == null) return; if (collectFinished) return;
final long deadline = System.nanoTime() + (timeBudgetMs * 1_000_000L); final long deadline = System.nanoTime() + (timeBudgetMs * 1_000_000L);
while (System.nanoTime() < deadline) { while (System.nanoTime() < deadline) {
ChunkKey ck = cacheQueue.poll(); SubChunkKey ck = highPriorityReactiveQueue.poll();
if (ck == null) break; if (ck == null) break;
snapshots.computeIfAbsent(ck, k -> SubChunkSnapshot.getSnapshot(world, k, BombConfig.chunkloading)); processCacheKey(ck);
} }
while (System.nanoTime() < deadline && lowPriorityProactiveIterator.hasNext()) {
SubChunkKey ck = lowPriorityProactiveIterator.next();
processCacheKey(ck);
}
}
private void processCacheKey(SubChunkKey ck) {
if (snapshots.containsKey(ck)) return;
snapshots.put(ck, SubChunkSnapshot.getSnapshot(world, ck, BombConfig.chunkloading));
ConcurrentLinkedQueue<RayTask> waiters = waitingRoom.remove(ck);
if (waiters != null) rayQueue.addAll(waiters);
} }
@Override @Override
public void destructionTick(int timeBudgetMs) { public void destructionTick(int timeBudgetMs) {
if (!collectFinished || !consolidationFinished || destroyFinished) return; // Added consolidationFinished check if (!collectFinished || !consolidationFinished || destroyFinished) return;
final long deadline = System.nanoTime() + timeBudgetMs * 1_000_000L; final long deadline = System.nanoTime() + timeBudgetMs * 1_000_000L;
@ -187,9 +244,7 @@ public class ExplosionNukeRayParallelized implements IExplosionRay {
} }
if (bs.isEmpty()) { if (bs.isEmpty()) {
destructionMap.remove(cp); destructionMap.remove(cp);
for (int sy = 0; sy < (WORLD_HEIGHT >> 4); sy++) { for (int subY = 0; subY < SUBCHUNK_PER_CHUNK; subY++) snapshots.remove(new SubChunkKey(cp, subY));
snapshots.remove(new ChunkKey(cp, sy));
}
it.remove(); it.remove();
} }
} }
@ -212,32 +267,22 @@ public class ExplosionNukeRayParallelized implements IExplosionRay {
this.destroyFinished = true; this.destroyFinished = true;
if (this.rayQueue != null) this.rayQueue.clear(); if (this.rayQueue != null) this.rayQueue.clear();
if (this.cacheQueue != null) this.cacheQueue.clear(); if (this.waitingRoom != null) this.waitingRoom.clear();
if (this.latch != null) { if (this.latch != null) while (this.latch.getCount() > 0) this.latch.countDown();
while (this.latch.getCount() > 0) { if (this.latchWatcherThread != null && this.latchWatcherThread.isAlive()) this.latchWatcherThread.interrupt();
this.latch.countDown();
}
}
if (this.latchWatcherThread != null && this.latchWatcherThread.isAlive()) {
this.latchWatcherThread.interrupt();
}
if (this.pool != null && !this.pool.isShutdown()) { if (this.pool != null && !this.pool.isShutdown()) {
this.pool.shutdownNow(); this.pool.shutdownNow();
try { try {
if (!this.pool.awaitTermination(100, TimeUnit.MILLISECONDS)) { if (!this.pool.awaitTermination(100, TimeUnit.MILLISECONDS)) MainRegistry.logger.log(Level.ERROR, "ExplosionNukeRayParallelized thread pool did not terminate promptly on cancel.");
MainRegistry.logger.log(Level.ERROR, "ExplosionNukeRayParallelized thread pool did not terminate promptly on cancel.");
}
} catch (InterruptedException e) { } catch (InterruptedException e) {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
if (!this.pool.isShutdown()) { if (!this.pool.isShutdown()) this.pool.shutdownNow();
this.pool.shutdownNow();
}
} }
} }
if (this.destructionMap != null) this.destructionMap.clear(); if (this.destructionMap != null) this.destructionMap.clear();
if (this.accumulatedDamageMap != null) this.accumulatedDamageMap.clear(); if (this.damageMap != null) this.damageMap.clear();
if (this.snapshots != null) this.snapshots.clear(); if (this.snapshots != null) this.snapshots.clear();
if (this.orderedChunks != null) this.orderedChunks.clear(); if (this.orderedChunks != null) this.orderedChunks.clear();
} }
@ -246,7 +291,7 @@ public class ExplosionNukeRayParallelized implements IExplosionRay {
List<Vec3> list = new ArrayList<>(count); List<Vec3> list = new ArrayList<>(count);
if (count == 0) return list; if (count == 0) return list;
if (count == 1) { if (count == 1) {
list.add(Vec3.createVectorHelper(1, 0, 0).normalize()); list.add(Vec3.createVectorHelper(1, 0, 0));
return list; return list;
} }
double phi = Math.PI * (3.0 - Math.sqrt(5.0)); double phi = Math.PI * (3.0 - Math.sqrt(5.0));
@ -260,119 +305,66 @@ public class ExplosionNukeRayParallelized implements IExplosionRay {
} }
private void runConsolidation() { private void runConsolidation() {
Iterator<Map.Entry<ChunkCoordIntPair, ChunkDamageAccumulator>> chunkEntryIterator = accumulatedDamageMap.entrySet().iterator(); damageMap.forEach((cp, innerDamageMap) -> {
while (chunkEntryIterator.hasNext()) { if (innerDamageMap.isEmpty()) {
Map.Entry<ChunkCoordIntPair, ChunkDamageAccumulator> entry = chunkEntryIterator.next(); damageMap.remove(cp);
ChunkCoordIntPair cp = entry.getKey(); return;
ChunkDamageAccumulator accumulator = entry.getValue();
if (accumulator.isEmpty()) {
chunkEntryIterator.remove();
continue;
} }
ConcurrentBitSet chunkDestructionBitSet = destructionMap.computeIfAbsent(cp, k -> new ConcurrentBitSet(BITSET_SIZE)); ConcurrentBitSet chunkDestructionBitSet = destructionMap.computeIfAbsent(cp, k -> new ConcurrentBitSet(BITSET_SIZE));
innerDamageMap.forEach((bitIndex, accumulatedDamageAdder) -> {
Iterator<Map.Entry<Integer, DoubleAdder>> damageEntryIterator = accumulator.entrySet().iterator(); float accumulatedDamage = (float) accumulatedDamageAdder.sum();
while (damageEntryIterator.hasNext()) {
Map.Entry<Integer, DoubleAdder> damageEntry = damageEntryIterator.next();
int bitIndex = damageEntry.getKey();
float accumulatedDamage = (float) damageEntry.getValue().sum();
if (accumulatedDamage <= 0.0f) { if (accumulatedDamage <= 0.0f) {
damageEntryIterator.remove(); innerDamageMap.remove(bitIndex);
continue; return;
} }
int yGlobal = WORLD_HEIGHT - 1 - (bitIndex >>> 8); int yGlobal = WORLD_HEIGHT - 1 - (bitIndex >>> 8);
int subY = yGlobal >> 4; int subY = yGlobal >> 4;
if (subY < 0) { if (subY < 0) {
damageEntryIterator.remove(); innerDamageMap.remove(bitIndex);
continue; return;
} }
SubChunkKey snapshotKey = new SubChunkKey(cp, subY);
ChunkKey snapshotKey = new ChunkKey(cp, subY);
SubChunkSnapshot snap = snapshots.get(snapshotKey); SubChunkSnapshot snap = snapshots.get(snapshotKey);
Block originalBlock;
if (snap == null || snap == SubChunkSnapshot.EMPTY) { if (snap == null || snap == SubChunkSnapshot.EMPTY) {
damageEntryIterator.remove(); innerDamageMap.remove(bitIndex);
continue; return;
} else { }
int xLocal = (bitIndex >>> 4) & 0xF; int xLocal = (bitIndex >>> 4) & 0xF;
int zLocal = bitIndex & 0xF; int zLocal = bitIndex & 0xF;
originalBlock = snap.getBlock(xLocal, yGlobal & 0xF, zLocal); Block originalBlock = snap.getBlock(xLocal, yGlobal & 0xF, zLocal);
if (originalBlock == Blocks.air) { if (originalBlock == Blocks.air) {
damageEntryIterator.remove(); innerDamageMap.remove(bitIndex);
continue; return;
}
} }
float resistance = getNukeResistance(originalBlock); float resistance = getNukeResistance(originalBlock);
if (accumulatedDamage >= resistance) { if (accumulatedDamage >= resistance * RESOLUTION_FACTOR) chunkDestructionBitSet.set(bitIndex);
chunkDestructionBitSet.set(bitIndex); innerDamageMap.remove(bitIndex);
damageEntryIterator.remove(); });
} if (innerDamageMap.isEmpty()) damageMap.remove(cp);
} });
damageMap.clear();
if (accumulator.isEmpty()) {
chunkEntryIterator.remove();
}
}
accumulatedDamageMap.clear();
consolidationFinished = true; consolidationFinished = true;
} }
private static class ChunkDamageAccumulator {
// key = bitIndex, value = total accumulated damage
private final ConcurrentHashMap<Integer, DoubleAdder> damageMap = new ConcurrentHashMap<>();
public void addDamage(int bitIndex, float damageAmount) {
if (damageAmount <= 0) return;
DoubleAdder adder = damageMap.computeIfAbsent(bitIndex, k -> new DoubleAdder());
adder.add(damageAmount);
}
/*public float getDamage(int bitIndex) {
DoubleAdder adder = damageMap.get(bitIndex);
return adder == null ? 0f : (float) adder.sum();
}*/
/*public void clearDamage(int bitIndex) {
damageMap.remove(bitIndex);
}*/
public Set<Map.Entry<Integer, DoubleAdder>> entrySet() {
return damageMap.entrySet();
}
public boolean isEmpty() {
return damageMap.isEmpty();
}
}
private class Worker implements Runnable { private class Worker implements Runnable {
@Override @Override
public void run() { public void run() {
try { try {
while (true) { while (!collectFinished && !Thread.currentThread().isInterrupted()) {
if (collectFinished && rayQueue.isEmpty()) break;
RayTask task = rayQueue.poll(100, TimeUnit.MILLISECONDS); RayTask task = rayQueue.poll(100, TimeUnit.MILLISECONDS);
if (task == null) { if (task != null) task.trace();
if (collectFinished && rayQueue.isEmpty()) break;
continue;
}
task.trace();
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} }
} }
} }
private class RayTask { private class RayTask {
private static final double RAY_DIRECTION_EPSILON = 1e-6;
private static final double PROCESSING_EPSILON = 1e-9;
private static final float MIN_EFFECTIVE_DIST_FOR_ENERGY_CALC = 0.01f;
final int dirIndex; final int dirIndex;
double px, py, pz; double px, py, pz;
int x, y, z; int x, y, z;
@ -382,9 +374,8 @@ public class ExplosionNukeRayParallelized implements IExplosionRay {
boolean initialised = false; boolean initialised = false;
double currentRayPosition; double currentRayPosition;
private static final double RAY_DIRECTION_EPSILON = 1e-6; private int lastCX = Integer.MIN_VALUE, lastCZ = Integer.MIN_VALUE, lastSubY = Integer.MIN_VALUE;
private static final double PROCESSING_EPSILON = 1e-9; private SubChunkKey currentSubChunkKey = null;
private static final float MIN_EFFECTIVE_DIST_FOR_ENERGY_CALC = 0.01f;
RayTask(int dirIdx) { RayTask(int dirIdx) {
this.dirIndex = dirIdx; this.dirIndex = dirIdx;
@ -393,9 +384,7 @@ public class ExplosionNukeRayParallelized implements IExplosionRay {
void init() { void init() {
if (directions == null) directions = directionsFuture.join(); if (directions == null) directions = directionsFuture.join();
Vec3 dir = directions.get(this.dirIndex); Vec3 dir = directions.get(this.dirIndex);
// This scales the crater. Higher = bigger. this.energy = strength * INITIAL_ENERGY_FACTOR;
// Currently the crater is a little bit bigger than the original implementation
this.energy = strength * 0.3F;
this.px = explosionX; this.px = explosionX;
this.py = explosionY; this.py = explosionY;
this.pz = explosionZ; this.pz = explosionZ;
@ -411,20 +400,17 @@ public class ExplosionNukeRayParallelized implements IExplosionRay {
double absDirX = Math.abs(dirX); double absDirX = Math.abs(dirX);
this.stepX = (absDirX < RAY_DIRECTION_EPSILON) ? 0 : (dirX > 0 ? 1 : -1); this.stepX = (absDirX < RAY_DIRECTION_EPSILON) ? 0 : (dirX > 0 ? 1 : -1);
this.tDeltaX = (stepX == 0) ? Double.POSITIVE_INFINITY : 1.0 / absDirX; this.tDeltaX = (stepX == 0) ? Double.POSITIVE_INFINITY : 1.0 / absDirX;
this.tMaxX = (stepX == 0) ? Double.POSITIVE_INFINITY : this.tMaxX = (stepX == 0) ? Double.POSITIVE_INFINITY : ((stepX > 0 ? (this.x + 1 - this.px) : (this.px - this.x)) * this.tDeltaX);
((stepX > 0 ? (this.x + 1 - this.px) : (this.px - this.x)) * this.tDeltaX);
double absDirY = Math.abs(dirY); double absDirY = Math.abs(dirY);
this.stepY = (absDirY < RAY_DIRECTION_EPSILON) ? 0 : (dirY > 0 ? 1 : -1); this.stepY = (absDirY < RAY_DIRECTION_EPSILON) ? 0 : (dirY > 0 ? 1 : -1);
this.tDeltaY = (stepY == 0) ? Double.POSITIVE_INFINITY : 1.0 / absDirY; this.tDeltaY = (stepY == 0) ? Double.POSITIVE_INFINITY : 1.0 / absDirY;
this.tMaxY = (stepY == 0) ? Double.POSITIVE_INFINITY : this.tMaxY = (stepY == 0) ? Double.POSITIVE_INFINITY : ((stepY > 0 ? (this.y + 1 - this.py) : (this.py - this.y)) * this.tDeltaY);
((stepY > 0 ? (this.y + 1 - this.py) : (this.py - this.y)) * this.tDeltaY);
double absDirZ = Math.abs(dirZ); double absDirZ = Math.abs(dirZ);
this.stepZ = (absDirZ < RAY_DIRECTION_EPSILON) ? 0 : (dirZ > 0 ? 1 : -1); this.stepZ = (absDirZ < RAY_DIRECTION_EPSILON) ? 0 : (dirZ > 0 ? 1 : -1);
this.tDeltaZ = (stepZ == 0) ? Double.POSITIVE_INFINITY : 1.0 / absDirZ; this.tDeltaZ = (stepZ == 0) ? Double.POSITIVE_INFINITY : 1.0 / absDirZ;
this.tMaxZ = (stepZ == 0) ? Double.POSITIVE_INFINITY : this.tMaxZ = (stepZ == 0) ? Double.POSITIVE_INFINITY : ((stepZ > 0 ? (this.z + 1 - this.pz) : (this.pz - this.z)) * this.tDeltaZ);
((stepZ > 0 ? (this.z + 1 - this.pz) : (this.pz - this.z)) * this.tDeltaZ);
this.initialised = true; this.initialised = true;
} }
@ -437,15 +423,28 @@ public class ExplosionNukeRayParallelized implements IExplosionRay {
} }
while (energy > 0) { while (energy > 0) {
if (y < 0 || y >= WORLD_HEIGHT) break; if (y < 0 || y >= WORLD_HEIGHT || Thread.currentThread().isInterrupted()) break;
if (currentRayPosition >= radius - PROCESSING_EPSILON) break; if (currentRayPosition >= radius - PROCESSING_EPSILON) break;
ChunkKey ck = new ChunkKey(x >> 4, z >> 4, y >> 4); int cx = x >> 4;
SubChunkSnapshot snap = snapshots.get(ck); int cz = z >> 4;
int subY = y >> 4;
if (cx != lastCX || cz != lastCZ || subY != lastSubY) {
currentSubChunkKey = new SubChunkKey(cx, cz, subY);
lastCX = cx;
lastCZ = cz;
lastSubY = subY;
}
SubChunkSnapshot snap = snapshots.get(currentSubChunkKey);
if (snap == null) { if (snap == null) {
cacheQueue.offer(ck); final boolean[] amFirst = {false};
rayQueue.offer(this); ConcurrentLinkedQueue<RayTask> waiters = waitingRoom.computeIfAbsent(currentSubChunkKey, k -> {
amFirst[0] = true;
return new ConcurrentLinkedQueue<>();
});
if (amFirst[0]) highPriorityReactiveQueue.add(currentSubChunkKey);
waiters.add(this);
return; return;
} }
double t_exit_voxel = Math.min(tMaxX, Math.min(tMaxY, tMaxZ)); double t_exit_voxel = Math.min(tMaxX, Math.min(tMaxY, tMaxZ));
@ -456,15 +455,13 @@ public class ExplosionNukeRayParallelized implements IExplosionRay {
if (this.currentRayPosition + segmentLenInVoxel > radius - PROCESSING_EPSILON) { if (this.currentRayPosition + segmentLenInVoxel > radius - PROCESSING_EPSILON) {
segmentLenForProcessing = Math.max(0.0, radius - this.currentRayPosition); segmentLenForProcessing = Math.max(0.0, radius - this.currentRayPosition);
stopAfterThisSegment = true; stopAfterThisSegment = true;
} else { } else segmentLenForProcessing = segmentLenInVoxel;
segmentLenForProcessing = segmentLenInVoxel;
}
if (snap != SubChunkSnapshot.EMPTY && segmentLenForProcessing > PROCESSING_EPSILON) { if (snap != SubChunkSnapshot.EMPTY && segmentLenForProcessing > PROCESSING_EPSILON) {
Block block = snap.getBlock(x & 0xF, y & 0xF, z & 0xF); Block block = snap.getBlock(x & 0xF, y & 0xF, z & 0xF);
if (block != Blocks.air) { if (block != Blocks.air) {
float resistance = getNukeResistance(block); float resistance = getNukeResistance(block);
if (resistance >= 2_000_000F) { // cutoff if (resistance >= NUKE_RESISTANCE_CUTOFF) {
energy = 0; energy = 0;
} else { } else {
double energyLossFactor = getEnergyLossFactor(resistance); double energyLossFactor = getEnergyLossFactor(resistance);
@ -472,26 +469,16 @@ public class ExplosionNukeRayParallelized implements IExplosionRay {
energy -= damageDealt; energy -= damageDealt;
if (damageDealt > 0) { if (damageDealt > 0) {
int bitIndex = ((WORLD_HEIGHT - 1 - y) << 8) | ((x & 0xF) << 4) | (z & 0xF); int bitIndex = ((WORLD_HEIGHT - 1 - y) << 8) | ((x & 0xF) << 4) | (z & 0xF);
ChunkCoordIntPair chunkPos = currentSubChunkKey.getPos();
if (BombConfig.explosionAlgorithm == 2) { if (BombConfig.explosionAlgorithm == 2) {
ChunkCoordIntPair chunkPos = ck.pos; damageMap.computeIfAbsent(chunkPos, cp -> new ConcurrentHashMap<>(256)).computeIfAbsent(bitIndex, k -> new DoubleAdder()).add(damageDealt);
ChunkDamageAccumulator chunkAccumulator = } else if (energy > 0) destructionMap.computeIfAbsent(chunkPos, posKey -> new ConcurrentBitSet(BITSET_SIZE)).set(bitIndex);
accumulatedDamageMap.computeIfAbsent(chunkPos, k -> new ChunkDamageAccumulator());
chunkAccumulator.addDamage(bitIndex, damageDealt);
} else {
if (energy > 0) {
ConcurrentBitSet bs = destructionMap.computeIfAbsent(
ck.pos,
posKey -> new ConcurrentBitSet(BITSET_SIZE)
);
bs.set(bitIndex);
}
}
} }
} }
} }
} }
this.currentRayPosition = t_exit_voxel; this.currentRayPosition = t_exit_voxel;
if (energy <= 0 || stopAfterThisSegment || this.currentRayPosition >= radius - PROCESSING_EPSILON) break; if (energy <= 0 || stopAfterThisSegment) break;
if (tMaxX < tMaxY) { if (tMaxX < tMaxY) {
if (tMaxX < tMaxZ) { if (tMaxX < tMaxZ) {
@ -515,15 +502,7 @@ public class ExplosionNukeRayParallelized implements IExplosionRay {
} }
private double getEnergyLossFactor(float resistance) { private double getEnergyLossFactor(float resistance) {
double dxBlockToCenter = (this.x + 0.5) - explosionX; double effectiveDist = Math.max(this.currentRayPosition, MIN_EFFECTIVE_DIST_FOR_ENERGY_CALC);
double dyBlockToCenter = (this.y + 0.5) - explosionY;
double dzBlockToCenter = (this.z + 0.5) - explosionZ;
double distToBlockCenterSq = dxBlockToCenter * dxBlockToCenter +
dyBlockToCenter * dyBlockToCenter +
dzBlockToCenter * dzBlockToCenter;
double distToBlockCenter = Math.sqrt(distToBlockCenterSq);
double effectiveDist = Math.max(distToBlockCenter, MIN_EFFECTIVE_DIST_FOR_ENERGY_CALC);
return (Math.pow(resistance + 1.0, 3.0 * (effectiveDist / radius)) - 1.0); return (Math.pow(resistance + 1.0, 3.0 * (effectiveDist / radius)) - 1.0);
} }
} }

37
src/main/java/com/hbm/util/ChunkKey.java
View File

@ -1,37 +0,0 @@
package com.hbm.util;
import net.minecraft.world.ChunkCoordIntPair;
import java.util.Objects;
/**
* Unique identifier for sub-chunks.
* @author mlbv
*/
public class ChunkKey {
public final ChunkCoordIntPair pos;
public final int subY;
public ChunkKey(int cx, int cz, int sy) {
this.pos = new ChunkCoordIntPair(cx, cz);
this.subY = sy;
}
public ChunkKey(ChunkCoordIntPair pos, int sy) {
this.pos = pos;
this.subY = sy;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof ChunkKey)) return false;
ChunkKey k = (ChunkKey) o;
return subY == k.subY && pos.equals(k.pos);
}
@Override
public int hashCode() {
return Objects.hash(pos.chunkXPos, pos.chunkZPos, subY);
}
}

63
src/main/java/com/hbm/util/SubChunkKey.java Normal file
View File

@ -0,0 +1,63 @@
package com.hbm.util;
import net.minecraft.world.ChunkCoordIntPair;
/**
* Unique identifier for sub-chunks.
* @author mlbv
*/
public class SubChunkKey {
private int chunkXPos;
private int chunkZPos;
private int subY;
private int hash;
public SubChunkKey(int cx, int cz, int sy) {
this.update(cx, cz, sy);
}
public SubChunkKey(ChunkCoordIntPair pos, int sy) {
this.update(pos.chunkXPos, pos.chunkZPos, sy);
}
public SubChunkKey update(int cx, int cz, int sy) {
this.chunkXPos = cx;
this.chunkZPos = cz;
this.subY = sy;
int result = subY;
result = 31 * result + cx;
result = 31 * result + cz;
this.hash = result;
return this;
}
@Override
public final int hashCode() {
return this.hash;
}
@Override
public final boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof SubChunkKey)) return false;
SubChunkKey k = (SubChunkKey) o;
return this.subY == k.subY && this.chunkXPos == k.chunkXPos && this.chunkZPos == k.chunkZPos;
}
public int getSubY() {
return subY;
}
public int getChunkXPos() {
return chunkXPos;
}
public int getChunkZPos() {
return chunkZPos;
}
public ChunkCoordIntPair getPos() {
return new ChunkCoordIntPair(this.chunkXPos, this.chunkZPos);
}
}

10
src/main/java/com/hbm/util/SubChunkSnapshot.java
View File

@ -34,19 +34,19 @@ public class SubChunkSnapshot {
* @param world * @param world
* The World instance from which to retrieve the chunk. * The World instance from which to retrieve the chunk.
* @param key * @param key
* The ChunkKey identifying the sub-chunk. * The SubChunkKey identifying the sub-chunk.
* @param allowGeneration * @param allowGeneration
* Whether to generate chunks. If false, attempting to retrieve a snapshot of a chunk that does not exist will return {@link SubChunkSnapshot#EMPTY}. * Whether to generate chunks. If false, attempting to retrieve a snapshot of a chunk that does not exist will return {@link SubChunkSnapshot#EMPTY}.
* @return * @return
* A SubChunkSnapshot containing the palette and block data for the sub-chunk, * A SubChunkSnapshot containing the palette and block data for the sub-chunk,
* or {@link SubChunkSnapshot#EMPTY} if the region contains only air. * or {@link SubChunkSnapshot#EMPTY} if the region contains only air.
*/ */
public static SubChunkSnapshot getSnapshot(World world, ChunkKey key, boolean allowGeneration){ public static SubChunkSnapshot getSnapshot(World world, SubChunkKey key, boolean allowGeneration){
if (!world.getChunkProvider().chunkExists(key.pos.chunkXPos, key.pos.chunkZPos) && !allowGeneration) { if (!world.getChunkProvider().chunkExists(key.getChunkXPos(), key.getChunkZPos()) && !allowGeneration) {
return SubChunkSnapshot.EMPTY; return SubChunkSnapshot.EMPTY;
} }
Chunk chunk = world.getChunkProvider().provideChunk(key.pos.chunkXPos, key.pos.chunkZPos); Chunk chunk = world.getChunkProvider().provideChunk(key.getChunkXPos(), key.getChunkZPos());
ExtendedBlockStorage ebs = chunk.getBlockStorageArray()[key.subY]; ExtendedBlockStorage ebs = chunk.getBlockStorageArray()[key.getSubY()];
if (ebs == null || ebs.isEmpty()) return SubChunkSnapshot.EMPTY; if (ebs == null || ebs.isEmpty()) return SubChunkSnapshot.EMPTY;
short[] data = new short[16 * 16 * 16]; short[] data = new short[16 * 16 * 16];