Merge branch 'v3.0' of github.com:webbukkit/dynmap into skin_fix

DynmapCore/src/main/resources/models_1.txt

@@ -1560,3 +1560,14 @@ patchblock:id=bubble_column
 [1.14-]patchrotate:id=lectern,data=0,roty=270
 [1.14-]patchblock:id=lectern,data=12,data=13,data=14,data=15
 [1.14-]patchrotate:id=lectern,data=0,roty=90
+# Lantern
+[1.14-]boxlist:id=lantern,data=0,box=0.3125:0.6875:0.0625:0.5:0.3125:0.6875,box=0.375:0.625:0.5:0.625:0.375:0.625,box=0.4065:0.5937:0.6875:0.9375:0.5:0.51,box=0.5:0.51:0.625:1:0.4065:0.5937
+[1.14-]boxlist:id=lantern,data=1,box=0.3125:0.6875:0:0.4375:0.3125:0.6875,box=0.375:0.625:0.4375:0.5625:0.375:0.625,box=0.4065:0.5937:0.5625:0.6875:0.5:0.51,box=0.5:0.51:0.5625:0.6875:0.4065:0.5937
+# Stonecutter
+[1.14-]boxlist:id=stonecutter,data=0,box=0:1:0:0.5625:0:1:0/1/2/2/2/2,box=0.0625:0.9375:0.5625:1:0.49:0.51:3/3/3/3/3/3
+[1.14-]patchblock:id=stonecutter,data=1
+[1.14-]patchrotate:id=stonecutter,data=0,roty=180
+[1.14-]patchblock:id=stonecutter,data=2
+[1.14-]patchrotate:id=stonecutter,data=0,roty=270
+[1.14-]patchblock:id=stonecutter,data=3
+[1.14-]patchrotate:id=stonecutter,data=0,roty=90

DynmapCore/src/main/resources/texture_1.txt

@@ -2216,6 +2216,15 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT
 [1.14-]texture:id=lectern_front
 [1.14-]texture:id=lectern_sides
 [1.14-]texture:id=lectern_top
+[1.14-]texturefile:id=lantern,filename=assets/minecraft/textures/block/lantern.png,format=CUSTOM,tile0=0:0/6:10/5:3,xcount=1,ycount=3
+[1.14-]texture:id=smithing_table_front
+[1.14-]texture:id=smithing_table_side
+[1.14-]texture:id=smithing_table_top
+[1.14-]texture:id=smithing_table_bottom
+[1.14-]texture:id=stonecutter_bottom
+[1.14-]texture:id=stonecutter_top
+[1.14-]texture:id=stonecutter_side
+[1.14-]texture:id=stonecutter_saw
 
 # Signpost
 [1.14-]block:id=oak_sign,patch0=0,patch1=1,patch2=2,patch3=3,patch4=4,patch5=5,patch6=6,patch7=7,patch8=8,patch9=9,transparency=TRANSPARENT,txtid=oak_sign
@@ -2379,3 +2388,10 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT
 [1.14-]block:id=grindstone,patch0=0:grindstone_pivot,patch1=0:grindstone_round,patch2=0:grindstone_side,patch4=0:dark_oak_log,transparency=TRANSPARENT
 # Lectern
 [1.14-]block:id=lectern,patch0=0:oak_planks,patch1=0:lectern_base,patch2=0:lectern_front,patch3=0:lectern_sides,patch4=0:lectern_top,transparency=TRANSPARENT
+# Lantern
+[1.14-]block:id=lantern,patch0=0:lantern,transparency=TRANSPARENT
+# Smithing table
+[1.14-]block:id=smithing_table,top=0:smithing_table_top,bottom=0:smithing_table_bottom,north=0:smithing_table_side,south=0:smithing_table_side,east=0:smithing_table_front,west=0:smithing_table_front,stdrot=true
+# Stonecutter
+[1.14-]block:id=stonecutter,patch0=0:stonecutter_bottom,patch1=0:stonecutter_top,patch2=0:stonecutter_side,patch3=0:stonecutter_saw,transparency=TRANSPARENT
+

spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java

@@ -966,7 +966,10 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
         else {
             dsender = new BukkitCommandSender(sender);
         }
-        return core.processCommand(dsender, cmd.getName(), commandLabel, args);
+        if (core != null)
+        	return core.processCommand(dsender, cmd.getName(), commandLabel, args);
+        else
+        	return false;
     }
 
     

spigot/src/main/java/org/dynmap/bukkit/Helper.java

@@ -35,7 +35,7 @@ public class Helper {
                 Log.info("Loading Glowstone support");
                 BukkitVersionHelper.helper = new BukkitVersionHelperGlowstone();
             }
-            else if (v.contains("(MC: 1.14.1)")) {
+            else if (v.contains("(MC: 1.14.1)") || v.contains("(MC: 1.14.2)")) {
                 BukkitVersionHelper.helper = new BukkitVersionHelperSpigot114_1();
             }
             else if (v.contains("(MC: 1.14)")) {