From de344869b7a01edfee58d0414acd77c02c89f4a7 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Fri, 11 Feb 2022 00:40:52 -0600 Subject: [PATCH] Switch rails to state mapping --- DynmapCore/src/main/resources/models_1.txt | 18 ++++++------------ DynmapCore/src/main/resources/texture_1.txt | 12 ++++-------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt index 327a89b3..58db8464 100644 --- a/DynmapCore/src/main/resources/models_1.txt +++ b/DynmapCore/src/main/resources/models_1.txt @@ -325,33 +325,27 @@ boxblock:id=stone_button,id=oak_button,id=spruce_button,id=birch_button,id=jungl # Powered rails - flat - east/west # Detector rails - flat - east/west # Activator Rail - flat - east/west -[-1.16.5]patchblock:id=powered_rail,id=detector_rail,id=activator_rail,data=0,data=6,patch0=HorizY001ZTop -[1.17-]patchblock:id=powered_rail,id=detector_rail,id=activator_rail,data=0,data=1,data=12,data=13,patch0=HorizY001ZTop +patchblock:id=powered_rail,id=detector_rail,id=activator_rail,state=shape:north_south,patch0=HorizY001ZTop # Powered rails - flat - north/south # Detector rails - flat - north/south # Activator Rail - flat - north/south -[-1.16.5]patchblock:id=powered_rail,id=detector_rail,id=activator_rail,data=1,data=7,patch0=HorizY001ZTop@90 -[1.17-]patchblock:id=powered_rail,id=detector_rail,id=activator_rail,data=2,data=3,data=14,data=15,patch0=HorizY001ZTop@90 +patchblock:id=powered_rail,id=detector_rail,id=activator_rail,state=shape:east_west,patch0=HorizY001ZTop@90 # Powered rails - ascending to south # Detector rails - ascending to south # Activator Rail - ascending to south -[-1.16.5]patchblock:id=powered_rail,id=detector_rail,id=activator_rail,data=2,data=8,patch0=SlopeXUpZTop -[1.17-]patchblock:id=powered_rail,id=detector_rail,id=activator_rail,data=4,data=5,data=16,data=17,patch0=SlopeXUpZTop +patchblock:id=powered_rail,id=detector_rail,id=activator_rail,state=shape:ascending_east,patch0=SlopeXUpZTop # Powered rails - ascending to north # Detector rails - ascending to north # Activator Rail - ascending to north -[-1.16.5]patchblock:id=powered_rail,id=detector_rail,id=activator_rail,data=3,data=9,patch0=SlopeXUpZTop@180 -[1.17-]patchblock:id=powered_rail,id=detector_rail,id=activator_rail,data=6,data=7,data=18,data=19,patch0=SlopeXUpZTop@180 +patchblock:id=powered_rail,id=detector_rail,id=activator_rail,state=shape:ascending_west,patch0=SlopeXUpZTop@180 # Powered rails - ascending to east # Detector rails - ascending to east # Activator Rail - ascending to east -[-1.16.5]patchblock:id=powered_rail,id=detector_rail,id=activator_rail,data=4,data=10,patch0=SlopeXUpZTop@270 -[1.17-]patchblock:id=powered_rail,id=detector_rail,id=activator_rail,data=8,data=9,data=20,data=21,patch0=SlopeXUpZTop@270 +patchblock:id=powered_rail,id=detector_rail,id=activator_rail,state=shape:ascending_north,patch0=SlopeXUpZTop@270 # Powered rails - ascending to west # Detector rails - ascending to west # Activator Rail - ascending to west -[-1.16.5]patchblock:id=powered_rail,id=detector_rail,id=activator_rail,data=5,data=21,patch0=SlopeXUpZTop@90 -[1.17-]patchblock:id=powered_rail,id=detector_rail,id=activator_rail,data=10,data=11,data=22,data=23,patch0=SlopeXUpZTop@90 +patchblock:id=powered_rail,id=detector_rail,id=activator_rail,state=shape:ascending_south,patch0=SlopeXUpZTop@90 # Ladder patchblock:id=ladder,data=0,data=1,patch0=VertX0In@270 diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt index da2b9c90..9f83e184 100644 --- a/DynmapCore/src/main/resources/texture_1.txt +++ b/DynmapCore/src/main/resources/texture_1.txt @@ -788,18 +788,14 @@ block:id=red_bed,patch0=0:red_bed,patch1=1:red_bed,patch2=2:red_bed,patch3=3:red block:id=black_bed,patch0=0:black_bed,patch1=1:black_bed,patch2=2:black_bed,patch3=3:black_bed,patch4=4:black_bed,patch5=5:black_bed,patch6=6:black_bed,patch7=7:black_bed,patch8=8:black_bed,patch9=9:black_bed,patch10=10:black_bed,patch11=11:black_bed,patch12=12:black_bed,patch13=13:black_bed,patch14=14:black_bed,patch15=15:black_bed,patch16=16:black_bed,patch17=17:black_bed,transparency=TRANSPARENT # Powered rail - powered -[-1.16.5]block:id=powered_rail,data=0-5,patch0=0:powered_rail_on,transparency=TRANSPARENT -[1.17-]block:id=powered_rail,data=0-11,patch0=0:powered_rail_on,transparency=TRANSPARENT +block:id=powered_rail,state=powered:true,patch0=0:powered_rail_on,transparency=TRANSPARENT # Powered rail - unpowered -[-1.16.5]block:id=powered_rail,data=6-11,patch0=0:powered_rail,transparency=TRANSPARENT -[1.17-]block:id=powered_rail,data=12-23,patch0=0:powered_rail,transparency=TRANSPARENT +block:id=powered_rail,state=powered:false,patch0=0:powered_rail,transparency=TRANSPARENT # Detector rail - powered -[-1.16.5]block:id=detector_rail,data=0-5,patch0=0:detector_rail_on,transparency=TRANSPARENT -[1.17-]block:id=detector_rail,data=0-11,patch0=0:detector_rail_on,transparency=TRANSPARENT +block:id=detector_rail,state=powered:true,patch0=0:detector_rail_on,transparency=TRANSPARENT # Detector rail - unpowered -[-1.16.5]block:id=detector_rail,data=6-11,patch0=0:detector_rail,transparency=TRANSPARENT -[1.17-]block:id=detector_rail,data=12-23,patch0=0:detector_rail,transparency=TRANSPARENT +block:id=detector_rail,state=powered:false,patch0=0:detector_rail,transparency=TRANSPARENT # Web