From f441cf4ecd56f5d182b6f9dd6f63a5571f00a13e Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Sat, 5 Feb 2022 18:55:55 -0600
Subject: [PATCH] Rework lantern with shade=false

---
 DynmapCore/src/main/resources/models_1.txt  | 8 ++++----
 DynmapCore/src/main/resources/texture_1.txt | 9 +++------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt
index 97cd282d..327a89b3 100644
--- a/DynmapCore/src/main/resources/models_1.txt
+++ b/DynmapCore/src/main/resources/models_1.txt
@@ -1503,8 +1503,8 @@ patchblock:id=bubble_column
 [1.14-]patchblock:id=lectern,data=12,data=13,data=14,data=15
 [1.14-]patchrotate:id=lectern,data=0,roty=90
 # Lantern (hanging, then not hanging)
-[1.14-]boxlist:id=lantern,data=0,data=1,box=0.3125:0.6875:0:0.4375:0.3125:0.6875:0/0/1/1/1/1,box=0.375:0.625:0.4375:0.5625:0.375:0.625:-1/2/3/3/3/3,box=0.4:0.6:0.5625:0.6875:0.5:0.5:-1/-1/-1/-1/4/4:45,box=0.5:0.5:0.5625:0.6875:0.4:0.6:-1/-1/5/5/-1/-1:45
-[1.14-]boxlist:id=lantern,data=2,data=3,box=0.3125:0.6875:0.0625:0.5:0.3125:0.6875:0/0/1/1/1/1,box=0.375:0.625:0.5:0.625:0.375:0.625:2/2/3/3/3/3,box=0.4:0.6:0.6875:0.9375:0.5:0.5:-1/-1/-1/-1/6/6:45,box=0.5:0.5:0.6875:0.9375:0.4:0.6:-1/-1/6/6/-1/-1:45
+[1.14-]modellist:id=lantern,state=hanging:true,box=5/1/5:11/8/11:d/0/0/9/6/15:u/0/0/9/6/15:n/0/0/2/6/9:s/0/0/2/6/9:w/0/0/2/6/9:e/0/0/2/6/9,box=6/8/6:10/10/10:d/0/1/10/5/14:u/0/1/10/5/14:n/0/1/0/5/2:s/0/1/0/5/2:w/0/1/0/5/2:e/0/1/0/5/2,box=6.5/11/8/false:9.5/15/8/0/45/0:n/0/14/1/11/5:s/0/11/1/14/5,box=8/10/6.5/false:8/16/9.5/0/45/0:w/0/14/6/11/12:e/0/11/6/14/12
+[1.14-]modellist:id=lantern,state=hanging:false,box=5/0/5:11/7/11:d/0/0/9/6/15:u/0/0/9/6/15:n/0/0/2/6/9:s/0/0/2/6/9:w/0/0/2/6/9:e/0/0/2/6/9,box=6/7/6:10/9/10:u/0/1/10/5/14:n/0/1/0/5/2:s/0/1/0/5/2:w/0/1/0/5/2:e/0/1/0/5/2,box=6.5/9/8/false:9.5/11/8/0/45/0:n/0/14/1/11/3:s/0/11/1/14/3,box=8/9/6.5/false:8/11/9.5/0/45/0:w/0/14/10/11/12:e/0/11/10/14/12
 # Stonecutter
 [1.14-]boxlist:id=stonecutter,data=0,box=0:1:0:0.5625:0:1:0/1/2/2/2/2,box=0.0625:0.9375:0.5625:1:0.49:0.51:3/3/3/3/3/3
 [1.14-]patchblock:id=stonecutter,data=1
@@ -1625,8 +1625,8 @@ patchblock:id=bubble_column
 [1.16-]patchblock:id=chain,state=axis:z
 [1.16-]patchrotate:id=chain,state=axis:y/waterlogged:true,rotx=90
 # Soul Lantern (hanging, then not hanging)
-[1.16-]boxlist:id=soul_lantern,data=0,data=1,box=0.3125:0.6875:0:0.4375:0.3125:0.6875:0/0/1/1/1/1,box=0.375:0.625:0.4375:0.5625:0.375:0.625:-1/2/3/3/3/3,box=0.4:0.6:0.5625:0.6875:0.5:0.5:-1/-1/-1/-1/4/4:45,box=0.5:0.5:0.5625:0.6875:0.4:0.6:-1/-1/5/5/-1/-1:45
-[1.16-]boxlist:id=soul_lantern,data=2,data=3,box=0.3125:0.6875:0.0625:0.5:0.3125:0.6875:0/0/1/1/1/1,box=0.375:0.625:0.5:0.625:0.375:0.625:2/2/3/3/3/3,box=0.4:0.6:0.6875:0.9375:0.5:0.5:-1/-1/-1/-1/6/6:45,box=0.5:0.5:0.6875:0.9375:0.4:0.6:-1/-1/6/6/-1/-1:45
+[1.16-]modellist:id=soul_lantern,state=hanging:true,box=5/1/5:11/8/11:d/0/0/9/6/15:u/0/0/9/6/15:n/0/0/2/6/9:s/0/0/2/6/9:w/0/0/2/6/9:e/0/0/2/6/9,box=6/8/6:10/10/10:d/0/1/10/5/14:u/0/1/10/5/14:n/0/1/0/5/2:s/0/1/0/5/2:w/0/1/0/5/2:e/0/1/0/5/2,box=6.5/11/8/false:9.5/15/8/0/45/0:n/0/14/1/11/5:s/0/11/1/14/5,box=8/10/6.5/false:8/16/9.5/0/45/0:w/0/14/6/11/12:e/0/11/6/14/12
+[1.16-]modellist:id=soul_lantern,state=hanging:false,box=5/0/5:11/7/11:d/0/0/9/6/15:u/0/0/9/6/15:n/0/0/2/6/9:s/0/0/2/6/9:w/0/0/2/6/9:e/0/0/2/6/9,box=6/7/6:10/9/10:u/0/1/10/5/14:n/0/1/0/5/2:s/0/1/0/5/2:w/0/1/0/5/2:e/0/1/0/5/2,box=6.5/9/8/false:9.5/11/8/0/45/0:n/0/14/1/11/3:s/0/11/1/14/3,box=8/9/6.5/false:8/11/9.5/0/45/0:w/0/14/10/11/12:e/0/11/10/14/12
 # Soul Campfire
 [1.16-]patchblock:id=soul_campfire,data=8,data=9,data=10,data=11
 [1.16-]patchrotate:id=campfire,data=8,roty=0
diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt
index e53c0cfa..da2b9c90 100644
--- a/DynmapCore/src/main/resources/texture_1.txt
+++ b/DynmapCore/src/main/resources/texture_1.txt
@@ -2113,8 +2113,7 @@ block:id=black_banner,id=black_wall_banner,data=*,patch0=0:oak_planks,patch1=0:b
 [1.14-]texture:id=lectern_front
 [1.14-]texture:id=lectern_sides
 [1.14-]texture:id=lectern_top
-# tile0=up/down ot first box, tile1=sides of first box, tile2=top of second box, tile3=sides of second box, tile4=n/s of first cross (unhung), tile5=e/w of second cross (unhung), tile6= n/s of first cross (hung), tile7=e/2 of second cross (hung)
-[1.14-]texturefile:id=lantern,filename=assets/minecraft/textures/block/lantern.png,format=CUSTOM,tile0=0:9/7:7/5:5,tile1=0:2/7:8/5:7,tile2=1:10/5:5/6:6,tile3=1:0/5:3/6:6,tile4=11:1/5:3/6:5,tile5=11:10/5:3/6:5,tile6=11:1/5:5/6:0,tile7=11:10/5:5/6:0,xcount=1,ycount=3
+[1.14-]texture:id=lantern
 [1.14-]texture:id=smithing_table_front
 [1.14-]texture:id=smithing_table_side
 [1.14-]texture:id=smithing_table_top
@@ -2293,7 +2292,7 @@ block:id=black_banner,id=black_wall_banner,data=*,patch0=0:oak_planks,patch1=0:b
 # 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
 # Lantern
-[1.14-]block:id=lantern,patch0=0:lantern,patch1=1:lantern,patch2=2:lantern,patch3=3:lantern,patch4=4:lantern,patch5=5:lantern,patch6=6:lantern,patch7=7:lantern,transparency=TRANSPARENT
+[1.14-]block:id=lantern,patch0=0:lantern,transparency=TRANSPARENT
 # Smithing table
 [1.14-]block:id=smithing_table,top=0:smithing_table_top,bottom=0:smithing_table_bottom,north=0:smithing_table_side,south=0:smithing_table_side,east=0:smithing_table_front,west=0:smithing_table_front,stdrot=true
 # Stonecutter
@@ -2342,8 +2341,7 @@ block:id=black_banner,id=black_wall_banner,data=*,patch0=0:oak_planks,patch1=0:b
 [1.16-]texture:id=chain
 [1.16-]texture:id=soul_campfire_log_lit
 [1.16-]texture:id=soul_campfire_fire
-# tile0=up/down ot first box, tile1=sides of first box, tile2=top of second box, tile3=sides of second box, tile4=n/s of first cross (unhung), tile5=e/w of second cross (unhung), tile6= n/s of first cross (hung), tile7=e/2 of second cross (hung)
-[1.16-]texturefile:id=soul_lantern,filename=assets/minecraft/textures/block/soul_lantern.png,format=CUSTOM,tile0=0:9/7:7/5:5,tile1=0:2/7:8/5:7,tile2=1:10/5:5/6:6,tile3=1:0/5:3/6:6,tile4=11:1/5:3/6:5,tile5=11:10/5:3/6:5,tile6=11:1/5:5/6:0,tile7=11:10/5:5/6:0,xcount=1,ycount=3
+[1.16-]texture:id=soul_lantern
 [1.16-]texture:id=warped_stem_top
 [1.16-]texture:id=warped_stem
 [1.16-]texture:id=stripped_warped_stem_top
@@ -2426,7 +2424,6 @@ block:id=black_banner,id=black_wall_banner,data=*,patch0=0:oak_planks,patch1=0:b
 [1.16-]block:id=chain,patch0=0:chain,transparency=TRANSPARENT
 # Soul Lantern
 [1.16-]block:id=soul_lantern,patch0=0:soul_lantern,transparency=TRANSPARENT
-[1.16-]block:id=soul_lantern,patch0=0:soul_lantern,patch1=1:soul_lantern,patch2=2:soul_lantern,patch3=3:soul_lantern,patch4=4:soul_lantern,patch5=5:soul_lantern,patch6=6:soul_lantern,patch7=7:soul_lantern,transparency=TRANSPARENT
 # Soul Campfire
 [1.16-]block:id=soul_campfire,data=*,patch0=0:campfire_log,patch1=0:soul_campfire_log_lit,patch2=0:soul_campfire_fire,transparency=TRANSPARENT
 # Warped Stem