Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-01 06:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use given min/max y values in HeightmapProcessor

Browse Source
This commit is contained in:
dordsor21 2021-09-11 12:41:06 +01:00
parent 6cbd9631a0
commit f84c98e721
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/HeightmapProcessor.java
View File

@ -11,7 +11,6 @@ import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockTypesCache;
import javax.annotation.Nullable;
import java.lang.reflect.Array;
import java.util.Arrays;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Future;
@ -20,7 +19,7 @@ public class HeightmapProcessor implements IBatchProcessor {
private static final HeightMapType[] TYPES = HeightMapType.values();
private static final int BLOCKS_PER_Y_SHIFT = 8; // log2(256)
private static final int BLOCKS_PER_Y = 256;
private static final int BLOCKS_PER_Y = 256; // 16 x 16
private static final boolean[] COMPLETE = new boolean[BLOCKS_PER_Y];
private static final char[] AIR_LAYER = new char[4096];
@ -29,6 +28,25 @@ public class HeightmapProcessor implements IBatchProcessor {
Arrays.fill(AIR_LAYER, (char) 1);
}
private final int minY;
private final int maxY;
/**
* New HeightmapProcessor instance that will create heightmaps between the given heights (inclusive). If no applicable
* block is found before the minimum Y, 0 is used.
*
* @param minY minimum Y to consider
* @param maxY maximum Y to consider
*/
public HeightmapProcessor(int minY, int maxY) {
this.minY = minY;
this.maxY = maxY;
}
private static int index(int y, int offset) {
return (y << BLOCKS_PER_Y_SHIFT) + offset;
}
@Override
public IChunkSet processSet(IChunk chunk, IChunkGet get, IChunkSet set) {
// each heightmap gets one 16*16 array
@ -37,6 +55,7 @@ public class HeightmapProcessor implements IBatchProcessor {
int skip = 0;
int allSkipped = (1 << TYPES.length) - 1; // lowest types.length bits are set
layer:
//int layer = maxY >> 4; layer >= minY >> 4; layer--
for (int layer = set.getMaxSectionPosition(); layer >= set.getMinSectionPosition() >> 4; layer--) {
boolean hasSectionSet = set.hasSection(layer);
boolean hasSectionGet = get.hasSection(layer);
@ -93,7 +112,7 @@ public class HeightmapProcessor implements IBatchProcessor {
HeightMapType type = TYPES[i];
// ignore if that position was already set
if (!updated[i][j] && type.includes(block)) {
// mc requires + 1, heightmaps are normalized internally
// mc requires + 1, heightmaps are normalized internally, thus we need to "zero" them.
heightmaps[i][j] = ((layer - get.getMinSectionPosition()) << 4) + y + 1;
updated[i][j] = true; // mark as updated
}
@ -117,10 +136,6 @@ public class HeightmapProcessor implements IBatchProcessor {
return set;
}
private static int index(int y, int offset) {
return (y << BLOCKS_PER_Y_SHIFT) + offset;
}
@Override
public Future<IChunkSet> postProcessSet(IChunk chunk, IChunkGet get, IChunkSet set) {
return CompletableFuture.completedFuture(set);

2
worldedit-core/src/main/java/com/fastasyncworldedit/core/util/EditSessionBuilder.java
View File

@ -424,7 +424,7 @@ public class EditSessionBuilder {
} else {
relighter = NullRelighter.INSTANCE;
}
extent.addProcessor(new HeightmapProcessor());
extent.addProcessor(new HeightmapProcessor(world.getMinY(), world.getMaxY()));
if (limit != null && !limit.isUnlimited() && regionExtent != null) {
this.extent = new LimitExtent(regionExtent, limit);
} else if (limit != null && !limit.isUnlimited()) {