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

Set empty block count when using fastmode on 1.17 (#1710)

Browse Source 
* Set empty block count when using fastmode on 1.17
Fixes #1666

* Update legacy adapters
This commit is contained in:
Jordan 2022-04-21 12:11:23 +01:00 committed by GitHub
parent f5ef0cadb6
commit 65349392a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 56 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
worldedit-bukkit/adapters/adapter-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_17_R1_2/PaperweightPlatformAdapter.java
View File

@ -303,11 +303,20 @@ public final class PaperweightPlatformAdapter extends NMSAdapter {
final int[] blocksCopy = FaweCache.INSTANCE.SECTION_BLOCKS.get(); final int[] blocksCopy = FaweCache.INSTANCE.SECTION_BLOCKS.get();
try { try {
int num_palette; int num_palette;
final short[] nonEmptyBlockCount = fastMode ? new short[1] : null;
if (get == null) { if (get == null) {
num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter, nonEmptyBlockCount);
);
} else { } else {
num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter); num_palette = createPalette(
layer,
blockToPalette,
paletteToBlock,
blocksCopy,
get,
set,
adapter,
nonEmptyBlockCount
);
} }
// BlockStates // BlockStates
int bitsPerEntry = MathMan.log2nlz(num_palette - 1); int bitsPerEntry = MathMan.log2nlz(num_palette - 1);
@ -377,6 +386,12 @@ public final class PaperweightPlatformAdapter extends NMSAdapter {
if (!fastMode) { if (!fastMode) {
levelChunkSection.recalcBlockCounts(); levelChunkSection.recalcBlockCounts();
} else {
try {
fieldNonEmptyBlockCount.set(levelChunkSection, nonEmptyBlockCount[0]);
} catch (IllegalAccessException e) {
throw new RuntimeException(e);
}
} }
return levelChunkSection; return levelChunkSection;
} catch (final Throwable e) { } catch (final Throwable e) {

4
worldedit-bukkit/adapters/adapter-1_18/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_18_R1/PaperweightPlatformAdapter.java
View File

@ -341,9 +341,9 @@ public final class PaperweightPlatformAdapter extends NMSAdapter {
try { try {
int num_palette; int num_palette;
if (get == null) { if (get == null) {
num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter); num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter, null);
} else { } else {
num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter); num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter, null);
} }
int bitsPerEntry = MathMan.log2nlz(num_palette - 1); int bitsPerEntry = MathMan.log2nlz(num_palette - 1);

4
worldedit-bukkit/adapters/adapter-1_18_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_18_R2/PaperweightPlatformAdapter.java
View File

@ -342,9 +342,9 @@ public final class PaperweightPlatformAdapter extends NMSAdapter {
try { try {
int num_palette; int num_palette;
if (get == null) { if (get == null) {
num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter); num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter, null);
} else { } else {
num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter); num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter, null);
} }
int bitsPerEntry = MathMan.log2nlz(num_palette - 1); int bitsPerEntry = MathMan.log2nlz(num_palette - 1);

BIN
worldedit-bukkit/adapters/adapter-legacy/src/main/resources/worldedit-adapters.jar
View File

Binary file not shown.

32
worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/adapter/NMSAdapter.java
View File

@ -14,13 +14,19 @@ public class NMSAdapter implements FAWEPlatformAdapterImpl {
int[] paletteToBlock, int[] paletteToBlock,
int[] blocksCopy, int[] blocksCopy,
char[] set, char[] set,
CachedBukkitAdapter adapter CachedBukkitAdapter adapter,
short[] nonEmptyBlockCount
) { ) {
short nonAir = 4096;
int num_palette = 0; int num_palette = 0;
for (int i = 0; i < 4096; i++) { for (int i = 0; i < 4096; i++) {
char ordinal = set[i]; char ordinal = set[i];
if (ordinal == BlockTypesCache.ReservedIDs.__RESERVED__) { switch (ordinal) {
case BlockTypesCache.ReservedIDs.__RESERVED__ -> {
ordinal = BlockTypesCache.ReservedIDs.AIR; ordinal = BlockTypesCache.ReservedIDs.AIR;
nonAir--;
}
case BlockTypesCache.ReservedIDs.AIR, BlockTypesCache.ReservedIDs.CAVE_AIR, BlockTypesCache.ReservedIDs.VOID_AIR -> nonAir--;
} }
int palette = blockToPalette[ordinal]; int palette = blockToPalette[ordinal];
if (palette == Integer.MAX_VALUE) { if (palette == Integer.MAX_VALUE) {
@ -46,6 +52,10 @@ public class NMSAdapter implements FAWEPlatformAdapterImpl {
int palette = blockToPalette[ordinal]; int palette = blockToPalette[ordinal];
blocksCopy[i] = palette; blocksCopy[i] = palette;
} }
if (nonEmptyBlockCount != null) {
nonEmptyBlockCount[0] = nonAir;
}
return num_palette; return num_palette;
} }
@ -56,20 +66,29 @@ public class NMSAdapter implements FAWEPlatformAdapterImpl {
int[] blocksCopy, int[] blocksCopy,
Function<Integer, char[]> get, Function<Integer, char[]> get,
char[] set, char[] set,
CachedBukkitAdapter adapter CachedBukkitAdapter adapter,
short[] nonEmptyBlockCount
) { ) {
short nonAir = 4096;
int num_palette = 0; int num_palette = 0;
char[] getArr = null; char[] getArr = null;
for (int i = 0; i < 4096; i++) { for (int i = 0; i < 4096; i++) {
char ordinal = set[i]; char ordinal = set[i];
if (ordinal == BlockTypesCache.ReservedIDs.__RESERVED__) { switch (ordinal) {
case BlockTypesCache.ReservedIDs.__RESERVED__ -> {
if (getArr == null) { if (getArr == null) {
getArr = get.apply(layer); getArr = get.apply(layer);
} }
ordinal = getArr[i]; ordinal = getArr[i];
if (ordinal == BlockTypesCache.ReservedIDs.__RESERVED__) { switch (ordinal) {
case BlockTypesCache.ReservedIDs.__RESERVED__ -> {
ordinal = BlockTypesCache.ReservedIDs.AIR; ordinal = BlockTypesCache.ReservedIDs.AIR;
nonAir--;
} }
case BlockTypesCache.ReservedIDs.AIR, BlockTypesCache.ReservedIDs.CAVE_AIR, BlockTypesCache.ReservedIDs.VOID_AIR -> nonAir--;
}
}
case BlockTypesCache.ReservedIDs.AIR, BlockTypesCache.ReservedIDs.CAVE_AIR, BlockTypesCache.ReservedIDs.VOID_AIR -> nonAir--;
} }
int palette = blockToPalette[ordinal]; int palette = blockToPalette[ordinal];
if (palette == Integer.MAX_VALUE) { if (palette == Integer.MAX_VALUE) {
@ -101,6 +120,9 @@ public class NMSAdapter implements FAWEPlatformAdapterImpl {
blocksCopy[i] = palette; blocksCopy[i] = palette;
} }
if (nonEmptyBlockCount != null) {
nonEmptyBlockCount[0] = nonAir;
}
return num_palette; return num_palette;
} }