From b8e751457c61d05ff18412a40a8190bb18699de5 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sat, 27 Jun 2020 00:49:59 -0500 Subject: [PATCH] Finish first pass for 1.16.1 blocks --- DynmapCore/src/main/resources/models_1.txt | 41 ++++++++---- DynmapCore/src/main/resources/texture_1.txt | 69 ++++++++++++++++++++- 2 files changed, 97 insertions(+), 13 deletions(-) diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt index 1c2e678c..b2b8c7d6 100644 --- a/DynmapCore/src/main/resources/models_1.txt +++ b/DynmapCore/src/main/resources/models_1.txt @@ -1666,11 +1666,15 @@ patchblock:id=bubble_column [1.16-]patchblock:id=warped_fungus,id=warped_roots,id=nether_sprouts,id=crimson_fungus,id=weeping_vines,id=weeping_vines_plant,id=twisting_vines,id=twisting_vines_plant,id=crimson_roots,patch0=VertX1Z0ToX0Z1,patch1=VertX1Z0ToX0Z1@90 # Crimson Slab # Warped Slab -[1.16-]boxblock:id=crimson_slab,id=warped_slab,data=0,data=1,ymin=0.5 -[1.16-]boxblock:id=crimson_slab,id=warped_slab,data=2,data=3,ymax=0.5 +# Blackstone Slab +# Polished Blackstone slab +# Polished Blackstone Brick slab +[1.16-]boxblock:id=crimson_slab,id=warped_slab,id=blackstone_slab,id=polished_blackstone_brick_slab,id=polished_blackstone_slab,data=0,data=1,ymin=0.5 +[1.16-]boxblock:id=crimson_slab,id=warped_slab,id=blackstone_slab,id=polished_blackstone_brick_slab,id=polished_blackstone_slab,data=2,data=3,ymax=0.5 # Warped pressure plate # Crimson pressure plate -[1.16-]boxblock:id=crimson_pressure_plate,id=warped_pressure_plate,xmin=0.0625,xmax=0.9275,ymax=0.0625,zmin=0.0625,zmax=0.9275 +# Polished Blackstone pressure plate +[1.16-]boxblock:id=crimson_pressure_plate,id=warped_pressure_plate,id=polished_blackstone_pressure_plate,xmin=0.0625,xmax=0.9275,ymax=0.0625,zmin=0.0625,zmax=0.9275 # Crimson fence # Warped Fence [1.16-]customblock:id=crimson_fence,id=warped_fence,class=org.dynmap.hdmap.renderer.FenceWallBlockStateRenderer,type=fence @@ -1687,17 +1691,21 @@ patchblock:id=bubble_column [1.16-]customblock:id=crimson_fence_gate,id=warped_fence_gate,class=org.dynmap.hdmap.renderer.FenceGateBlockStateRenderer # Crimson stairs # Warped stairs -[1.16-]customblock:id=crimson_stairs,id=warped_stairs,class=org.dynmap.hdmap.renderer.StairStateRenderer +# Blackstone stairs +# Polished Blackstone stairs +# Polished Blackstone brick stairs +[1.16-]customblock:id=crimson_stairs,id=warped_stairs,id=blackstone_stairs,id=polished_blackstone_stairs,id=polished_blackstone_brick_stairs,class=org.dynmap.hdmap.renderer.StairStateRenderer # Crimson button # Warped button -[1.16-]boxblock:id=crimson_button,id=warped_button,data=16-19,xmin=0.3125,xmax=0.6875,ymin=0.875,zmin=0.375,zmax=0.625 -[1.16-]boxblock:id=crimson_button,id=warped_button,data=20-23,xmin=0.375,xmax=0.625,ymin=0.875,zmin=0.3125,zmax=0.6875 -[1.16-]boxblock:id=crimson_button,id=warped_button,data=14-15,xmax=0.125,ymin=0.375,ymax=0.625,zmin=0.3125,zmax=0.6875 -[1.16-]boxblock:id=crimson_button,id=warped_button,data=12-13,xmin=0.875,ymin=0.375,ymax=0.625,zmin=0.3125,zmax=0.6875 -[1.16-]boxblock:id=crimson_button,id=warped_button,data=10-11,zmax=0.125,ymin=0.375,ymax=0.625,xmin=0.3125,xmax=0.6875 -[1.16-]boxblock:id=crimson_button,id=warped_button,data=8-9,zmin=0.875,ymin=0.375,ymax=0.625,xmin=0.3125,xmax=0.6875 -[1.16-]boxblock:id=crimson_button,id=warped_button,data=0-3,xmin=0.3125,xmax=0.6875,ymax=0.125,zmin=0.375,zmax=0.625 -[1.16-]boxblock:id=crimson_button,id=warped_button,data=4-7,xmin=0.375,xmax=0.625,ymax=0.125,zmin=0.3125,zmax=0.6875 +# Polished blackstone button +[1.16-]boxblock:id=crimson_button,id=warped_button,id=polished_blackstone_button,data=16-19,xmin=0.3125,xmax=0.6875,ymin=0.875,zmin=0.375,zmax=0.625 +[1.16-]boxblock:id=crimson_button,id=warped_button,id=polished_blackstone_button,data=20-23,xmin=0.375,xmax=0.625,ymin=0.875,zmin=0.3125,zmax=0.6875 +[1.16-]boxblock:id=crimson_button,id=warped_button,id=polished_blackstone_button,data=14-15,xmax=0.125,ymin=0.375,ymax=0.625,zmin=0.3125,zmax=0.6875 +[1.16-]boxblock:id=crimson_button,id=warped_button,id=polished_blackstone_button,data=12-13,xmin=0.875,ymin=0.375,ymax=0.625,zmin=0.3125,zmax=0.6875 +[1.16-]boxblock:id=crimson_button,id=warped_button,id=polished_blackstone_button,data=10-11,zmax=0.125,ymin=0.375,ymax=0.625,xmin=0.3125,xmax=0.6875 +[1.16-]boxblock:id=crimson_button,id=warped_button,id=polished_blackstone_button,data=8-9,zmin=0.875,ymin=0.375,ymax=0.625,xmin=0.3125,xmax=0.6875 +[1.16-]boxblock:id=crimson_button,id=warped_button,id=polished_blackstone_button,data=0-3,xmin=0.3125,xmax=0.6875,ymax=0.125,zmin=0.375,zmax=0.625 +[1.16-]boxblock:id=crimson_button,id=warped_button,id=polished_blackstone_button,data=4-7,xmin=0.375,xmax=0.625,ymax=0.125,zmin=0.3125,zmax=0.6875 # Crimson Door # Warped Door [1.16-]customblock:id=crimson_door,id=warped_door,class=org.dynmap.hdmap.renderer.DoorStateRenderer @@ -1725,3 +1733,12 @@ patchblock:id=bubble_column [1.16-]patchblock:id=crimson_sign,id=warped_sign,data=6-7,patch0=SignFront@247,patch1=SignBack@247,patch2=SignTop@247,patch3=SignBottom@247,patch4=SignLeft@247,patch5=SignRight@247,patch6=PostFront@247,patch7=PostBack@247,patch8=PostLeft@247,patch9=PostRight@247 [1.16-]patchblock:id=crimson_sign,id=warped_sign,data=14-15,patch0=SignFront@337,patch1=SignBack@337,patch2=SignTop@337,patch3=SignBottom@337,patch4=SignLeft@337,patch5=SignRight@337,patch6=PostFront@337,patch7=PostBack@337,patch8=PostLeft@337,patch9=PostRight@337 [1.16-]patchblock:id=crimson_sign,id=warped_sign,data=22-23,patch0=SignFront@67,patch1=SignBack@67,patch2=SignTop@67,patch3=SignBottom@67,patch4=SignLeft@67,patch5=SignRight@67,patch6=PostFront@67,patch7=PostBack@67,patch8=PostLeft@67,patch9=PostRight@67 +# Potted Crimson Fungus +# Potted Warped Fungus +# Potted Crimson Roots +# Potted Warped Roots +[1.16-]patchblock:id=potted_crimson_fungus,id=potted_warped_fungus,id=potted_crimson_roots,id=potted_warped_roots,patch0=FlowerPotTop,patch1=FlowerPotBottom,patch2=FlowerPotSide,patch3=FlowerPotSide@90,patch4=FlowerPotSide@180,patch5=FlowerPotSide@270,patch6=FlowerPotDirt,patch7=FlowerPotFlower,patch8=FlowerPotFlower@90 +# Blackstone wall +# Polished Blackstone wall +# Polished Blackstone Brick wall +[1.16-]customblock:id=blackstone_wall,id=polished_blackstone_wall,id=polished_blackstone_brick_wall,class=org.dynmap.hdmap.renderer.FenceWallBlockStateRenderer,type=wall diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt index 7919d2ea..381026c9 100644 --- a/DynmapCore/src/main/resources/texture_1.txt +++ b/DynmapCore/src/main/resources/texture_1.txt @@ -2492,6 +2492,18 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT [1.16-]texture:id=respawn_anchor_side2 [1.16-]texture:id=respawn_anchor_side3 [1.16-]texture:id=respawn_anchor_side4 +[1.16-]texture:id=lodestone_top +[1.16-]texture:id=lodestone_side +[1.16-]texture:id=blackstone_top +[1.16-]texture:id=blackstone +[1.16-]texture:id=polished_blackstone +[1.16-]texture:id=polished_blackstone_bricks +[1.16-]texture:id=cracked_polished_blackstone_bricks +[1.16-]texture:id=chiseled_polished_blackstone +[1.16-]texture:id=gilded_blackstone +[1.16-]texture:id=chiseled_nether_bricks +[1.16-]texture:id=cracked_nether_bricks +[1.16-]texture:id=quartz_bricks # Nether gold ore [1.16-]block:id=nether_gold_ore,allfaces=0:nether_gold_ore,stdrot=true @@ -2628,7 +2640,7 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT # Netherite Block [1.16-]block:id=netherite_block,allfaces=0:netherite_block,stdrot=true # Ancient Debris -[1.16-]block:id=ancient_debris,north=0:ancient_debris_top,south=0:ancient_debris_top,east=4000:ancient_debris_side,west=4000:ancient_debris_side,top=0:ancient_debris_side,bottom=0:ancient_debris_side +[1.16-]block:id=ancient_debris,top=0:ancient_debris_top,bottom=0:ancient_debris_top,allsides=0:ancient_debris_side,stdrot=true # Crying Obsidian [1.16-]block:id=crying_obsidian,allfaces=0:crying_obsidian,stdrot=true # Respawn Anchor @@ -2637,3 +2649,58 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT [1.16-]block:id=respawn_anchor,data=2,allsides=0:respawn_anchor_side2,top=0:respawn_anchor_top,bottom=0:respawn_anchor_bottom,stdrot=true [1.16-]block:id=respawn_anchor,data=3,allsides=0:respawn_anchor_side3,top=0:respawn_anchor_top,bottom=0:respawn_anchor_bottom,stdrot=true [1.16-]block:id=respawn_anchor,data=4,allsides=0:respawn_anchor_side4,top=0:respawn_anchor_top,bottom=0:respawn_anchor_bottom,stdrot=true +# Potted Crimson Fungus +[1.16-]block:id=potted_crimson_fungus,patch0-5=0:flower_pot,patch6=0:dirt,patch7-8=0:crimson_fungus,transparency=TRANSPARENT +# Potted Warped Fungus +[1.16-]block:id=potted_warped_fungus,patch0-5=0:flower_pot,patch6=0:dirt,patch7-8=0:warped_fungus,transparency=TRANSPARENT +# Potted Crimson Roots +[1.16-]block:id=potted_crimson_roots,patch0-5=0:flower_pot,patch6=0:dirt,patch7-8=0:crimson_roots,transparency=TRANSPARENT +# Potted Warped Roots +[1.16-]block:id=potted_warped_roots,patch0-5=0:flower_pot,patch6=0:dirt,patch7-8=0:warped_roots,transparency=TRANSPARENT +# Lodestone +[1.16-]block:id=lodestone,top=0:lodestone_top,bottom=0:lodestone_top,allsides=0:lodestone_side,stdrot=true +# Blackstone +[1.16-]block:id=blackstone,top=0:blackstone_top,bottom=0:blackstone_top,allsides=0:blackstone,stdrot=true +# Blockstone stairs +[1.16-]block:id=blackstone_stairs,patch0=0:blackstone,patch1=0:blackstone_top,patch2=0:blackstone_top,transparency=SEMITRANSPARENT +# Blackstone wall +[1.16-]block:id=blackstone_wall,patch0-2=0:blackstone,transparency=TRANSPARENT +# Blackstone slab +[1.16-]block:id=blackstone_slab,data=0,data=1,data=2,data=3,allsides=0:blackstone,top=0:blackstone_top,bottom=0:blackstone_top,stdrot=true,transparency=SEMITRANSPARENT +[1.16-]block:id=blackstone_slab,data=4,data=5,allsides=0:blackstone,top=0:blackstone_top,bottom=0:blackstone_top,stdrot=true +# Polished Blackstone +[1.16-]block:id=polished_blackstone,allfaces=0:polished_blackstone,stdrot=true +# Polished Blackstone Bricks +[1.16-]block:id=polished_blackstone_bricks,allfaces=0:polished_blackstone_bricks,stdrot=true +# Cracled Polished Blackstone Bricks +[1.16-]block:id=cracked_polished_blackstone_bricks,allfaces=0:cracked_polished_blackstone_bricks,stdrot=true +# Chiseled Polished Blackstone +[1.16-]block:id=chiseled_polished_blackstone,allfaces=0:chiseled_polished_blackstone,stdrot=true +# Polished Blackstone Brick slab +[1.16-]block:id=polished_blackstone_brick_slab,data=0,data=1,data=2,data=3,allsides=0:polished_blackstone_bricks,top=0:polished_blackstone_bricks,bottom=0:polished_blackstone_bricks,stdrot=true,transparency=SEMITRANSPARENT +[1.16-]block:id=polished_blackstone_brick_slab,data=4,data=5,allsides=0:polished_blackstone_bricks,top=0:polished_blackstone_bricks,bottom=0:polished_blackstone_bricks,stdrot=true +# Polished Blockstone stairs +[1.16-]block:id=polished_blackstone_stairs,patch0=0:polished_blackstone,patch1=0:polished_blackstone,patch2=0:polished_blackstone,transparency=SEMITRANSPARENT +# Polished Blackstone brick wall +[1.16-]block:id=polished_blackstone_brick_wall,patch0-2=0:polished_blackstone_bricks,transparency=TRANSPARENT +# Polished Blackstone wall +[1.16-]block:id=polished_blackstone_wall,patch0-2=0:polished_blackstone,transparency=TRANSPARENT +# Gilded Blackstone +[1.16-]block:id=gilded_blackstone,allfaces=0:gilded_blackstone,stdrot=true +# Polished Blackstone slab +[1.16-]block:id=polished_blackstone_slab,data=0,data=1,data=2,data=3,allsides=0:polished_blackstone,top=0:polished_blackstone,bottom=0:polished_blackstone,stdrot=true,transparency=SEMITRANSPARENT +[1.16-]block:id=polished_blackstone_slab,data=4,data=5,allsides=0:polished_blackstone,top=0:polished_blackstone,bottom=0:polished_blackstone,stdrot=true +# Polished Blockstone Brick stairs +[1.16-]block:id=polished_blackstone_brick_stairs,patch0=0:polished_blackstone_bricks,patch1=0:polished_blackstone_bricks,patch2=0:polished_blackstone_bricks,transparency=SEMITRANSPARENT +# Polished Blackstone pressure plate +[1.16-]block:id=polished_blackstone_pressure_plate,allfaces=0:polished_blackstone,stdrot=true,transparency=TRANSPARENT +# Polished Blackstone button +[1.16-]block:id=polished_blackstone_button,allfaces=0:polished_blackstone,stdrot=true,transparency=TRANSPARENT +# Chiseled Nether Bricks +[1.16-]block:id=chiseled_nether_bricks,allfaces=0:chiseled_nether_bricks,stdrot=true +# Cracked Nether Bricks +[1.16-]block:id=cracked_nether_bricks,allfaces=0:cracked_nether_bricks,stdrot=true +# Quartz Bricks +[1.16-]block:id=quartz_bricks,allfaces=0:quartz_bricks,stdrot=true + +