Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2025-01-27 01:51:43 +01:00
Code Issues Projects Releases Wiki Activity

Start refactor to support pre-1.13 and 1.13+

Browse Source
This commit is contained in:
Mike Primm 2018-08-05 14:38:13 -05:00
parent 9a53e54367
commit b4920e0246
4 changed files with 84 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/org/dynmap/bukkit/BukkitVersionHelper.java
View File

@ -8,6 +8,8 @@ import org.bukkit.ChunkSnapshot;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.dynmap.Log; import org.dynmap.Log;
import org.dynmap.renderer.DynmapBlockState;
import org.dynmap.utils.DynIntHashMap;
import org.dynmap.utils.Polygon; import org.dynmap.utils.Polygon;
/** /**
@ -44,6 +46,9 @@ public abstract class BukkitVersionHelper {
} }
return helper; return helper;
} }
public static DynIntHashMap stateByID = new DynIntHashMap();
protected BukkitVersionHelper() { protected BukkitVersionHelper() {
} }
@ -148,4 +153,25 @@ public abstract class BukkitVersionHelper {
* @param player * @param player
*/ */
public String getSkinURL(Player player) { return null; } public String getSkinURL(Player player) { return null; }
/**
* Initialize block states (org.dynmap.blockstate.DynmapBlockState)
*/
public void initializeBlockStates() {
String[] blkname = getBlockShortNames();
// Keep it simple for now - just assume 16 meta states for each
for (int i = 0; i < blkname.length; i++) {
// Only do defined names, and not "air"
if ((blkname[i] != null) && (!blkname[i].equals("air"))) {
Log.info("block " + blkname[i]);
DynmapBlockState basebs = new DynmapBlockState(null, 0, "minecraft:" + blkname, "meta=0");
stateByID.put((i << 4), basebs);
for (int m = 1; m < 16; m++) {
DynmapBlockState bs = new DynmapBlockState(basebs, m, "minecraft:" + blkname, "meta=" + m);
stateByID.put((i << 4) + m, bs);
}
}
}
stateByID.put(0, DynmapBlockState.AIR); // Include air block;
}
} }

2
src/main/java/org/dynmap/bukkit/BukkitVersionHelperCB.java
View File

@ -13,6 +13,7 @@ import org.bukkit.Server;
import org.bukkit.World; import org.bukkit.World;
import org.dynmap.Log; import org.dynmap.Log;
import org.dynmap.hdmap.HDBlockModels; import org.dynmap.hdmap.HDBlockModels;
import org.dynmap.renderer.DynmapBlockState;
import org.dynmap.utils.Polygon; import org.dynmap.utils.Polygon;
/** /**
@ -346,5 +347,4 @@ public class BukkitVersionHelperCB extends BukkitVersionHelperGeneric {
*/ */
@Override @Override
public boolean isUnloadChunkBroken() { return isBadUnload; } public boolean isUnloadChunkBroken() { return isBadUnload; }
} }

3
src/main/java/org/dynmap/bukkit/DynmapPlugin.java
View File

@ -791,6 +791,9 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
if(idx > 0) mcver = mcver.substring(0, idx); if(idx > 0) mcver = mcver.substring(0, idx);
} }
// Initialize block states
helper.initializeBlockStates();
/* Load extra biomes, if any */ /* Load extra biomes, if any */
loadExtraBiomes(mcver); loadExtraBiomes(mcver);

100
src/main/java/org/dynmap/bukkit/NewMapChunkCache.java
View File

