Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-12-28 03:27:36 +01:00
Code Issues Projects Releases Wiki Activity

Fix vines to use foliagecolor shading, fix global default handling for swampshaded

Browse Source
This commit is contained in:
Mike Primm 2011-09-25 23:23:17 -05:00
parent 658a4aba3f
commit df81b096d7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,6 +83,7 @@ public class DynmapPlugin extends JavaPlugin {
public PlayerFaces playerfacemgr; public PlayerFaces playerfacemgr;
public Events events = new Events(); public Events events = new Events();
public String deftemplatesuffix = ""; public String deftemplatesuffix = "";
boolean swampshading = false;
/* Flag to let code know that we're doing reload - make sure we don't double-register event handlers */ /* Flag to let code know that we're doing reload - make sure we don't double-register event handlers */
public boolean is_reload = false; public boolean is_reload = false;
private boolean generate_only = false; private boolean generate_only = false;
@ -248,6 +249,8 @@ public class DynmapPlugin extends JavaPlugin {
Log.verbose = configuration.getBoolean("verbose", true); Log.verbose = configuration.getBoolean("verbose", true);
deftemplatesuffix = configuration.getString("deftemplatesuffix", ""); deftemplatesuffix = configuration.getString("deftemplatesuffix", "");
/* Default swamp shading off for 1.8, on after */
swampshading = configuration.getBoolean("swampshaded", !getServer().getVersion().contains("(MC: 1.8"));
loadDebuggers(); loadDebuggers();

5
src/main/java/org/dynmap/MapManager.java
View File

@ -46,7 +46,6 @@ public class MapManager {
private int parallelrendercnt = 0; private int parallelrendercnt = 0;
private int progressinterval = 100; private int progressinterval = 100;
private boolean saverestorepending = true; private boolean saverestorepending = true;
private boolean swampshading = false;
private int zoomout_period = DEFAULT_ZOOMOUT_PERIOD; /* Zoom-out tile processing period, in seconds */ private int zoomout_period = DEFAULT_ZOOMOUT_PERIOD; /* Zoom-out tile processing period, in seconds */
/* Which fullrenders are active */ /* Which fullrenders are active */
@ -504,8 +503,6 @@ public class MapManager {
progressinterval = configuration.getInteger("progressloginterval", 100); progressinterval = configuration.getInteger("progressloginterval", 100);
if(progressinterval < 100) progressinterval = 100; if(progressinterval < 100) progressinterval = 100;
saverestorepending = configuration.getBoolean("saverestorepending", true); saverestorepending = configuration.getBoolean("saverestorepending", true);
/* Default swamp shading off for 1.8, on after */
swampshading = configuration.getBoolean("swampshaded", !plugin.getServer().getVersion().contains("(MC: 1.8"));
this.tileQueue = new AsynchronousQueue<MapTile>( this.tileQueue = new AsynchronousQueue<MapTile>(
new Handler<MapTile>() { new Handler<MapTile>() {
@ -1004,6 +1001,6 @@ public class MapManager {
} }
public boolean getSwampShading() { public boolean getSwampShading() {
return swampshading; return plug_in.swampshading;
} }
} }

2
src/main/resources/texture.txt
View File

@ -520,7 +520,7 @@ block:id=104,allsides=1111,transparency=TRANSPARENT
# Melon stem # Melon stem
block:id=105,allsides=1111,transparency=TRANSPARENT block:id=105,allsides=1111,transparency=TRANSPARENT
# Vines # Vines
block:id=106,allsides=1143,transparency=TRANSPARENT block:id=106,allsides=2143,transparency=TRANSPARENT
# Fence gate # Fence gate
block:id=107,allsides=4,topbottom=4004,transparency=TRANSPARENT block:id=107,allsides=4,topbottom=4004,transparency=TRANSPARENT
# Brick stair # Brick stair