From 3965e75f8374205f1445319f25bfd1c0a6c0a39d Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sat, 18 May 2019 18:26:52 -0500 Subject: [PATCH] Add more 1.14 blocks --- DynmapCore/src/main/resources/models_1.txt | 22 +++++++++++++++++++++ DynmapCore/src/main/resources/texture_1.txt | 18 +++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt index 972e60f8..e46abe9b 100644 --- a/DynmapCore/src/main/resources/models_1.txt +++ b/DynmapCore/src/main/resources/models_1.txt @@ -1484,3 +1484,25 @@ 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 diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt index d08ee9bb..64a7bc11 100644 --- a/DynmapCore/src/main/resources/texture_1.txt +++ b/DynmapCore/src/main/resources/texture_1.txt @@ -2175,6 +2175,16 @@ 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 # 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 +2320,11 @@ 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 + +[1.14-]boxlist:id=[1.14-]block:id=composter \ No newline at end of file