Fix rail models for 1.13

webbukkit · Aug 22, 2018 · 33fda83 · 33fda83
1 parent 98a9fd6
commit 33fda83
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 82 deletions.
diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt
@@ -287,41 +287,17 @@ boxblock:id=stone_button,id=oak_button,id=spruce_button,id=birch_button,id=jungl
 boxblock:id=stone_button,id=oak_button,id=spruce_button,id=birch_button,id=jungle_button,id=acacia_button,id=dark_oak_button,data=5,data=13,xmin=0.3125,xmax=0.6875,ymax=0.125,zmin=0.375,zmax=0.625
 
 # Rails - flat - east/west
-# Powered rails - flat - east/west
-# Detector rails - flat - east/west
-# (157)	Activator Rail
-patchblock:id=rail,id=powered_rail,id=detector_rail,id=activator_rail,data=0,patch0=HorizY001ZTop
-# Powered rails - flat - east/west (powered)
-# (157)	Activator Rail
-patchblock:id=powered_rail,id=activator_rail,data=8,patch0=HorizY001ZTop
+patchblock:id=rail,data=0,patch0=HorizY001ZTop
 # Rails - flat - north/south
-# Powered rails - flat - north/south
-# Detector rails - flat - north/south
-# (157)	Activator Rail
-patchblock:id=rail,id=powered_rail,id=detector_rail,id=activator_rail,data=1,patch0=HorizY001ZTop@90
-# Powered rails - flat - north/south (powred)
-# (157)	Activator Rail
-patchblock:id=powered_rail,id=activator_rail,data=9,patch0=HorizY001ZTop@90
+patchblock:id=rail,data=1,patch0=HorizY001ZTop@90
 # Rails - ascending to south 
-# Powered rails - ascending to south (powered or unpowered)
-# Detector rails - ascending to south
-# (157)	Activator Rail
-patchblock:id=rail,id=powered_rail,id=detector_rail,id=activator_rail,data=2,data=10,patch0=SlopeXUpZTop
+patchblock:id=rail,data=2,data=10,patch0=SlopeXUpZTop
 # Rails - ascending to north
-# Powered rails - ascending to north
-# Detector rails - ascending to north
-# (157)	Activator Rail
-patchblock:id=rail,id=powered_rail,id=detector_rail,id=activator_rail,data=3,data=11,patch0=SlopeXUpZTop@180
+patchblock:id=rail,data=3,data=11,patch0=SlopeXUpZTop@180
 # Rails - ascending to east
-# Powered rails - ascending to east
-# Detector rails - ascending to east
-# (157)	Activator Rail
-patchblock:id=rail,id=powered_rail,id=detector_rail,id=activator_rail,data=4,data=12,patch0=SlopeXUpZTop@270
+patchblock:id=rail,data=4,data=12,patch0=SlopeXUpZTop@270
 # Rails - ascending to west
-# Powered rails - ascending to west
-# Detector rails - ascending to west
-# (157)	Activator Rail
-patchblock:id=rail,id=powered_rail,id=detector_rail,id=activator_rail,data=5,data=13,patch0=SlopeXUpZTop@90
+patchblock:id=rail,data=5,data=13,patch0=SlopeXUpZTop@90
 # Rails - northeast corner
 patchblock:id=rail,data=6,patch0=HorizY001ZTop@90
 # Rails - southeast corner
@@ -330,6 +306,33 @@ patchblock:id=rail,data=7,patch0=HorizY001ZTop@180
 patchblock:id=rail,data=8,patch0=HorizY001ZTop@270
 # Rails - northwest corner
 patchblock:id=rail,data=9,patch0=HorizY001ZTop
+
+# Powered rails - flat - east/west
+# Detector rails - flat - east/west
+# Activator Rail - flat - east/west
+patchblock:id=powered_rail,id=detector_rail,id=activator_rail,data=0,data=6,patch0=HorizY001ZTop
+# Powered rails - flat - north/south
+# Detector rails - flat - north/south
+# Activator Rail - flat - north/south
+patchblock:id=powered_rail,id=detector_rail,id=activator_rail,data=1,data=7,patch0=HorizY001ZTop@90
+# Powered rails - ascending to south 
+# Detector rails - ascending to south 
+# Activator Rail - ascending to south 
+patchblock:id=powered_rail,id=detector_rail,id=activator_rail,data=2,data=8,patch0=SlopeXUpZTop
+# Powered rails - ascending to north 
+# Detector rails - ascending to north 
+# Activator Rail - ascending to north 
+patchblock:id=powered_rail,id=detector_rail,id=activator_rail,data=3,data=9,patch0=SlopeXUpZTop@180
+# Powered rails - ascending to east 
+# Detector rails - ascending to east 
+# Activator Rail - ascending to east 
+patchblock:id=powered_rail,id=detector_rail,id=activator_rail,data=4,data=10,patch0=SlopeXUpZTop@270
+# Powered rails - ascending to west 
+# Detector rails - ascending to west 
+# Activator Rail - ascending to west 
+patchblock:id=powered_rail,id=detector_rail,id=activator_rail,data=5,data=11,patch0=SlopeXUpZTop@90
+
+
 # Ladder - attached to east side of block
 patchblock:id=ladder,data=2,patch0=VertX0In@270
 # Ladder - attached to west side of block

diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt
@@ -774,37 +774,16 @@ block:id=red_bed,patch0=0:red_bed,patch1=1:red_bed,patch2=2:red_bed,patch3=3:red
 # Black Bed
 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 - heading north-south - powered
-block:id=powered_rail,data=0,patch0=0:powered_rail_on,transparency=TRANSPARENT
-# Powered rail - heading east-west - powered
-block:id=powered_rail,data=1,patch0=0:powered_rail_on,transparency=TRANSPARENT
-# Powered rail - incline to east - powered
-# Powered rail - incline to west - powered
-block:id=powered_rail,data=2,data=3,patch0=0:powered_rail_on,transparency=TRANSPARENT
-# Powered rail - inclined to north - powered
-# Powered rail - inclined to south - powered
-block:id=powered_rail,data=4,data=5,patch0=0:powered_rail_on,transparency=TRANSPARENT
-# Powered rail - heading north-south - unpowered
-block:id=powered_rail,data=6,patch0=0:powered_rail,transparency=TRANSPARENT
-# Powered rail - heading east-west - unpowered
-block:id=powered_rail,data=7,patch0=0:powered_rail,transparency=TRANSPARENT
-# Powered rail - incline to east - unpowered
-# Powered rail - incline to west - unpowered
-block:id=powered_rail,data=4,data=5,patch0=0:powered_rail,transparency=TRANSPARENT
-# Powered rail - inclined to north - unpowered
-# Powered rail - inclined to south - unpowered
-block:id=powered_rail,data=2,data=3,patch0=0:powered_rail,transparency=TRANSPARENT
-
-# Detector rail - heading east-west
-block:id=detector_rail,data=0,patch0=0:detector_rail,transparency=TRANSPARENT
-# Detector rail - incline to east
-# Detector rail - incline to west
-block:id=detector_rail,data=4,data=5,patch0=0:detector_rail,transparency=TRANSPARENT
-# Detector rail - heading north-south
-block:id=detector_rail,data=1,patch0=0:detector_rail,transparency=TRANSPARENT
-# Detector rail - incline to north
-# Detector rail - incline to south
-block:id=detector_rail,data=2,data=3,patch0=0:detector_rail,transparency=TRANSPARENT
+# Powered rail - powered
+block:id=powered_rail,data=0-5,patch0=0:powered_rail_on,transparency=TRANSPARENT
+# Powered rail - unpowered
+block:id=powered_rail,data=6-11,patch0=0:powered_rail,transparency=TRANSPARENT
+
+# Detector rail - powered
+block:id=detector_rail,data=0-5,patch0=0:detector_rail_on,transparency=TRANSPARENT
+# Detector rail - unpowered
+block:id=detector_rail,data=6-11,patch0=0:detector_rail,transparency=TRANSPARENT
+
 # Sticky piston - facing down
 block:id=sticky_piston,data=0,top=0:piston_bottom,bottom=0:piston_top_sticky,allsides=5000:piston_side,transparency=TRANSPARENT
 # Sticky piston - facing up
@@ -1508,27 +1487,10 @@ block:id=quartz_pillar,data=2,top=0:quartz_pillar,bottom=0:quartz_pillar,north=6
 # Quartz Stairs
 block:id=quartz_stairs,patch0=0:quartz_block_side,patch1=0:quartz_block_top,patch2=0:quartz_block_bottom,transparency=SEMITRANSPARENT
 
-# Activator Rail
-# Activator rail - heading east-west - unpowered
-block:id=activator_rail,data=7,patch0=0:activator_rail,transparency=TRANSPARENT
-# Activator rail - incline to east - unpowered
-# Activator rail - incline to west - unpowered
-block:id=activator_rail,data=8,data=9,patch0=0:activator_rail,transparency=TRANSPARENT
-# Activator rail - heading east-west - powered
-block:id=activator_rail,data=1,patch0=0:activator_rail_on,transparency=TRANSPARENT
-# Activator rail - incline to east - powered
-# Activator rail - incline to west - powered
-block:id=activator_rail,data=2,data=3,patch0=0:activator_rail_on,transparency=TRANSPARENT
-# Activator rail - heading north-south - unpowered
-block:id=activator_rail,data=6,patch0=0:activator_rail,transparency=TRANSPARENT
-# Activator rail - inclined to north - unpowered
-# Activator rail - inclined to south - unpowered
-block:id=activator_rail,data=10,data=11,patch0=0:activator_rail,transparency=TRANSPARENT
-# Activator rail - heading north-south - powered
-block:id=activator_rail,data=0,patch0=0:activator_rail_on,transparency=TRANSPARENT
-# Activator rail - inclined to north - powered
-# Activator rail - inclined to south - powered
-block:id=activator_rail,data=4,data=5,patch0=0:activator_rail_on,transparency=TRANSPARENT
+# Activator rail - powered
+block:id=activator_rail,data=0-5,patch0=0:activator_rail_on,transparency=TRANSPARENT
+# Activator rail - unpowered
+block:id=activator_rail,data=6-11,patch0=0:activator_rail,transparency=TRANSPARENT
 
 # (158)	Dropper
 block:id=dropper,data=0-1,top=0:furnace_top,east=0:furnace_top,south=0:furnace_top,north=0:furnace_top,west=0:furnace_top,bottom=6000:dropper_front_vertical