From 3965e75f8374205f1445319f25bfd1c0a6c0a39d Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sat, 18 May 2019 18:26:52 -0500 Subject: [PATCH 1/9] 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 From 2c467782f0212656b47c52fb7bdd407219652fa7 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sat, 18 May 2019 18:57:33 -0500 Subject: [PATCH 2/9] Add 1.14 barrels,loom --- DynmapCore/src/main/resources/models_1.txt | 12 ++++++++++++ DynmapCore/src/main/resources/texture_1.txt | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt index e46abe9b..391235a0 100644 --- a/DynmapCore/src/main/resources/models_1.txt +++ b/DynmapCore/src/main/resources/models_1.txt @@ -1506,3 +1506,15 @@ patchblock:id=bubble_column [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 diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt index 64a7bc11..1198c35c 100644 --- a/DynmapCore/src/main/resources/texture_1.txt +++ b/DynmapCore/src/main/resources/texture_1.txt @@ -2185,6 +2185,10 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT [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 # 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 @@ -2326,5 +2330,7 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT [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 [1.14-]boxlist:id=[1.14-]block:id=composter \ No newline at end of file From 8fbd924f0fb050930b7df0315f8ad7fb0e077602 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sat, 18 May 2019 19:13:05 -0500 Subject: [PATCH 3/9] Add 1.14 smoker --- DynmapCore/src/main/resources/models_1.txt | 8 ++++++++ DynmapCore/src/main/resources/texture_1.txt | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt index 391235a0..51e8f2be 100644 --- a/DynmapCore/src/main/resources/models_1.txt +++ b/DynmapCore/src/main/resources/models_1.txt @@ -1518,3 +1518,11 @@ patchblock:id=bubble_column [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 +[1.14-]boxlist:id=smoker,data=0,data=1,box=0:1:0:1:0:1:0/1/3/3/2/3 +[1.14-]patchblock:id=smoker,data=2,data=3 +[1.14-]patchrotate:id=smoker,data=0,roty=180 +[1.14-]patchblock:id=smoker,data=4,data=5 +[1.14-]patchrotate:id=smoker,data=0,roty=270 +[1.14-]patchblock:id=smoker,data=6,data=7 +[1.14-]patchrotate:id=smoker,data=0,roty=90 diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt index 1198c35c..83e1938d 100644 --- a/DynmapCore/src/main/resources/texture_1.txt +++ b/DynmapCore/src/main/resources/texture_1.txt @@ -2189,6 +2189,11 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT [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 # 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 @@ -2333,4 +2338,8 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT # 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 + [1.14-]boxlist:id=[1.14-]block:id=composter \ No newline at end of file From 9027e4748c4c751072b2880d884404dc7fe3cc59 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sat, 18 May 2019 19:19:00 -0500 Subject: [PATCH 4/9] Add 1.14 blast furnace --- DynmapCore/src/main/resources/models_1.txt | 9 +++++---- DynmapCore/src/main/resources/texture_1.txt | 8 ++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt index 51e8f2be..0889bfc9 100644 --- a/DynmapCore/src/main/resources/models_1.txt +++ b/DynmapCore/src/main/resources/models_1.txt @@ -1519,10 +1519,11 @@ patchblock:id=bubble_column [1.14-]patchblock:id=barrel,data=10,data=11 [1.14-]patchrotate:id=barrel,data=8,rotx=180 # Smoker -[1.14-]boxlist:id=smoker,data=0,data=1,box=0:1:0:1:0:1:0/1/3/3/2/3 -[1.14-]patchblock:id=smoker,data=2,data=3 +# 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,data=4,data=5 +[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,data=6,data=7 +[1.14-]patchblock:id=smoker,id=blast_furnace,data=6,data=7 [1.14-]patchrotate:id=smoker,data=0,roty=90 diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt index 83e1938d..03d72f36 100644 --- a/DynmapCore/src/main/resources/texture_1.txt +++ b/DynmapCore/src/main/resources/texture_1.txt @@ -2194,6 +2194,11 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT [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_bottom +[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 # 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 @@ -2341,5 +2346,8 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT # 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_bottom,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_bottom,patch1=0:blast_furnace_top,patch2=0:blast_furnace_front,patch3=0:blast_furnace_side [1.14-]boxlist:id=[1.14-]block:id=composter \ No newline at end of file From 9f3c1a7e07593682ff5ab063802536955b906635 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sat, 18 May 2019 19:36:58 -0500 Subject: [PATCH 5/9] Add 1.14 fletching and cartography tables --- DynmapCore/src/main/resources/texture_1.txt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt index 03d72f36..397f2e57 100644 --- a/DynmapCore/src/main/resources/texture_1.txt +++ b/DynmapCore/src/main/resources/texture_1.txt @@ -2199,6 +2199,14 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT [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 + # 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 @@ -2349,5 +2357,7 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT # Blast furnace [1.14-]block:id=blast_furnace,data=0,data=2,data=4,data=6,patch0=0:blast_furnace_bottom,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_bottom,patch1=0:blast_furnace_top,patch2=0:blast_furnace_front,patch3=0:blast_furnace_side - -[1.14-]boxlist:id=[1.14-]block:id=composter \ No newline at end of file +# 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 From 01e987c046485219568218a065d8db7d026a583d Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sat, 18 May 2019 20:49:16 -0500 Subject: [PATCH 6/9] Add 1.14 sweet berry bush --- DynmapCore/src/main/resources/models_1.txt | 3 ++- DynmapCore/src/main/resources/texture_1.txt | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt index 0889bfc9..8c9c4932 100644 --- a/DynmapCore/src/main/resources/models_1.txt +++ b/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 diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt index 397f2e57..45691036 100644 --- a/DynmapCore/src/main/resources/texture_1.txt +++ b/DynmapCore/src/main/resources/texture_1.txt @@ -2206,7 +2206,10 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT [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 # 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 @@ -2361,3 +2364,8 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT [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 From e8ab5d656c5ddf81ca8652c15e6b4d08cbdbe05e Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sat, 18 May 2019 21:44:13 -0500 Subject: [PATCH 7/9] Add 1.14 grindstone --- DynmapCore/src/main/resources/models_1.txt | 24 +++++++++++++++++++++ DynmapCore/src/main/resources/texture_1.txt | 11 +++++++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt index 8c9c4932..5a92d9d9 100644 --- a/DynmapCore/src/main/resources/models_1.txt +++ b/DynmapCore/src/main/resources/models_1.txt @@ -1528,3 +1528,27 @@ patchblock:id=bubble_column [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 diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt index 45691036..21929a1f 100644 --- a/DynmapCore/src/main/resources/texture_1.txt +++ b/DynmapCore/src/main/resources/texture_1.txt @@ -2194,7 +2194,6 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT [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_bottom [1.14-]texture:id=blast_furnace_side [1.14-]texture:id=blast_furnace_top [1.14-]texture:id=blast_furnace_front_on @@ -2210,6 +2209,9 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT [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 # 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 @@ -2358,8 +2360,8 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT [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_bottom,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_bottom,patch1=0:blast_furnace_top,patch2=0:blast_furnace_front,patch3=0:blast_furnace_side +[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 @@ -2369,3 +2371,6 @@ block:id=horn_coral,patch0-1=0:horn_coral,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 + From 48bc5895d4fcd1e868cea9bb48e0f786f602b5f5 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sat, 18 May 2019 22:18:38 -0500 Subject: [PATCH 8/9] Add 1.14 lectern --- DynmapCore/src/main/resources/models_1.txt | 8 ++++++++ DynmapCore/src/main/resources/texture_1.txt | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt index 5a92d9d9..19bb3065 100644 --- a/DynmapCore/src/main/resources/models_1.txt +++ b/DynmapCore/src/main/resources/models_1.txt @@ -1552,3 +1552,11 @@ patchblock:id=bubble_column [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 diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt index 21929a1f..368966d3 100644 --- a/DynmapCore/src/main/resources/texture_1.txt +++ b/DynmapCore/src/main/resources/texture_1.txt @@ -2212,6 +2212,10 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT [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 @@ -2373,4 +2377,5 @@ block:id=horn_coral,patch0-1=0:horn_coral,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 From 34738a70f41272402dd1cffd25e6af284b8d6e90 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sat, 18 May 2019 23:18:54 -0500 Subject: [PATCH 9/9] Add buildspec.yml --- buildspec.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 buildspec.yml diff --git a/buildspec.yml b/buildspec.yml new file mode 100644 index 00000000..fbb1132c --- /dev/null +++ b/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 \ No newline at end of file