Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-06-25 06:04:47 +02:00
Code Issues Projects Releases Wiki Activity

Handle pre-1.16 chunks in forge 1.16+

Browse Source
This commit is contained in:
Mike Primm 2020-08-15 19:29:29 -05:00
parent c867735c1a
commit 60a23a04c8
2 changed files with 67 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
DynmapCore/src/main/java/org/dynmap/utils/DataBitsPacked.java Normal file
View File

@ -0,0 +1,53 @@
package org.dynmap.utils;
// Pre 1.16 chunk section data array
public class DataBitsPacked {
private final long[] values;
private final int bitsperrec;
private final long valuemask;
private final int length;
public static int calcLongCount(int i, int j) {
if (j == 0) {
return 0;
} else if (i == 0) {
return j;
} else {
if (i < 0) {
j *= -1;
}
int k = i % j;
return k == 0 ? i : i + j - k;
}
}
public DataBitsPacked(int bitsperrec, int length, long[] values) {
this.length = length;
this.bitsperrec = bitsperrec;
this.values = values;
this.valuemask = (1L << bitsperrec) - 1L;
int properlength = calcLongCount(length * bitsperrec, 64) / 64;
if (values.length != properlength) {
throw new IllegalArgumentException("Invalid length given for storage, got: " + values.length + " but expected: " + properlength);
}
}
public int getAt(int offset) {
int j = offset * this.bitsperrec;
int k = j >> 6;
int l = (offset + 1) * this.bitsperrec - 1 >> 6;
int i1 = j ^ k << 6;
if (k == l) {
return (int) (this.values[k] >>> i1 & this.valuemask);
} else {
int j1 = 64 - i1;
return (int) ((this.values[k] >>> i1 | this.values[l] << j1) & this.valuemask);
}
}
}

18
forge-1.16.1/src/main/java/org/dynmap/forge_1_16_1/ChunkSnapshot.java
View File

@ -4,6 +4,7 @@ import java.util.Arrays;
import org.dynmap.Log;
import org.dynmap.renderer.DynmapBlockState;
import org.dynmap.utils.DataBitsPacked;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.ListNBT;
@ -178,16 +179,25 @@ public class ChunkSnapshot
palette[pi] = DynmapBlockState.AIR;
}
}
int bitsperblock = (statelist.length * 64) / 4096;
BitArray db = new BitArray(bitsperblock, 4096, statelist);
int recsperblock = (4096 + statelist.length - 1) / statelist.length;
int bitsperblock = 64 / recsperblock;
BitArray db = null;
DataBitsPacked dbp = null;
try {
db = new BitArray(bitsperblock, 4096, statelist);
} catch (Exception x) { // Handle legacy encoded
bitsperblock = (statelist.length * 64) / 4096;
dbp = new DataBitsPacked(bitsperblock, 4096, statelist);
}
if (bitsperblock > 8) { // Not palette
for (int j = 0; j < 4096; j++) {
states[j] = DynmapBlockState.getStateByGlobalIndex(db.getAt(j));
int v = (dbp != null) ? dbp.getAt(j) : db.getAt(j);
states[j] = DynmapBlockState.getStateByGlobalIndex(v);
}
}
else {
for (int j = 0; j < 4096; j++) {
int v = db.getAt(j);
int v = (dbp != null) ? dbp.getAt(j) : db.getAt(j);
states[j] = (v < palette.length) ? palette[v] : DynmapBlockState.AIR;
}
}