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

DynmapCore/src/main/resources/models_1.txt

@@ -1423,7 +1423,8 @@ patchblock:id=bubble_column
 # Wither rose
 # Lily of the valley
 # Bamboo Sapling
-[1.14-]patchblock:id=cornflower,id=wither_rose,id=lily_of_the_valley,id=bamboo_sapling,patch0=VertX1Z0ToX0Z1,patch1=VertX1Z0ToX0Z1@90
+# Sweet berry bush
+[1.14-]patchblock:id=cornflower,id=wither_rose,id=lily_of_the_valley,id=bamboo_sapling,id=sweet_berry_bush,patch0=VertX1Z0ToX0Z1,patch1=VertX1Z0ToX0Z1@90
 
 # Potted cornflower
 [1.14-]patchblock:id=potted_cornflower,patch0=FlowerPotTop,patch1=FlowerPotBottom,patch2=FlowerPotSide,patch3=FlowerPotSide@90,patch4=FlowerPotSide@180,patch5=FlowerPotSide@270,patch6=FlowerPotDirt,patch7=FlowerPotFlower,patch8=FlowerPotFlower@90
@@ -1484,3 +1485,78 @@ patchblock:id=bubble_column
 [1.14-]customblock:id=brick_wall,id=prismarine_wall,id=red_sandstone_wall,id=mossy_stone_brick_wall,id=granite_wall,id=stone_brick_wall,id=nether_brick_wall,id=andesite_wall,id=red_nether_brick_wall,id=sandstone_wall,id=end_stone_brick_wall,id=diorite_wall,class=org.dynmap.hdmap.renderer.FenceWallBlockStateRenderer,type=wall
 # Scaffolding
 [1.14-]boxlist:id=scaffolding,box=0:1:0.99:1:0:1:0/0/-1/-1/-1/-1,box=0:0.125:0:1:0:0.125:2/-1/1/1/1/1,box=0:0.125:0:1:0.875:1:2/-1/1/1/1/1,box=0.875:1:0:1:0.875:1:2/-1/1/1/1/1,box=0.875:1:0:1:0:0.125:2/-1/1/1/1/1,box=0.125:0.875:0.875:1:0:0.125:2/-1/1/1/1/1,box=0.125:0.875:0.875:1:0.875:1:2/-1/1/1/1/1,box=0.875:1:0.875:1:0.125:0.875:2/-1/1/1/1/1,box=0:0.125:0.875:1:0.125:0.875:2/-1/1/1/1/1
