From df81b096d7a49c4da7ebea953ff3b50ebb3b1937 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Sun, 25 Sep 2011 23:23:17 -0500
Subject: [PATCH] Fix vines to use foliagecolor shading, fix global default
 handling for swampshaded

---
 src/main/java/org/dynmap/DynmapPlugin.java | 3 +++
 src/main/java/org/dynmap/MapManager.java   | 5 +----
 src/main/resources/texture.txt             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/dynmap/DynmapPlugin.java b/src/main/java/org/dynmap/DynmapPlugin.java
index d9d83529..e7c66680 100644
--- a/src/main/java/org/dynmap/DynmapPlugin.java
+++ b/src/main/java/org/dynmap/DynmapPlugin.java
@@ -83,6 +83,7 @@ public class DynmapPlugin extends JavaPlugin {
     public PlayerFaces playerfacemgr;
     public Events events = new Events();
     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 */
     public boolean is_reload = false;
     private boolean generate_only = false;
@@ -248,6 +249,8 @@ public class DynmapPlugin extends JavaPlugin {
 
         Log.verbose = configuration.getBoolean("verbose", true);
         deftemplatesuffix = configuration.getString("deftemplatesuffix", "");
+        /* Default swamp shading off for 1.8, on after */
+        swampshading = configuration.getBoolean("swampshaded", !getServer().getVersion().contains("(MC: 1.8"));
         
         loadDebuggers();
 
diff --git a/src/main/java/org/dynmap/MapManager.java b/src/main/java/org/dynmap/MapManager.java
index 8ac9be04..f18d2610 100644
--- a/src/main/java/org/dynmap/MapManager.java
+++ b/src/main/java/org/dynmap/MapManager.java
@@ -46,7 +46,6 @@ public class MapManager {
     private int parallelrendercnt = 0;
     private int progressinterval = 100;
     private boolean saverestorepending = true;
-    private boolean swampshading = false;
     
     private int zoomout_period = DEFAULT_ZOOMOUT_PERIOD;	/* Zoom-out tile processing period, in seconds */
     /* Which fullrenders are active */
@@ -504,8 +503,6 @@ public class MapManager {
         progressinterval = configuration.getInteger("progressloginterval", 100);
         if(progressinterval < 100) progressinterval = 100;
         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>(
                 new Handler<MapTile>() {
@@ -1004,6 +1001,6 @@ public class MapManager {
     }    
     
     public boolean getSwampShading() {
-        return swampshading;
+        return plug_in.swampshading;
     }
 }
diff --git a/src/main/resources/texture.txt b/src/main/resources/texture.txt
index 62e28174..454a4a6c 100644
--- a/src/main/resources/texture.txt
+++ b/src/main/resources/texture.txt
@@ -520,7 +520,7 @@ block:id=104,allsides=1111,transparency=TRANSPARENT
 # Melon stem
 block:id=105,allsides=1111,transparency=TRANSPARENT
 # Vines
-block:id=106,allsides=1143,transparency=TRANSPARENT
+block:id=106,allsides=2143,transparency=TRANSPARENT
 # Fence gate
 block:id=107,allsides=4,topbottom=4004,transparency=TRANSPARENT
 # Brick stair