From ae875542748013b246cdafa1c32282d0d4013c6a Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Wed, 15 May 2019 23:31:33 -0500 Subject: [PATCH] Add some 1.14 blocks --- DynmapCore/src/main/resources/models_1.txt | 17 ++++++++++++ DynmapCore/src/main/resources/texture_1.txt | 29 ++++++++++++++++++++- 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt index 34613b73..d79af321 100644 --- a/DynmapCore/src/main/resources/models_1.txt +++ b/DynmapCore/src/main/resources/models_1.txt @@ -1418,3 +1418,20 @@ customblock:id=red_mushroom_block,id=brown_mushroom_block,class=org.dynmap.hdmap # Bubble column (taken care of due to being waterlogged) - needs to be patch model patchblock:id=bubble_column + +# Cornflower +# Wither rose +# Lily of the valley +[1.14-]patchblock:id=cornflower,id=wither_rose,id=lily_of_the_valley,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 +# Potted wither rose +[1.14-]patchblock:id=potted_wither_rose,patch0=FlowerPotTop,patch1=FlowerPotBottom,patch2=FlowerPotSide,patch3=FlowerPotSide@90,patch4=FlowerPotSide@180,patch5=FlowerPotSide@270,patch6=FlowerPotDirt,patch7=FlowerPotFlower,patch8=FlowerPotFlower@90 +# Potted lily of the valley +[1.14-]patchblock:id=potted_lily_of_the_valley,patch0=FlowerPotTop,patch1=FlowerPotBottom,patch2=FlowerPotSide,patch3=FlowerPotSide@90,patch4=FlowerPotSide@180,patch5=FlowerPotSide@270,patch6=FlowerPotDirt,patch7=FlowerPotFlower,patch8=FlowerPotFlower@90 +# Smooth stone slab +# Cut sandstone slab +[1.14-]boxblock:id=smooth_stone_slab,id=cut_sandstone_slab,id=cut_red_sandstone_slab,data=0,data=1,ymin=0.5 +[1.14-]boxblock:id=smooth_stone_slab,id=cut_sandstone_slab,id=cut_red_sandstone_slab,data=2,data=3,ymax=0.5 + diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt index b22d7919..d17a5067 100644 --- a/DynmapCore/src/main/resources/texture_1.txt +++ b/DynmapCore/src/main/resources/texture_1.txt @@ -2163,6 +2163,13 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT [-1.13.2]block:id=sign,patch0=0,patch1=1,patch2=2,patch3=3,patch4=4,patch5=5,patch6=6,patch7=7,patch8=8,patch9=9,transparency=TRANSPARENT,txtid=sign # Wall sign [-1.13.2]block:id=wall_sign,patch0=0,patch1=1,patch2=2,patch3=3,patch4=4,patch5=5,transparency=TRANSPARENT,txtid=sign + + +[1.14-]texture:id=cornflower +[1.14-]texture:id=wither_rose +[1.14-]texture:id=lily_of_the_valley +[1.14-]texture:id=smooth_stone_slab_side +[1.14-]texture:id=smooth_stone_slab_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 [1.14-]block:id=spruce_sign,patch0=0,patch1=1,patch2=2,patch3=3,patch4=4,patch5=5,patch6=6,patch7=7,patch8=8,patch9=9,transparency=TRANSPARENT,txtid=spruce_sign @@ -2177,4 +2184,24 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT [1.14-]block:id=acacia_wall_sign,patch0=0,patch1=1,patch2=2,patch3=3,patch4=4,patch5=5,transparency=TRANSPARENT,txtid=acacia_sign [1.14-]block:id=jungle_wall_sign,patch0=0,patch1=1,patch2=2,patch3=3,patch4=4,patch5=5,transparency=TRANSPARENT,txtid=jungle_sign [1.14-]block:id=dark_oak_wall_sign,patch0=0,patch1=1,patch2=2,patch3=3,patch4=4,patch5=5,transparency=TRANSPARENT,txtid=dark_oak_sign - +# Cornflower +[1.14-]block:id=cornflower,patch0-1=0:cornflower,transparency=TRANSPARENT +# Wither Rose +[1.14-]block:id=wither_rose,patch0-1=0:wither_rose,transparency=TRANSPARENT +# Lily of the valley +[1.14-]block:id=lily_of_the_valley,patch0-1=0:lily_of_the_valley,transparency=TRANSPARENT +# Potted cornflower +[1.14-]block:id=potted_cornflower,patch0-5=0:flower_pot,patch6=0:dirt,patch7-8=0:cornflower,transparency=TRANSPARENT +# Potted wither rose +[1.14-]block:id=potted_wither_rose,patch0-5=0:flower_pot,patch6=0:dirt,patch7-8=0:wither_rose,transparency=TRANSPARENT +# Potted lily of the valley +[1.14-]block:id=potted_lily_of_the_valley,patch0-5=0:flower_pot,patch6=0:dirt,patch7-8=0:lily_of_the_valley,transparency=TRANSPARENT +# Smooth Stone slab +[1.14-]block:id=smooth_stone_slab,data=0,data=1,data=2,data=3,allsides=0:smooth_stone_slab_side,topbottom=0:smooth_stone_slab_top,stdrot=true,transparency=SEMITRANSPARENT +[1.14-]block:id=smooth_stone_slab,data=4,data=5,allsides=0:smooth_stone_slab_side,topbottom=0:smooth_stone_slab_top,stdrot=true +# Cut sandston slab +[1.14-]block:id=cut_sandstone_slab,data=0,data=1,data=2,data=3,allsides=0:cut_sandstone,topbottom=0:sandstone_top,stdrot=true,transparency=SEMITRANSPARENT +[1.14-]block:id=cut_sandstone_slab,data=4,data=5,allsides=0:cut_sandstone,topbottom=0:sandstone_top,stdrot=true +# Cut red sandston slab +[1.14-]block:id=cut_red_sandstone_slab,data=0,data=1,data=2,data=3,allsides=0:cut_red_sandstone,topbottom=0:red_sandstone_top,stdrot=true,transparency=SEMITRANSPARENT +[1.14-]block:id=cut_red_sandstone_slab,data=4,data=5,allsides=0:cut_red_sandstone,topbottom=0:red_sandstone_top,stdrot=true