Added Somewhat functional Transmission between storages

This commit is contained in:
2026-02-08 02:00:22 +01:00
parent 59e8fc1734
commit 3950bdab08
15 changed files with 293 additions and 104 deletions

View File

@@ -5,47 +5,98 @@ import com.hypixel.hytale.component.Ref;
import com.hypixel.hytale.logger.HytaleLogger;
import com.hypixel.hytale.math.util.ChunkUtil;
import com.hypixel.hytale.server.core.modules.block.BlockModule;
import com.hypixel.hytale.server.core.universe.world.World;
import com.hypixel.hytale.server.core.universe.world.chunk.BlockComponentChunk;
import com.hypixel.hytale.server.core.universe.world.chunk.WorldChunk;
import com.hypixel.hytale.server.core.universe.world.storage.ChunkStore;
import org.checkerframework.checker.nullness.compatqual.NonNullDecl;
public class BlockHelper {
public static final HytaleLogger LOGGER = HytaleLogger.getLogger();
public static final HytaleLogger HyLogger = HytaleLogger.getLogger();
public static void executeForCubeAround(int x, int y, int z, int size, boolean own, Callback callback) {
for (int xOffset = 0; xOffset < size; xOffset++) {
for (int yOffset = 0; yOffset <size; yOffset++) {
for (int yOffset = 0; yOffset < size; yOffset++) {
for (int zOffset = 0; zOffset < size; zOffset++) {
var xPos = (xOffset -size/2)+x;
var yPos = (yOffset -size/2)+y;
var zPos = (zOffset -size/2)+z;
var xPos = (xOffset - size / 2) + x;
var yPos = (yOffset - size / 2) + y;
var zPos = (zOffset - size / 2) + z;
if (!(xPos == x && yPos == y && zPos == z)) {
callback.accept(xPos, yPos, zPos);
}
else if (own) {
} else if (own) {
callback.accept(xPos, yPos, zPos);
}
}
}
}
}
public static void executeForCubeAroundChunkSafe(
int centerX, int centerY, int centerZ,
int size,
boolean includeCenter,
World world,
CommandBuffer<ChunkStore> commandBuffer,
ChunkSafeCallback chunkSafeCallback
) {
int halfSize = size / 2;
for (int xOffset = -halfSize; xOffset <= halfSize; xOffset++) {
for (int yOffset = -halfSize; yOffset <= halfSize; yOffset++) {
for (int zOffset = -halfSize; zOffset <= halfSize; zOffset++) {
int xPos = centerX + xOffset;
int yPos = centerY + yOffset;
int zPos = centerZ + zOffset;
if (!includeCenter && xPos == centerX && yPos == centerY && zPos == centerZ) {
continue;
}
int chunkX = Math.floorDiv(xPos, 32);
int chunkZ = Math.floorDiv(zPos, 32);
int localX = Math.floorMod(xPos, 32);
int localZ = Math.floorMod(zPos, 32);
WorldChunk targetChunk = world.getChunk(ChunkUtil.indexChunk(chunkX, chunkZ));
if (targetChunk == null) continue;
var blockComponentChunk = commandBuffer.getComponent(
targetChunk.getReference(),
BlockComponentChunk.getComponentType()
);
if (blockComponentChunk == null) continue;
int index = ChunkUtil.indexBlockInColumn(localX, yPos, localZ);
var targetRef = blockComponentChunk.getEntityReference(index);
if (targetRef == null) continue;
chunkSafeCallback.accept(xPos, yPos, zPos, targetRef, blockComponentChunk, targetChunk);
}
}
}
}
public interface Callback {
void accept(int x, int y, int z);
}
public interface ChunkSafeCallback {
void accept(int x, int y, int z, Ref<ChunkStore> targetRef, BlockComponentChunk blockComponentChunk, WorldChunk targetChunk);
}
public static void setBlockRefTicking(Ref<ChunkStore> blockRef, @NonNullDecl CommandBuffer<ChunkStore> commandBuffer) {
BlockModule.BlockStateInfo blockInfo = commandBuffer.getComponent(blockRef, BlockModule.BlockStateInfo.getComponentType());
if(blockInfo == null) return;
if (blockInfo == null) return;
WorldChunk worldChunk = commandBuffer.getComponent(blockInfo.getChunkRef(), WorldChunk.getComponentType());
if(worldChunk == null) return;
if (worldChunk == null) return;
int x = ChunkUtil.xFromBlockInColumn(blockInfo.getIndex());
int y = ChunkUtil.yFromBlockInColumn(blockInfo.getIndex());
int z = ChunkUtil.zFromBlockInColumn(blockInfo.getIndex());
worldChunk.setTicking(x, y, z, true);
HytaleLogger.getLogger().atInfo().log(String.valueOf(worldChunk.isTicking(x, y, z)));
}
}