@ -16,6 +16,7 @@ import org.dynmap.Log;
import org.dynmap.bukkit.SnapshotCache.SnapshotRec; import org.dynmap.bukkit.SnapshotCache.SnapshotRec;
import org.dynmap.common.BiomeMap; import org.dynmap.common.BiomeMap;
import org.dynmap.hdmap.HDBlockModels; import org.dynmap.hdmap.HDBlockModels;
import org.dynmap.renderer.DynmapBlockState;
import org.dynmap.renderer.RenderPatchFactory; import org.dynmap.renderer.RenderPatchFactory;
import org.dynmap.utils.DynIntHashMap; import org.dynmap.utils.DynIntHashMap;
import org.dynmap.utils.MapChunkCache; import org.dynmap.utils.MapChunkCache;
@ -61,6 +62,10 @@ public class NewMapChunkCache extends MapChunkCache {
return (cy << 8) | (cz << 4) | cx; return (cy << 8) | (cz << 4) | cx;
} }
private static DynmapBlockState getTypeAt(ChunkSnapshot ss, int x, int y, int z) {
return (DynmapBlockState) BukkitVersionHelper.stateByID.get((ss.getBlockTypeId(x, y, z) << 4) | ss.getBlockData(x, y, z));
}
/** /**
* Iterator for traversing map chunk cache (base is for non-snapshot) * Iterator for traversing map chunk cache (base is for non-snapshot)
*/ */
@ -69,8 +74,7 @@ public class NewMapChunkCache extends MapChunkCache {
private int x, y, z, chunkindex, bx, bz, off; private int x, y, z, chunkindex, bx, bz, off;
private ChunkSnapshot snap; private ChunkSnapshot snap;
private BlockStep laststep; private BlockStep laststep;
private int typeid = -1; private DynmapBlockState type = null;
private int blkdata = -1;
private final int worldheight; private final int worldheight;
private final int x_base; private final int x_base;
private final int z_base; private final int z_base;
@ -101,23 +105,17 @@ public class NewMapChunkCache extends MapChunkCache {
} }
laststep = BlockStep.Y_MINUS; laststep = BlockStep.Y_MINUS;
if((y >= 0) && (y < worldheight)) if((y >= 0) && (y < worldheight))
typeid = blkdata = -1; type = null;
else else
typeid = blkdata = 0; type = DynmapBlockState.AIR;
} }
@Override @Override
public final int getBlockTypeID() { public final DynmapBlockState getBlockType() {
if(typeid < 0) { if (type == null) {
typeid = snap.getBlockTypeId(bx, y, bz); type = getTypeAt(snap, bx, y, bz);
} }
return typeid; return type;
}
@Override
public final int getBlockData() {
if(blkdata < 0) {
blkdata = snap.getBlockData(bx, y, bz);
}
return blkdata;
} }
@Override @Override
public int getBlockSkyLight() { public int getBlockSkyLight() {
@ -373,8 +371,7 @@ public class NewMapChunkCache extends MapChunkCache {
*/ */
@Override @Override
public final void stepPosition(BlockStep step) { public final void stepPosition(BlockStep step) {
typeid = -1; type = null;
blkdata = -1;
switch(step.ordinal()) { switch(step.ordinal()) {
case 0: case 0:
x++; x++;
@ -395,7 +392,7 @@ public class NewMapChunkCache extends MapChunkCache {
case 1: case 1:
y++; y++;
if(y >= worldheight) { if(y >= worldheight) {
typeid = blkdata = 0; type = DynmapBlockState.AIR;
} }
break; break;
case 2: case 2:
@ -433,7 +430,7 @@ public class NewMapChunkCache extends MapChunkCache {
case 4: case 4:
y--; y--;
if(y < 0) { if(y < 0) {
typeid = blkdata = 0; type = DynmapBlockState.AIR;
} }
break; break;
case 5: case 5:
@ -479,10 +476,10 @@ public class NewMapChunkCache extends MapChunkCache {
laststep = BlockStep.Y_MINUS; laststep = BlockStep.Y_MINUS;
this.y = y; this.y = y;
if((y < 0) || (y >= worldheight)) { if((y < 0) || (y >= worldheight)) {
typeid = blkdata = 0; type = DynmapBlockState.AIR;
} }
else { else {
typeid = blkdata = -1; type = null;
} }
} }
@Override @Override
@ -498,24 +495,24 @@ public class NewMapChunkCache extends MapChunkCache {
return z; return z;
} }
@Override @Override
public final int getBlockTypeIDAt(BlockStep s) { public final DynmapBlockState getBlockTypeAt(BlockStep s) {
if(s == BlockStep.Y_MINUS) { if(s == BlockStep.Y_MINUS) {
if(y > 0) if(y > 0)
return snap.getBlockTypeId(bx, y-1, bz); return getTypeAt(snap, bx, y-1, bz);
} }
else if(s == BlockStep.Y_PLUS) { else if(s == BlockStep.Y_PLUS) {
if(y < (worldheight-1)) if(y < (worldheight-1))
return snap.getBlockTypeId(bx, y+1, bz); return getTypeAt(snap, bx, y+1, bz);
} }
else { else {
BlockStep ls = laststep; BlockStep ls = laststep;
stepPosition(s); stepPosition(s);
int tid = snap.getBlockTypeId(bx, y, bz); DynmapBlockState tid = getTypeAt(snap, bx, y, bz);
unstepPosition(); unstepPosition();
laststep = ls; laststep = ls;
return tid; return tid;
} }
return 0; return DynmapBlockState.AIR;
} }
@Override @Override
public BlockStep getLastStep() { public BlockStep getLastStep() {
@ -557,27 +554,15 @@ public class NewMapChunkCache extends MapChunkCache {
return null; return null;
} }
@Override @Override
public int getBlockTypeIDAt(int xoff, int yoff, int zoff) { public DynmapBlockState getBlockTypeAt(int xoff, int yoff, int zoff) {
int xx = this.x + xoff; int xx = this.x + xoff;
int yy = this.y + yoff; int yy = this.y + yoff;
int zz = this.z + zoff; int zz = this.z + zoff;
int idx = ((xx >> 4) - x_min) + (((zz >> 4) - z_min) * x_dim); int idx = ((xx >> 4) - x_min) + (((zz >> 4) - z_min) * x_dim);
try { try {
return snaparray[idx].getBlockTypeId(xx & 0xF, yy, zz & 0xF); return getTypeAt(snaparray[idx], xx & 0xF, yy, zz & 0xF);
} catch (Exception x) { } catch (Exception x) {
return 0; return DynmapBlockState.AIR;
}
}
@Override
public int getBlockDataAt(int xoff, int yoff, int zoff) {
int xx = this.x + xoff;
int yy = this.y + yoff;
int zz = this.z + zoff;
int idx = ((xx >> 4) - x_min) + (((zz >> 4) - z_min) * x_dim);
try {
return snaparray[idx].getBlockData(xx & 0xF, yy, zz & 0xF);
} catch (Exception x) {
return 0;
} }
} }
@Override @Override
@ -600,6 +585,7 @@ public class NewMapChunkCache extends MapChunkCache {
OurEndMapIterator(int x0, int y0, int z0) { OurEndMapIterator(int x0, int y0, int z0) {
super(x0, y0, z0); super(x0, y0, z0);
} }
@Override
public final int getBlockSkyLight() { public final int getBlockSkyLight() {
return 15; return 15;
} }
@ -609,35 +595,47 @@ public class NewMapChunkCache extends MapChunkCache {
*/ */
private static class EmptyChunk implements ChunkSnapshot { private static class EmptyChunk implements ChunkSnapshot {
/* Need these for interface, but not used */ /* Need these for interface, but not used */
@Override
public int getX() { return 0; } public int getX() { return 0; }
@Override
public int getZ() { return 0; } public int getZ() { return 0; }
@Override
public String getWorldName() { return ""; } public String getWorldName() { return ""; }
@Override
public long getCaptureFullTime() { return 0; } public long getCaptureFullTime() { return 0; }
@Override
public final int getBlockTypeId(int x, int y, int z) { public final int getBlockTypeId(int x, int y, int z) {
return 0; return 0;
} }
@Override
public final int getBlockData(int x, int y, int z) { public final int getBlockData(int x, int y, int z) {
return 0; return 0;
} }
@Override
public final int getBlockSkyLight(int x, int y, int z) { public final int getBlockSkyLight(int x, int y, int z) {
return 15; return 15;
} }
@Override
public final int getBlockEmittedLight(int x, int y, int z) { public final int getBlockEmittedLight(int x, int y, int z) {
return 0; return 0;
} }
@Override
public final int getHighestBlockYAt(int x, int z) { public final int getHighestBlockYAt(int x, int z) {
return 0; return 0;
} }
@Override
public Biome getBiome(int x, int z) { public Biome getBiome(int x, int z) {
return null; return null;
} }
@Override
public double getRawBiomeTemperature(int x, int z) { public double getRawBiomeTemperature(int x, int z) {
return 0.0; return 0.0;
} }
@Override
public double getRawBiomeRainfall(int x, int z) { public double getRawBiomeRainfall(int x, int z) {
return 0.0; return 0.0;
} }
@Override
public boolean isSectionEmpty(int sy) { public boolean isSectionEmpty(int sy) {
return true; return true;
} }
@ -650,32 +648,44 @@ public class NewMapChunkCache extends MapChunkCache {
private int fillid; private int fillid;
PlainChunk(int fillid) { this.fillid = fillid; } PlainChunk(int fillid) { this.fillid = fillid; }
/* Need these for interface, but not used */ /* Need these for interface, but not used */
@Override
public int getX() { return 0; } public int getX() { return 0; }
@Override
public int getZ() { return 0; } public int getZ() { return 0; }
@Override
public String getWorldName() { return ""; } public String getWorldName() { return ""; }
@Override
public Biome getBiome(int x, int z) { return null; } public Biome getBiome(int x, int z) { return null; }
@Override
public double getRawBiomeTemperature(int x, int z) { return 0.0; } public double getRawBiomeTemperature(int x, int z) { return 0.0; }
@Override
public double getRawBiomeRainfall(int x, int z) { return 0.0; } public double getRawBiomeRainfall(int x, int z) { return 0.0; }
@Override
public long getCaptureFullTime() { return 0; } public long getCaptureFullTime() { return 0; }
@Override
public final int getBlockTypeId(int x, int y, int z) { public final int getBlockTypeId(int x, int y, int z) {
if(y < 64) return fillid; if(y < 64) return fillid;
return 0; return 0;
} }
@Override
public final int getBlockData(int x, int y, int z) { public final int getBlockData(int x, int y, int z) {
return 0; return 0;
} }
@Override
public final int getBlockSkyLight(int x, int y, int z) { public final int getBlockSkyLight(int x, int y, int z) {
if(y < 64) if(y < 64)
return 0; return 0;
return 15; return 15;
} }
@Override
public final int getBlockEmittedLight(int x, int y, int z) { public final int getBlockEmittedLight(int x, int y, int z) {
return 0; return 0;
} }
@Override
public final int getHighestBlockYAt(int x, int z) { public final int getHighestBlockYAt(int x, int z) {
return 64; return 64;
} }
@Override
public boolean isSectionEmpty(int sy) { public boolean isSectionEmpty(int sy) {
return (sy < 4); return (sy < 4);
} }
@ -833,9 +843,7 @@ public class NewMapChunkCache extends MapChunkCache {
int te_z = helper.getTileEntityZ(t); int te_z = helper.getTileEntityZ(t);
int cx = te_x & 0xF; int cx = te_x & 0xF;
int cz = te_z & 0xF; int cz = te_z & 0xF;
int blkid = ss.getBlockTypeId(cx, te_y, cz); String[] te_fields = HDBlockModels.getTileEntityFieldsNeeded(getTypeAt(ss, cx, te_y, cz));
int blkdat = ss.getBlockData(cx, te_y, cz);
String[] te_fields = HDBlockModels.getTileEntityFieldsNeeded(blkid, blkdat);
if(te_fields != null) { if(te_fields != null) {
Object nbtcompound = helper.readTileEntityNBT(t); Object nbtcompound = helper.readTileEntityNBT(t);