+# Composter
+[1.14-]boxlist:id=composter,box=0:1:0:0.125:0:1:1/3/-1/-1/-1/-1,box=0:0.125:0:1:0:1:-1/0/2/2/2/2,box=0.875:1:0:1:0:1:-1/0/2/2/2/2,box=0.125:0.875:0:1:0:0.125:-1/0/2/2/2/2,box=0.125:0.875:0:1:0.875:1:-1/0/2/2/2/2
+# Jigsaw
+[1.14-]boxlist:id=jigsaw,data=4,box=0:1:0:1:0:1:0/1/2/2/2/2
+[1.14-]patchblock:id=jigsaw,data=0
+[1.14-]patchrotate:id=jigsaw,data=4,rotx=90
+[1.14-]patchblock:id=jigsaw,data=1
+[1.14-]patchrotate:id=jigsaw,data=4,rotx=90,roty=90
+[1.14-]patchblock:id=jigsaw,data=2
+[1.14-]patchrotate:id=jigsaw,data=4,rotx=90,roty=180
+[1.14-]patchblock:id=jigsaw,data=3
+[1.14-]patchrotate:id=jigsaw,data=4,rotx=90,roty=270
+[1.14-]patchblock:id=jigsaw,data=5
+[1.14-]patchrotate:id=jigsaw,data=4,rotx=180
+# Loom
+[1.14-]boxlist:id=loom,data=0,box=0:1:0:1:0:1:0/1/3/3/2/3
+[1.14-]patchblock:id=loom,data=1
+[1.14-]patchrotate:id=loom,data=0,roty=180
+[1.14-]patchblock:id=loom,data=2
+[1.14-]patchrotate:id=loom,data=0,roty=270
+[1.14-]patchblock:id=loom,data=3
+[1.14-]patchrotate:id=loom,data=0,roty=90
+# Barrel
+[1.14-]boxlist:id=barrel,data=8,data=9,box=0:1:0:1:0:1:0/1/2/2/2/2
+[1.14-]patchblock:id=barrel,data=0,data=1
+[1.14-]patchrotate:id=barrel,data=8,rotx=90
+[1.14-]patchblock:id=barrel,data=2,data=3
+[1.14-]patchrotate:id=barrel,data=8,rotx=90,roty=90
+[1.14-]patchblock:id=barrel,data=4,data=5
+[1.14-]patchrotate:id=barrel,data=8,rotx=90,roty=180
+[1.14-]patchblock:id=barrel,data=6,data=7
+[1.14-]patchrotate:id=barrel,data=8,rotx=90,roty=270
+[1.14-]patchblock:id=barrel,data=10,data=11
+[1.14-]patchrotate:id=barrel,data=8,rotx=180
+# Smoker
+# Blast furnace
+[1.14-]boxlist:id=smoker,id=blast_furnace,data=0,data=1,box=0:1:0:1:0:1:0/1/3/3/2/3
+[1.14-]patchblock:id=smoker,id=blast_furnace,data=2,data=3
+[1.14-]patchrotate:id=smoker,data=0,roty=180
+[1.14-]patchblock:id=smoker,id=blast_furnace,data=4,data=5
+[1.14-]patchrotate:id=smoker,data=0,roty=270
+[1.14-]patchblock:id=smoker,id=blast_furnace,data=6,data=7
+[1.14-]patchrotate:id=smoker,data=0,roty=90
+# Grindstone
+[1.14-]boxlist:id=grindstone,data=0,box=0.75:0.875:0:0.4375:0.375:0.625:4/-1/4/4/4/4,box=0.125:0.25:0:0.4375:0.375:0.625:4/-1/4/4/4,box=0.125:0.25:0.4375:0.8325:0.3125:0.6875:0/0/0/0/0/0,box=0.25:0.75:0.25:1:0.125:0.875:1/1/2/2/1/1
+[1.14-]patchblock:id=grindstone,data=1
+[1.14-]patchrotate:id=grindstone,data=0,roty=180
+[1.14-]patchblock:id=grindstone,data=2
+[1.14-]patchrotate:id=grindstone,data=0,roty=270
+[1.14-]patchblock:id=grindstone,data=3
+[1.14-]patchrotate:id=grindstone,data=0,roty=90
+[1.14-]patchblock:id=grindstone,data=4
+[1.14-]patchrotate:id=grindstone,data=0,rotx=90
+[1.14-]patchblock:id=grindstone,data=5
+[1.14-]patchrotate:id=grindstone,data=0,rotx=90,roty=180
+[1.14-]patchblock:id=grindstone,data=6
+[1.14-]patchrotate:id=grindstone,data=0,rotx=90,roty=270
+[1.14-]patchblock:id=grindstone,data=7
+[1.14-]patchrotate:id=grindstone,data=0,rotx=90,roty=90
+[1.14-]patchblock:id=grindstone,data=8
+[1.14-]patchrotate:id=grindstone,data=0,rotx=180
+[1.14-]patchblock:id=grindstone,data=9
+[1.14-]patchrotate:id=grindstone,data=0,rotx=180,roty=180
+[1.14-]patchblock:id=grindstone,data=10
+[1.14-]patchrotate:id=grindstone,data=0,rotx=180,roty=90
+[1.14-]patchblock:id=grindstone,data=11
+[1.14-]patchrotate:id=grindstone,data=0,rotx=180,roty=270
+# Lectern
+[1.14-]boxlist:id=lectern,data=0,data=1,data=2,data=3,box=0:1:0:0.125:0:1:0/1/1/1/1/1,box=0.25:0.75:0.125:0.9375:0.25:0.75:-1/-1/3/3/2/2,box=0.01:0.99:0.75:1:0.1875:1:0/4/3/3/3/3
+[1.14-]patchblock:id=lectern,data=4,data=5,data=6,data=7
+[1.14-]patchrotate:id=lectern,data=0,roty=180
+[1.14-]patchblock:id=lectern,data=8,data=9,data=10,data=11
+[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

DynmapCore/src/main/resources/texture_1.txt

@@ -2175,6 +2175,47 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT
 [1.14-]texture:id=scaffolding_top
 [1.14-]texture:id=scaffolding_side
 [1.14-]texture:id=scaffolding_bottom
+[1.14-]texture:id=composter_top
+[1.14-]texture:id=composter_side
+[1.14-]texture:id=composter_bottom
+[1.14-]texture:id=jigsaw_bottom
+[1.14-]texture:id=jigsaw_side
+[1.14-]texture:id=jigsaw_top
+[1.14-]texture:id=loom_bottom
+[1.14-]texture:id=loom_side
+[1.14-]texture:id=loom_top
+[1.14-]texture:id=loom_front
+[1.14-]texture:id=barrel_bottom
+[1.14-]texture:id=barrel_side
+[1.14-]texture:id=barrel_top
+[1.14-]texture:id=barrel_top_open
+[1.14-]texture:id=smoker_bottom
+[1.14-]texture:id=smoker_side
+[1.14-]texture:id=smoker_top
+[1.14-]texture:id=smoker_front_on
+[1.14-]texture:id=smoker_front
+[1.14-]texture:id=blast_furnace_side
+[1.14-]texture:id=blast_furnace_top
+[1.14-]texture:id=blast_furnace_front_on
+[1.14-]texture:id=blast_furnace_front
+[1.14-]texture:id=cartography_table_top
+[1.14-]texture:id=cartography_table_side1
+[1.14-]texture:id=cartography_table_side2
+[1.14-]texture:id=cartography_table_side3
+[1.14-]texture:id=fletching_table_top
+[1.14-]texture:id=fletching_table_front
+[1.14-]texture:id=fletching_table_side
+[1.14-]texture:id=sweet_berry_bush_stage0
+[1.14-]texture:id=sweet_berry_bush_stage1
+[1.14-]texture:id=sweet_berry_bush_stage2
+[1.14-]texture:id=sweet_berry_bush_stage3
+[1.14-]texture:id=grindstone_pivot
+[1.14-]texture:id=grindstone_round
+[1.14-]texture:id=grindstone_side
+[1.14-]texture:id=lectern_base
+[1.14-]texture:id=lectern_front
+[1.14-]texture:id=lectern_sides
+[1.14-]texture:id=lectern_top
 
 # 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
@@ -2310,3 +2351,31 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT
 [1.14-]block:id=diorite_wall,patch0-2=0:diorite,transparency=TRANSPARENT
 # Scaffolding
 [1.14-]block:id=scaffolding,patch0=0:scaffolding_top,patch1=0:scaffolding_side,patch2=0:scaffolding_bottom,transparency=TRANSPARENT
+# Composter
+[1.14-]block:id=composter,patch0=0:composter_top,patch1=0:composter_bottom,patch2=0:composter_side,patch3=0:composter_bottom,transparency=TRANSPARENT
+# Jigsaw
+[1.14-]block:id=jigsaw,patch0=0:jigsaw_bottom,patch1=0:jigsaw_top,patch2=0:jigsaw_side
+# Loom
+[1.14-]block:id=loom,patch0=0:loom_bottom,patch1=0:loom_top,patch2=0:loom_front,patch3=0:loom_side
+# Barrel
+[1.14-]block:id=barrel,data=0,data=2,data=4,data=6,data=8,data=10,patch0=0:barrel_bottom,patch1=0:barrel_top_open,patch2=0:barrel_side
+[1.14-]block:id=barrel,data=1,data=3,data=5,data=7,data=9,data=11,patch0=0:barrel_bottom,patch1=0:barrel_top,patch2=0:barrel_side
+# Smoker
+[1.14-]block:id=smoker,data=0,data=2,data=4,data=6,patch0=0:smoker_bottom,patch1=0:smoker_top,patch2=0:smoker_front_on,patch3=0:smoker_side
+[1.14-]block:id=smoker,data=1,data=3,data=5,data=7,patch0=0:smoker_bottom,patch1=0:smoker_top,patch2=0:smoker_front,patch3=0:smoker_side
+# Blast furnace
+[1.14-]block:id=blast_furnace,data=0,data=2,data=4,data=6,patch0=0:blast_furnace_top,patch1=0:blast_furnace_top,patch2=0:blast_furnace_front_on,patch3=0:blast_furnace_side
+[1.14-]block:id=blast_furnace,data=1,data=3,data=5,data=7,patch0=0:blast_furnace_top,patch1=0:blast_furnace_top,patch2=0:blast_furnace_front,patch3=0:blast_furnace_side
+# Cartography Table
+[1.14-]block:id=cartography_table,top=0:cartography_table_top,bottom=0:dark_oak_planks,east=0:cartography_table_side3,west=0:cartography_table_side1,north=0:cartography_table_side2,south=0:cartography_table_side3,stdrot=true
+# Fletching Table
+[1.14-]block:id=fletching_table,top=0:fletching_table_top,bottom=0:birch_planks,east=0:fletching_table_front,west=0:fletching_table_front,north=0:fletching_table_side,south=0:fletching_table_side,stdrot=true
+# Sweet berry bush
+[1.14-]block:id=sweet_berry_bush,data=0,patch0-1=0:sweet_berry_bush_stage0,transparency=TRANSPARENT
+[1.14-]block:id=sweet_berry_bush,data=1,patch0-1=0:sweet_berry_bush_stage1,transparency=TRANSPARENT
+[1.14-]block:id=sweet_berry_bush,data=2,patch0-1=0:sweet_berry_bush_stage2,transparency=TRANSPARENT
+[1.14-]block:id=sweet_berry_bush,data=3,patch0-1=0:sweet_berry_bush_stage3,transparency=TRANSPARENT
+# Grindstone
+[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

buildspec.yml

@@ -0,0 +1,13 @@
+version: 0.2
+
+phases:
+  install:
+    runtime-versions:
+      java: openjdk8
+  build:
+    commands:
+      - echo Build started on `date`
+      - ./gradlew clean build install
+artifacts:
+  files:
+    - target/*.jar