Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-24 11:15:21 +01:00
Code Issues Projects Releases Wiki Activity

More cleanup

Browse Source
This commit is contained in:
Mike Primm 2012-03-11 19:56:54 -05:00
parent a9214502cf
commit 6c618fa727
1 changed files with 5 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,5 @@
package org.dynmap.bukkit; package org.dynmap.bukkit;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
@ -171,43 +170,11 @@ public class NewMapChunkCache implements MapChunkCache {
try { try {
return biomemap[x - x_base][z - z_base]; return biomemap[x - x_base][z - z_base];
} catch (Exception ex) { } catch (Exception ex) {
exceptions++;
return BiomeMap.NULL; return BiomeMap.NULL;
} }
} }
private final int getSmoothColorMultiplier(int[] colormap, int width, boolean is_grass) {
int mult = 0xFFFFFF;
try {
int rx = x - x_base;
int rz = z - z_base;
BiomeMap bm = biomemap[rx][rz];
if(sameneighborbiomecnt[rx][rz] >= (byte)8) { /* All neighbors same? */
mult = colormap[bm.biomeLookup(width)];
}
else {
int raccum = 0;
int gaccum = 0;
int baccum = 0;
for(int xoff = -1; xoff < 2; xoff++) {
for(int zoff = -1; zoff < 2; zoff++) {
bm = biomemap[rx+xoff][rz+zoff];
int rmult = colormap[bm.biomeLookup(width)];
raccum += (rmult >> 16) & 0xFF;
gaccum += (rmult >> 8) & 0xFF;
baccum += rmult & 0xFF;
}
}
mult = ((raccum / 9) << 16) | ((gaccum / 9) << 8) | (baccum / 9);
}
if(is_grass)
return bm.getModifiedGrassMultiplier(mult);
else
return bm.getModifiedFoliageMultiplier(mult);
} catch (Exception x) {
Log.info("exception");
return 0xFFFFFF;
}
}
public final int getSmoothGrassColorMultiplier(int[] colormap, int width) { public final int getSmoothGrassColorMultiplier(int[] colormap, int width) {
int mult = 0xFFFFFF; int mult = 0xFFFFFF;
try { try {
@ -233,7 +200,7 @@ public class NewMapChunkCache implements MapChunkCache {
mult = ((raccum / 9) << 16) | ((gaccum / 9) << 8) | (baccum / 9); mult = ((raccum / 9) << 16) | ((gaccum / 9) << 8) | (baccum / 9);
} }
} catch (Exception x) { } catch (Exception x) {
Log.info("exception"); exceptions++;
mult = 0xFFFFFF; mult = 0xFFFFFF;
} }
return mult; return mult;
@ -263,7 +230,7 @@ public class NewMapChunkCache implements MapChunkCache {
mult = ((raccum / 9) << 16) | ((gaccum / 9) << 8) | (baccum / 9); mult = ((raccum / 9) << 16) | ((gaccum / 9) << 8) | (baccum / 9);
} }
} catch (Exception x) { } catch (Exception x) {
Log.info("exception"); exceptions++;
mult = 0xFFFFFF; mult = 0xFFFFFF;
} }
return mult; return mult;
@ -291,6 +258,7 @@ public class NewMapChunkCache implements MapChunkCache {
} }
return ((raccum / 9) << 16) | ((gaccum / 9) << 8) | (baccum / 9); return ((raccum / 9) << 16) | ((gaccum / 9) << 8) | (baccum / 9);
} catch (Exception x) { } catch (Exception x) {
exceptions++;
return 0xFFFFFF; return 0xFFFFFF;
} }
} }
@ -497,9 +465,6 @@ public class NewMapChunkCache implements MapChunkCache {
public boolean isSectionEmpty(int sy) { public boolean isSectionEmpty(int sy) {
return true; return true;
} }
public int getTopNonEmptySection() {
return -1;
}
} }
/** /**
@ -578,12 +543,7 @@ public class NewMapChunkCache implements MapChunkCache {
return chunk.getHighestBlockYAt(x, z); return chunk.getHighestBlockYAt(x, z);
} }
public boolean isSectionEmpty(int sy) { public boolean isSectionEmpty(int sy) {
//TODO return chunk.isSectionEmpty(sy); return chunk.isSectionEmpty(sy);
return false;
}
public int getTopNonEmptySection() {
return 0;
//TODO return chunk.getTopNonEmptySection();
} }
} }