diff --git a/assets/Data/macro/jobs.json b/assets/Data/macro/jobs.json index 96a260a6..9fb432a7 100644 --- a/assets/Data/macro/jobs.json +++ b/assets/Data/macro/jobs.json @@ -1,5 +1,5 @@ { - "jobs": [ + "data": [ ], "files": [ ] diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index a6ca26e5..10b6a7b7 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -2032,6 +2032,7 @@ Server LOD component properly attaches physics bodies when the entity comes in r Fix physics destruction on server via ServerLODComponent More job data scaffolding Config class cleanup +Fix jobs data, simplify block chunk gen algo diff --git a/src/main/java/electrosphere/server/physics/block/manager/ServerBlockChunkGenerationThread.java b/src/main/java/electrosphere/server/physics/block/manager/ServerBlockChunkGenerationThread.java index 471e5cb0..f6a763d7 100644 --- a/src/main/java/electrosphere/server/physics/block/manager/ServerBlockChunkGenerationThread.java +++ b/src/main/java/electrosphere/server/physics/block/manager/ServerBlockChunkGenerationThread.java @@ -221,7 +221,6 @@ public class ServerBlockChunkGenerationThread implements Runnable { List filtered = macroData.getStructures().stream().filter((VirtualStructure struct) -> {return !struct.isRepairable() && struct.getAABB().testAABB(localAABB);}).collect(Collectors.toList()); if(filtered.size() > 0){ Vector3i chunkPos = new Vector3i(worldX, worldY, worldZ); - Vector3i blockPos = new Vector3i(0,0,0); Vector3d chunkRealPos = ServerWorldData.convertChunkToRealSpace(chunkPos); Vector3d localBlockPos = new Vector3d(); Vector3d currRealPos = new Vector3d(chunkRealPos); @@ -232,11 +231,8 @@ public class ServerBlockChunkGenerationThread implements Runnable { boolean placedBlock = false; currRealPos.set(chunkRealPos).add(x * strideMultiplier * BlockChunkData.BLOCK_SIZE_MULTIPLIER,y * strideMultiplier * BlockChunkData.BLOCK_SIZE_MULTIPLIER,z * strideMultiplier * BlockChunkData.BLOCK_SIZE_MULTIPLIER); - ServerWorldData.convertRealToLocalBlockSpace(currRealPos,blockPos); - ServerWorldData.convertRealToChunkSpace(currRealPos,chunkPos); //try placing a structure block - blockPos.set(x*strideMultiplier,y*strideMultiplier,z*strideMultiplier); for(VirtualStructure struct : filtered){ if(struct.getAABB().testPoint(currRealPos.x, currRealPos.y, currRealPos.z)){ AABBd aabb = struct.getAABB();