From bfb11c36f5204ed1e8da4caa1a41c652f4702492 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Wed, 19 Jan 2022 19:50:57 -0600 Subject: [PATCH] Fix model and texture definitions for bells --- DynmapCore/src/main/resources/models_1.txt | 87 ++++++++++++++------- DynmapCore/src/main/resources/texture_1.txt | 8 +- 2 files changed, 62 insertions(+), 33 deletions(-) diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt index 28c07728..260c3484 100644 --- a/DynmapCore/src/main/resources/models_1.txt +++ b/DynmapCore/src/main/resources/models_1.txt @@ -1494,35 +1494,35 @@ patchblock:id=bubble_column [1.14-]patchrotate:id=campfire,data=0,roty=90 [1.14-]patchblock:id=campfire,data=28,data=29,data=30,data=31 [1.14-]patchrotate:id=campfire,data=4,roty=90 -# Bell -[1.14-]boxlist:id=bell,data=2,box=0.125:0.875:0.8125:0.9375:0.4375:0.5625:0/0/0/0/0/0,box=0.875:1:0:1:0.375:0.625:1/1/1/1/1/1,box=0:0.125:0:1:0.375:0.625:1/1/1/1/1/1,box=0.3125:0.6875:0.375:0.8175:0.3125:0.6875:2/3/4/4/4/4,box=0.25:0.75:0.25:0.375:0.25:0.75:2/3/4/4/4/4 -[1.14-]patchblock:id=bell,data=3 -[1.14-]patchrotate:id=bell,data=2,roty=180 -[1.14-]patchblock:id=bell,data=0 -[1.14-]patchrotate:id=bell,data=2,roty=270 -[1.14-]patchblock:id=bell,data=1 -[1.14-]patchrotate:id=bell,data=2,roty=90 -[1.14-]boxlist:id=bell,data=6,box=0.4375:0.5625:0.8125:1:0.4375:0.5625:0/0/0/0/0/0,box=0.3125:0.6875:0.375:0.8175:0.3125:0.6875:2/3/4/4/4/4,box=0.25:0.75:0.25:0.375:0.25:0.75:2/3/4/4/4/4 -[1.14-]patchblock:id=bell,data=7 -[1.14-]patchrotate:id=bell,data=6,roty=180 -[1.14-]patchblock:id=bell,data=4 -[1.14-]patchrotate:id=bell,data=6,roty=270 -[1.14-]patchblock:id=bell,data=5 -[1.14-]patchrotate:id=bell,data=6,roty=90 -[1.14-]boxlist:id=bell,data=10,box=0.1875:1:0.8125:0.9375:0.4375:0.5625:0/0/0/0/0/0,box=0.3125:0.6875:0.375:0.8175:0.3125:0.6875:2/3/4/4/4/4,box=0.25:0.75:0.25:0.375:0.25:0.75:2/3/4/4/4/4 -[1.14-]patchblock:id=bell,data=11 -[1.14-]patchrotate:id=bell,data=10,roty=180 -[1.14-]patchblock:id=bell,data=8 -[1.14-]patchrotate:id=bell,data=10,roty=270 -[1.14-]patchblock:id=bell,data=9 -[1.14-]patchrotate:id=bell,data=10,roty=90 -[1.14-]boxlist:id=bell,data=14,box=0:1:0.8125:0.9375:0.4375:0.5625:0/0/0/0/0/0,box=0.3125:0.6875:0.375:0.8175:0.3125:0.6875:2/3/4/4/4/4,box=0.25:0.75:0.25:0.375:0.25:0.75:2/3/4/4/4/4 -[1.14-]patchblock:id=bell,data=15 -[1.14-]patchrotate:id=bell,data=14,roty=180 -[1.14-]patchblock:id=bell,data=12 -[1.14-]patchrotate:id=bell,data=14,roty=270 -[1.14-]patchblock:id=bell,data=13 -[1.14-]patchrotate:id=bell,data=14,roty=90 +# Bell (1.14.x) +[1.14-1.14.4]boxlist:id=bell,data=2,box=0.125:0.875:0.8125:0.9375:0.4375:0.5625:0/0/0/0/0/0,box=0.875:1:0:1:0.375:0.625:1/1/1/1/1/1,box=0:0.125:0:1:0.375:0.625:1/1/1/1/1/1,box=0.3125:0.6875:0.375:0.8175:0.3125:0.6875:2/3/4/4/4/4,box=0.25:0.75:0.25:0.375:0.25:0.75:2/3/4/4/4/4 +[1.14-1.14.4]patchblock:id=bell,data=3 +[1.14-1.14.4]patchrotate:id=bell,data=2,roty=180 +[1.14-1.14.4]patchblock:id=bell,data=0 +[1.14-1.14.4]patchrotate:id=bell,data=2,roty=270 +[1.14-1.14.4]patchblock:id=bell,data=1 +[1.14-1.14.4]patchrotate:id=bell,data=2,roty=90 +[1.14-1.14.4]boxlist:id=bell,data=6,box=0.4375:0.5625:0.8125:1:0.4375:0.5625:0/0/0/0/0/0,box=0.3125:0.6875:0.375:0.8175:0.3125:0.6875:2/3/4/4/4/4,box=0.25:0.75:0.25:0.375:0.25:0.75:2/3/4/4/4/4 +[1.14-1.14.4]patchblock:id=bell,data=7 +[1.14-1.14.4]patchrotate:id=bell,data=6,roty=180 +[1.14-1.14.4]patchblock:id=bell,data=4 +[1.14-1.14.4]patchrotate:id=bell,data=6,roty=270 +[1.14-1.14.4]patchblock:id=bell,data=5 +[1.14-1.14.4]patchrotate:id=bell,data=6,roty=90 +[1.14-1.14.4]boxlist:id=bell,data=10,box=0.1875:1:0.8125:0.9375:0.4375:0.5625:0/0/0/0/0/0,box=0.3125:0.6875:0.375:0.8175:0.3125:0.6875:2/3/4/4/4/4,box=0.25:0.75:0.25:0.375:0.25:0.75:2/3/4/4/4/4 +[1.14-1.14.4]patchblock:id=bell,data=11 +[1.14-1.14.4]patchrotate:id=bell,data=10,roty=180 +[1.14-1.14.4]patchblock:id=bell,data=8 +[1.14-1.14.4]patchrotate:id=bell,data=10,roty=270 +[1.14-1.14.4]patchblock:id=bell,data=9 +[1.14-1.14.4]patchrotate:id=bell,data=10,roty=90 +[1.14-1.14.4]boxlist:id=bell,data=14,box=0:1:0.8125:0.9375:0.4375:0.5625:0/0/0/0/0/0,box=0.3125:0.6875:0.375:0.8175:0.3125:0.6875:2/3/4/4/4/4,box=0.25:0.75:0.25:0.375:0.25:0.75:2/3/4/4/4/4 +[1.14-1.14.4]patchblock:id=bell,data=15 +[1.14-1.14.4]patchrotate:id=bell,data=14,roty=180 +[1.14-1.14.4]patchblock:id=bell,data=12 +[1.14-1.14.4]patchrotate:id=bell,data=14,roty=270 +[1.14-1.14.4]patchblock:id=bell,data=13 +[1.14-1.14.4]patchrotate:id=bell,data=14,roty=90 # 1.15 blocks # Beenest @@ -1535,6 +1535,35 @@ patchblock:id=bubble_column [1.15-]patchrotate:id=bee_nest,data=0,roty=90 # Honey block [1.15-]boxlist:id=honey_block,box=0:1:0:1:0:1:1/1/1/1/1/1,box=0.0625:0.9375:0.0625:0.9375:0.0625:0.9375:0/1/2/2/2/2 +# Bell (1.15) +[1.15-]boxlist:id=bell,data=2,data=3,box=0.125:0.875:0.8125:0.9375:0.4375:0.5625:0/0/0/0/0/0,box=0.875:1:0:1:0.375:0.625:1/1/1/1/1/1,box=0:0.125:0:1:0.375:0.625:1/1/1/1/1/1,box=0.3125:0.6875:0.375:0.8175:0.3125:0.6875:2/3/4/4/4/4,box=0.25:0.75:0.25:0.375:0.25:0.75:2/3/4/4/4/4 +[1.15-]patchblock:id=bell,data=6,data=7 +[1.15-]patchrotate:id=bell,data=2,roty=270 +[1.15-]patchblock:id=bell,data=0,data=1 +[1.15-]patchrotate:id=bell,data=2,roty=180 +[1.15-]patchblock:id=bell,data=4,data=5 +[1.15-]patchrotate:id=bell,data=2,roty=90 +[1.15-]boxlist:id=bell,data=12,data=13,box=0.4375:0.5625:0.8125:1:0.4375:0.5625:0/0/0/0/0/0,box=0.3125:0.6875:0.375:0.8175:0.3125:0.6875:2/3/4/4/4/4,box=0.25:0.75:0.25:0.375:0.25:0.75:2/3/4/4/4/4 +[1.15-]patchblock:id=bell,data=14,data=15 +[1.15-]patchrotate:id=bell,data=12,roty=180 +[1.15-]patchblock:id=bell,data=8,data=9 +[1.15-]patchrotate:id=bell,data=12,roty=270 +[1.15-]patchblock:id=bell,data=10,data=11 +[1.15-]patchrotate:id=bell,data=12,roty=90 +[1.15-]boxlist:id=bell,data=20,data=21,box=0.1875:1:0.8125:0.9375:0.4375:0.5625:0/0/0/0/0/0,box=0.3125:0.6875:0.375:0.8175:0.3125:0.6875:2/3/4/4/4/4,box=0.25:0.75:0.25:0.375:0.25:0.75:2/3/4/4/4/4 +[1.15-]patchblock:id=bell,data=22,data=23 +[1.15-]patchrotate:id=bell,data=20,roty=180 +[1.15-]patchblock:id=bell,data=16,data=17 +[1.15-]patchrotate:id=bell,data=20,roty=270 +[1.15-]patchblock:id=bell,data=18,data=19 +[1.15-]patchrotate:id=bell,data=20,roty=90 +[1.15-]boxlist:id=bell,data=28,data=29,box=0:1:0.8125:0.9375:0.4375:0.5625:0/0/0/0/0/0,box=0.3125:0.6875:0.375:0.8175:0.3125:0.6875:2/3/4/4/4/4,box=0.25:0.75:0.25:0.375:0.25:0.75:2/3/4/4/4/4 +[1.15-]patchblock:id=bell,data=30,data=31 +[1.15-]patchrotate:id=bell,data=28,roty=180 +[1.15-]patchblock:id=bell,data=24,data=25 +[1.15-]patchrotate:id=bell,data=28,roty=270 +[1.15-]patchblock:id=bell,data=26,data=27 +[1.15-]patchrotate:id=bell,data=28,roty=90 # 1.16 blocks # Soul Fire diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt index 452ffa25..3c382a18 100644 --- a/DynmapCore/src/main/resources/texture_1.txt +++ b/DynmapCore/src/main/resources/texture_1.txt @@ -2194,9 +2194,9 @@ block:id=black_banner,id=black_wall_banner,data=*,patch0=0:oak_planks,patch1=0:b [1.14-]texture:id=campfire_log [1.14-]texture:id=campfire_log_lit [1.14-]texture:id=campfire_fire -[1.14-]texture:id=bell_top -[1.14-]texture:id=bell_side -[1.14-]texture:id=bell_bottom +[1.14-]texture:id=bell_top,format=CUSTOM,tile0=0:0/8:8/4:4 +[1.14-]texture:id=bell_side,format=CUSTOM,tile0=0:0/8:9/4:3 +[1.14-]texture:id=bell_bottom,format=CUSTOM,tile0=0:0/8:8/4:4 # 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 @@ -2369,7 +2369,7 @@ block:id=black_banner,id=black_wall_banner,data=*,patch0=0:oak_planks,patch1=0:b # Campfire [1.14-]block:id=campfire,patch0=0:campfire_log,patch1=0:campfire_log_lit,patch2=0:campfire_fire,transparency=TRANSPARENT # Bell -[1.14-]block:id=bell,patch0=0:dark_oak_planks,patch1=0:stone,patch2=0:bell_top,patch3=0:bell_bottom,patch4=0:bell_side,transparency=TRANSPARENT +[1.14-]block:id=bell,patch0=0:dark_oak_planks,patch1=0:stone,patch2=0:bell_bottom,patch3=0:bell_top,patch4=0:bell_side,transparency=TRANSPARENT # 1.15 resources [1.15-]texture:id=bee_nest_bottom