From 4b8fa4a81d9a8516b602e6eb22f6692b836331db Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Wed, 2 Feb 2022 00:10:48 -0600 Subject: [PATCH] Switch slabs and wall torches to state= (test case) --- DynmapCore/src/main/resources/models_1.txt | 14 +++++++------- DynmapCore/src/main/resources/texture_1.txt | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt index fc617502..aedefd65 100644 --- a/DynmapCore/src/main/resources/models_1.txt +++ b/DynmapCore/src/main/resources/models_1.txt @@ -218,13 +218,13 @@ boxblock:id=snow,data=6,ymax=0.875 # Redstone torch modellist:id=torch,id=redstone_torch,box=7/0/7:9/10/9:d/0/7/13/9/15:u/0/7/6/9/8,box=7/0/0:9/16/16:w/0:e/0,box=0/0/7:16/16/9:n/0:s/0 # Wall Torch -modellist:id=wall_torch,data=3,box=-1/3.5/7:1/13.5/9/0/0/-22.5/0/3.5/8:d/0/7/13/9/15,u/0/7/6/9/8,box=-1/3.5/0:1/19.5/16/0/0/-22.5/0/3.5/8:w/0:e/0,box=-8/3.5/7:8/19.5/9/0/0/-22.5/0/3.5/8:n/0:s/0 -patchblock:id=wall_torch,data=0 -patchrotate:id=wall_torch,data=3,roty=270 -patchblock:id=wall_torch,data=1 -patchrotate:id=wall_torch,data=3,roty=90 -patchblock:id=wall_torch,data=2 -patchrotate:id=wall_torch,data=3,roty=180 +modellist:id=wall_torch,state=facing:east,box=-1/3.5/7:1/13.5/9/0/0/-22.5/0/3.5/8:d/0/7/13/9/15,u/0/7/6/9/8,box=-1/3.5/0:1/19.5/16/0/0/-22.5/0/3.5/8:w/0:e/0,box=-8/3.5/7:8/19.5/9/0/0/-22.5/0/3.5/8:n/0:s/0 +patchblock:id=wall_torch,state=facing:north +patchrotate:id=wall_torch,state=facing:east,roty=270 +patchblock:id=wall_torch,state=facing:south +patchrotate:id=wall_torch,state=facing:east,roty=90 +patchblock:id=wall_torch,state=facing:west +patchrotate:id=wall_torch,state=facing:east,roty=180 # Redstone torch patchblock:id=redstone_wall_torch,data=0,data=1 diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt index e757b8e7..d16ae1f0 100644 --- a/DynmapCore/src/main/resources/texture_1.txt +++ b/DynmapCore/src/main/resources/texture_1.txt @@ -883,7 +883,7 @@ block:id=obsidian,allfaces=0:obsidian,stdrot=true # Torch block:id=torch,patch0=0:torch,transparency=TRANSPARENT # Wall torch -block:id=wall_torch,data=*,patch0=0:torch,transparency=TRANSPARENT +block:id=wall_torch,state=*,patch0=0:torch,transparency=TRANSPARENT # Fire block:id=fire,patch0-3=0:fire_0,patch4-7=0:fire_1,transparency=TRANSPARENT # Monster spawner