From dc129548aaee3a8b27b180acd628123e68ae2b50 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 13 Feb 2022 23:59:17 -0600 Subject: [PATCH] Fix cauldron models --- DynmapCore/src/main/resources/models_1.txt | 66 ++++----------------- DynmapCore/src/main/resources/texture_1.txt | 10 ++-- 2 files changed, 16 insertions(+), 60 deletions(-) diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt index c8c57c13..c0ff2d62 100644 --- a/DynmapCore/src/main/resources/models_1.txt +++ b/DynmapCore/src/main/resources/models_1.txt @@ -843,34 +843,8 @@ boxblock:id=enchanting_table,ymax=0.75 # Brewing Stand patchblock:id=brewing_stand,patch0=HorizY001ZTop,patch1=StandSide,patch2=StandSide@90,patch3=StandSide@180,patch4=StandSide@270,patch5=StandArm,patch6=StandArm@120,patch7=StandArm@240 # Cauldron -block:id=cauldron,scale=8 -layer:0,1 -**----** -*------* --------- --------- --------- --------- -*------* -**----** -layer:2,3 -******** -******** -******** -******** -******** -******** -******** -******** -layer:4,5,6,7 -******** -*------* -*------* -*------* -*------* -*------* -*------* -******** +modellist:id=%cauldron,box=0.000000/3.000000/0.000000:2.000000/16.000000/16.000000:s/0:w/0:d/1:u/2:n/0:e/0,box=2.000000/3.000000/2.000000:14.000000/4.000000/14.000000:d/1:u/1,box=14.000000/3.000000/0.000000:16.000000/16.000000/16.000000:s/0:w/0:d/1:u/2:n/0:e/0,box=2.000000/3.000000/0.000000:14.000000/16.000000/2.000000:s/0:d/1:u/2:n/0,box=2.000000/3.000000/14.000000:14.000000/16.000000/16.000000:s/0:d/1:u/2:n/0,box=0.000000/0.000000/0.000000:4.000000/3.000000/2.000000:s/0:w/0:d/3:n/0:e/0,box=0.000000/0.000000/2.000000:2.000000/3.000000/4.000000:s/0:w/0:d/3:e/0,box=12.000000/0.000000/0.000000:16.000000/3.000000/2.000000:s/0:w/0:d/3:n/0:e/0,box=14.000000/0.000000/2.000000:16.000000/3.000000/4.000000:s/0:w/0:d/3:e/0,box=0.000000/0.000000/14.000000:4.000000/3.000000/16.000000:s/0:w/0:d/3:n/0:e/0,box=0.000000/0.000000/12.000000:2.000000/3.000000/14.000000:w/0:d/3:n/0:e/0,box=12.000000/0.000000/14.000000:16.000000/3.000000/16.000000:s/0:w/0:d/3:n/0:e/0,box=14.000000/0.000000/12.000000:16.000000/3.000000/14.000000:w/0:d/3:n/0:e/0 + # End portal boxlist:id=end_portal,box=0:1:0:0.75:0:1:0/0/-1/-1/-1/-1 # End portal frame (eye) @@ -2209,34 +2183,14 @@ patchblock:id=bubble_column [1.17-]patchblock:id=%black_candle_cake,data=1,patch0=patch770,patch1=patch771,patch2=patch772,patch3=patch773,patch4=patch774,patch5=patch775,patch6=patch776,patch7=patch777,patch8=patch778,patch9=patch779,patch10=patch780,patch11=patch102,patch12=patch781,patch13=patch782,patch14=patch783,patch15=patch784 # Water Cauldron, Lava Cauldron, Powder Snow Cauldron -[1.17-]block:id=water_cauldron,id=lava_cauldron,id=powder_snow_cauldron,scale=8 -[1.17-]layer:0,1 -[1.17-]**----** -[1.17-]*------* -[1.17-]-------- -[1.17-]-------- -[1.17-]-------- -[1.17-]-------- -[1.17-]*------* -[1.17-]**----** -[1.17-]layer:2,3 -[1.17-]******** -[1.17-]******** -[1.17-]******** -[1.17-]******** -[1.17-]******** -[1.17-]******** -[1.17-]******** -[1.17-]******** -[1.17-]layer:4,5,6,7 -[1.17-]******** -[1.17-]*------* -[1.17-]*------* -[1.17-]*------* -[1.17-]*------* -[1.17-]*------* -[1.17-]*------* -[1.17-]******** +[1.17-]modellist:id=%water_cauldron,state=level:1,box=0.000000/3.000000/0.000000:2.000000/16.000000/16.000000:s/0:w/0:d/1:u/2:n/0:e/0,box=2.000000/3.000000/2.000000:14.000000/4.000000/14.000000:d/1:u/1,box=14.000000/3.000000/0.000000:16.000000/16.000000/16.000000:s/0:w/0:d/1:u/2:n/0:e/0,box=2.000000/3.000000/0.000000:14.000000/16.000000/2.000000:s/0:d/1:u/2:n/0,box=2.000000/3.000000/14.000000:14.000000/16.000000/16.000000:s/0:d/1:u/2:n/0,box=0.000000/0.000000/0.000000:4.000000/3.000000/2.000000:s/0:w/0:d/3:n/0:e/0,box=0.000000/0.000000/2.000000:2.000000/3.000000/4.000000:s/0:w/0:d/3:e/0,box=12.000000/0.000000/0.000000:16.000000/3.000000/2.000000:s/0:w/0:d/3:n/0:e/0,box=14.000000/0.000000/2.000000:16.000000/3.000000/4.000000:s/0:w/0:d/3:e/0,box=0.000000/0.000000/14.000000:4.000000/3.000000/16.000000:s/0:w/0:d/3:n/0:e/0,box=0.000000/0.000000/12.000000:2.000000/3.000000/14.000000:w/0:d/3:n/0:e/0,box=12.000000/0.000000/14.000000:16.000000/3.000000/16.000000:s/0:w/0:d/3:n/0:e/0,box=14.000000/0.000000/12.000000:16.000000/3.000000/14.000000:w/0:d/3:n/0:e/0,box=2.000000/4.000000/2.000000:14.000000/9.000000/14.000000:u/4 +[1.17-]modellist:id=%water_cauldron,state=level:2,box=0.000000/3.000000/0.000000:2.000000/16.000000/16.000000:s/0:w/0:d/1:u/2:n/0:e/0,box=2.000000/3.000000/2.000000:14.000000/4.000000/14.000000:d/1:u/1,box=14.000000/3.000000/0.000000:16.000000/16.000000/16.000000:s/0:w/0:d/1:u/2:n/0:e/0,box=2.000000/3.000000/0.000000:14.000000/16.000000/2.000000:s/0:d/1:u/2:n/0,box=2.000000/3.000000/14.000000:14.000000/16.000000/16.000000:s/0:d/1:u/2:n/0,box=0.000000/0.000000/0.000000:4.000000/3.000000/2.000000:s/0:w/0:d/3:n/0:e/0,box=0.000000/0.000000/2.000000:2.000000/3.000000/4.000000:s/0:w/0:d/3:e/0,box=12.000000/0.000000/0.000000:16.000000/3.000000/2.000000:s/0:w/0:d/3:n/0:e/0,box=14.000000/0.000000/2.000000:16.000000/3.000000/4.000000:s/0:w/0:d/3:e/0,box=0.000000/0.000000/14.000000:4.000000/3.000000/16.000000:s/0:w/0:d/3:n/0:e/0,box=0.000000/0.000000/12.000000:2.000000/3.000000/14.000000:w/0:d/3:n/0:e/0,box=12.000000/0.000000/14.000000:16.000000/3.000000/16.000000:s/0:w/0:d/3:n/0:e/0,box=14.000000/0.000000/12.000000:16.000000/3.000000/14.000000:w/0:d/3:n/0:e/0,box=2.000000/4.000000/2.000000:14.000000/12.000000/14.000000:u/4 +[1.17-]modellist:id=%water_cauldron,state=level:3,box=0.000000/3.000000/0.000000:2.000000/16.000000/16.000000:s/0:w/0:d/1:u/2:n/0:e/0,box=2.000000/3.000000/2.000000:14.000000/4.000000/14.000000:d/1:u/1,box=14.000000/3.000000/0.000000:16.000000/16.000000/16.000000:s/0:w/0:d/1:u/2:n/0:e/0,box=2.000000/3.000000/0.000000:14.000000/16.000000/2.000000:s/0:d/1:u/2:n/0,box=2.000000/3.000000/14.000000:14.000000/16.000000/16.000000:s/0:d/1:u/2:n/0,box=0.000000/0.000000/0.000000:4.000000/3.000000/2.000000:s/0:w/0:d/3:n/0:e/0,box=0.000000/0.000000/2.000000:2.000000/3.000000/4.000000:s/0:w/0:d/3:e/0,box=12.000000/0.000000/0.000000:16.000000/3.000000/2.000000:s/0:w/0:d/3:n/0:e/0,box=14.000000/0.000000/2.000000:16.000000/3.000000/4.000000:s/0:w/0:d/3:e/0,box=0.000000/0.000000/14.000000:4.000000/3.000000/16.000000:s/0:w/0:d/3:n/0:e/0,box=0.000000/0.000000/12.000000:2.000000/3.000000/14.000000:w/0:d/3:n/0:e/0,box=12.000000/0.000000/14.000000:16.000000/3.000000/16.000000:s/0:w/0:d/3:n/0:e/0,box=14.000000/0.000000/12.000000:16.000000/3.000000/14.000000:w/0:d/3:n/0:e/0,box=2.000000/4.000000/2.000000:14.000000/15.000000/14.000000:u/4 +[1.17-]modellist:id=%lava_cauldron,box=0.000000/3.000000/0.000000:2.000000/16.000000/16.000000:s/0:w/0:d/1:u/2:n/0:e/0,box=2.000000/3.000000/2.000000:14.000000/4.000000/14.000000:d/1:u/1,box=14.000000/3.000000/0.000000:16.000000/16.000000/16.000000:s/0:w/0:d/1:u/2:n/0:e/0,box=2.000000/3.000000/0.000000:14.000000/16.000000/2.000000:s/0:d/1:u/2:n/0,box=2.000000/3.000000/14.000000:14.000000/16.000000/16.000000:s/0:d/1:u/2:n/0,box=0.000000/0.000000/0.000000:4.000000/3.000000/2.000000:s/0:w/0:d/3:n/0:e/0,box=0.000000/0.000000/2.000000:2.000000/3.000000/4.000000:s/0:w/0:d/3:e/0,box=12.000000/0.000000/0.000000:16.000000/3.000000/2.000000:s/0:w/0:d/3:n/0:e/0,box=14.000000/0.000000/2.000000:16.000000/3.000000/4.000000:s/0:w/0:d/3:e/0,box=0.000000/0.000000/14.000000:4.000000/3.000000/16.000000:s/0:w/0:d/3:n/0:e/0,box=0.000000/0.000000/12.000000:2.000000/3.000000/14.000000:w/0:d/3:n/0:e/0,box=12.000000/0.000000/14.000000:16.000000/3.000000/16.000000:s/0:w/0:d/3:n/0:e/0,box=14.000000/0.000000/12.000000:16.000000/3.000000/14.000000:w/0:d/3:n/0:e/0,box=2.000000/4.000000/2.000000:14.000000/15.000000/14.000000:u/4 +[1.17-]modellist:id=%powder_snow_cauldron,state=level:1,box=0.000000/3.000000/0.000000:2.000000/16.000000/16.000000:s/0:w/0:d/1:u/2:n/0:e/0,box=2.000000/3.000000/2.000000:14.000000/4.000000/14.000000:d/1:u/1,box=14.000000/3.000000/0.000000:16.000000/16.000000/16.000000:s/0:w/0:d/1:u/2:n/0:e/0,box=2.000000/3.000000/0.000000:14.000000/16.000000/2.000000:s/0:d/1:u/2:n/0,box=2.000000/3.000000/14.000000:14.000000/16.000000/16.000000:s/0:d/1:u/2:n/0,box=0.000000/0.000000/0.000000:4.000000/3.000000/2.000000:s/0:w/0:d/3:n/0:e/0,box=0.000000/0.000000/2.000000:2.000000/3.000000/4.000000:s/0:w/0:d/3:e/0,box=12.000000/0.000000/0.000000:16.000000/3.000000/2.000000:s/0:w/0:d/3:n/0:e/0,box=14.000000/0.000000/2.000000:16.000000/3.000000/4.000000:s/0:w/0:d/3:e/0,box=0.000000/0.000000/14.000000:4.000000/3.000000/16.000000:s/0:w/0:d/3:n/0:e/0,box=0.000000/0.000000/12.000000:2.000000/3.000000/14.000000:w/0:d/3:n/0:e/0,box=12.000000/0.000000/14.000000:16.000000/3.000000/16.000000:s/0:w/0:d/3:n/0:e/0,box=14.000000/0.000000/12.000000:16.000000/3.000000/14.000000:w/0:d/3:n/0:e/0,box=2.000000/4.000000/2.000000:14.000000/9.000000/14.000000:u/4 +[1.17-]modellist:id=%powder_snow_cauldron,state=level:2,box=0.000000/3.000000/0.000000:2.000000/16.000000/16.000000:s/0:w/0:d/1:u/2:n/0:e/0,box=2.000000/3.000000/2.000000:14.000000/4.000000/14.000000:d/1:u/1,box=14.000000/3.000000/0.000000:16.000000/16.000000/16.000000:s/0:w/0:d/1:u/2:n/0:e/0,box=2.000000/3.000000/0.000000:14.000000/16.000000/2.000000:s/0:d/1:u/2:n/0,box=2.000000/3.000000/14.000000:14.000000/16.000000/16.000000:s/0:d/1:u/2:n/0,box=0.000000/0.000000/0.000000:4.000000/3.000000/2.000000:s/0:w/0:d/3:n/0:e/0,box=0.000000/0.000000/2.000000:2.000000/3.000000/4.000000:s/0:w/0:d/3:e/0,box=12.000000/0.000000/0.000000:16.000000/3.000000/2.000000:s/0:w/0:d/3:n/0:e/0,box=14.000000/0.000000/2.000000:16.000000/3.000000/4.000000:s/0:w/0:d/3:e/0,box=0.000000/0.000000/14.000000:4.000000/3.000000/16.000000:s/0:w/0:d/3:n/0:e/0,box=0.000000/0.000000/12.000000:2.000000/3.000000/14.000000:w/0:d/3:n/0:e/0,box=12.000000/0.000000/14.000000:16.000000/3.000000/16.000000:s/0:w/0:d/3:n/0:e/0,box=14.000000/0.000000/12.000000:16.000000/3.000000/14.000000:w/0:d/3:n/0:e/0,box=2.000000/4.000000/2.000000:14.000000/12.000000/14.000000:u/4 +[1.17-]modellist:id=%powder_snow_cauldron,state=level:3,box=0.000000/3.000000/0.000000:2.000000/16.000000/16.000000:s/0:w/0:d/1:u/2:n/0:e/0,box=2.000000/3.000000/2.000000:14.000000/4.000000/14.000000:d/1:u/1,box=14.000000/3.000000/0.000000:16.000000/16.000000/16.000000:s/0:w/0:d/1:u/2:n/0:e/0,box=2.000000/3.000000/0.000000:14.000000/16.000000/2.000000:s/0:d/1:u/2:n/0,box=2.000000/3.000000/14.000000:14.000000/16.000000/16.000000:s/0:d/1:u/2:n/0,box=0.000000/0.000000/0.000000:4.000000/3.000000/2.000000:s/0:w/0:d/3:n/0:e/0,box=0.000000/0.000000/2.000000:2.000000/3.000000/4.000000:s/0:w/0:d/3:e/0,box=12.000000/0.000000/0.000000:16.000000/3.000000/2.000000:s/0:w/0:d/3:n/0:e/0,box=14.000000/0.000000/2.000000:16.000000/3.000000/4.000000:s/0:w/0:d/3:e/0,box=0.000000/0.000000/14.000000:4.000000/3.000000/16.000000:s/0:w/0:d/3:n/0:e/0,box=0.000000/0.000000/12.000000:2.000000/3.000000/14.000000:w/0:d/3:n/0:e/0,box=12.000000/0.000000/14.000000:16.000000/3.000000/16.000000:s/0:w/0:d/3:n/0:e/0,box=14.000000/0.000000/12.000000:16.000000/3.000000/14.000000:w/0:d/3:n/0:e/0,box=2.000000/4.000000/2.000000:14.000000/15.000000/14.000000:u/4 + # Scolk Sensor (inactive) (sculk_sensor_bottom, sculk_sensor_side, sculk_sensor_tendril_inactive/active, sculk_sensor_top) [1.17-]modellist:id=sculk_sensor,data=*,box=0/0/0:16/8/16:n/1/0/8/16/16:e/1/0/8/16/16:s/1/0/8/16/16:w/1/0/8/16/16:u/3/0/0/16/16:d/0/0/0/16/16,box=-1/8/3:7/16/3/0/45/0/3/12/3:n/2/4/8/12/16:s/2/12/8/4/16,box=9/8/3:17/16/3/0/-45/0/13/12/3:n/2/12/8/4/16:s/2/4/8/12/16,box=9/8/13:17/16/13/0/45/0/13/12/13:n/2/12/8/4/16:s/2/4/8/12/16,box=-1/8/13:7/16/13/0/-45/0/3/12/13:n/2/4/8/12/16:s/2/12/8/4/16 # Spore Blossom diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt index c37bfe1d..e59e9e88 100644 --- a/DynmapCore/src/main/resources/texture_1.txt +++ b/DynmapCore/src/main/resources/texture_1.txt @@ -1130,7 +1130,8 @@ block:id=enchanting_table,top=0:enchanting_table_top,allsides=0:enchanting_table # Brewing stand block:id=brewing_stand,patch0=0:brewing_stand_base,patch1-7=0:brewing_stand,transparency=TRANSPARENT # Cauldron -block:id=cauldron,data=*,top=0:cauldron_top,bottom=0:cauldron_bottom,allsides=0:cauldron_side,stdrot=true,transparency=TRANSPARENT +block:id=%cauldron,patch0=0:cauldron_side,patch1=0:cauldron_inner,patch2=0:cauldron_top,patch3=0:cauldron_bottom,transparency=TRANSPARENT,stdrot=true + # End portal block:id=end_portal,data=*,patch0=0:endportal,stdrot=true # End portal frame @@ -3061,11 +3062,12 @@ block:id=black_banner,id=black_wall_banner,data=*,patch0=0:oak_planks,patch1=0:b [1.17-]block:id=%black_candle_cake,data=1,patch0=0:cake_side,patch1=0:cake_side,patch2=0:cake_bottom,patch3=0:cake_side,patch4=0:cake_top,patch5=0:cake_side,patch6=0:black_candle,patch7=0:black_candle,patch8=0:black_candle,patch9=0:black_candle,patch10=0:black_candle,patch11=0:black_candle,patch12=0:black_candle,patch13=0:black_candle,patch14=0:black_candle,patch15=0:black_candle,transparency=SEMITRANSPARENT,stdrot=true # Water Cauldron -[1.17-]block:id=water_cauldron,data=*,top=0:cauldron_top,bottom=0:cauldron_bottom,allsides=0:cauldron_side,stdrot=true,transparency=TRANSPARENT +[1.17-]block:id=%water_cauldron,patch0=0:cauldron_side,patch1=0:cauldron_inner,patch2=0:cauldron_top,patch3=0:cauldron_bottom,patch4=12000:water_still,transparency=TRANSPARENT,stdrot=true # Lava Cauldron -[1.17-]block:id=lava_cauldron,data=*,top=0:cauldron_top,bottom=0:cauldron_bottom,allsides=0:cauldron_side,stdrot=true,transparency=TRANSPARENT +[1.17-]block:id=%lava_cauldron,patch0=0:cauldron_side,patch1=0:cauldron_inner,patch2=0:cauldron_top,patch3=0:cauldron_bottom,patch4=0:lava_still,transparency=TRANSPARENT,stdrot=true # Powder Snow Cauldron -[1.17-]block:id=powder_snow_cauldron,data=*,top=0:cauldron_top,bottom=0:cauldron_bottom,allsides=0:cauldron_side,stdrot=true,transparency=TRANSPARENT +[1.17-]block:id=%powder_snow_cauldron,patch0=0:cauldron_side,patch1=0:cauldron_inner,patch2=0:cauldron_top,patch3=0:cauldron_bottom,patch4=0:powder_snow,transparency=TRANSPARENT,stdrot=true + # Budding amethyst [1.17-]block:id=budding_amethyst,allfaces=0:budding_amethyst,stdrot=true # Sculk Sensor (sculk_sensor_bottom, sculk_sensor_side, sculk_sensor_tendril_inactive/active, sculk_sensor_top)