Fix rails for both pre 1.17 and 1.17

Author: mikeprimm

DynmapCore/src/main/resources/models_1.txt

@@ -294,72 +294,67 @@ 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=0-3,xmin=0.3125,xmax=0.6875,ymax=0.125,zmin=0.375,zmax=0.625
 boxblock:id=stone_button,id=oak_button,id=spruce_button,id=birch_button,id=jungle_button,id=acacia_button,id=dark_oak_button,data=4-7,xmin=0.375,xmax=0.625,ymax=0.125,zmin=0.3125,zmax=0.6875
 
-[23:27:55] [Server thread/INFO]: [Dynmap] 3702: minecraft:rail[shape=north_south,waterlogged=true]
-[23:27:55] [Server thread/INFO]: [Dynmap] 3703: minecraft:rail[shape=north_south,waterlogged=false]
-[23:27:55] [Server thread/INFO]: [Dynmap] 3704: minecraft:rail[shape=east_west,waterlogged=true]
-[23:27:55] [Server thread/INFO]: [Dynmap] 3705: minecraft:rail[shape=east_west,waterlogged=false]
-[23:27:55] [Server thread/INFO]: [Dynmap] 3706: minecraft:rail[shape=ascending_east,waterlogged=true]
-[23:27:55] [Server thread/INFO]: [Dynmap] 3707: minecraft:rail[shape=ascending_east,waterlogged=false]
-[23:27:55] [Server thread/INFO]: [Dynmap] 3708: minecraft:rail[shape=ascending_west,waterlogged=true]
-[23:27:55] [Server thread/INFO]: [Dynmap] 3709: minecraft:rail[shape=ascending_west,waterlogged=false]
-[23:27:55] [Server thread/INFO]: [Dynmap] 3710: minecraft:rail[shape=ascending_north,waterlogged=true]
-[23:27:55] [Server thread/INFO]: [Dynmap] 3711: minecraft:rail[shape=ascending_north,waterlogged=false]
-[23:27:55] [Server thread/INFO]: [Dynmap] 3712: minecraft:rail[shape=ascending_south,waterlogged=true]
-[23:27:55] [Server thread/INFO]: [Dynmap] 3713: minecraft:rail[shape=ascending_south,waterlogged=false]
-[23:27:55] [Server thread/INFO]: [Dynmap] 3714: minecraft:rail[shape=south_east,waterlogged=true]
-[23:27:55] [Server thread/INFO]: [Dynmap] 3715: minecraft:rail[shape=south_east,waterlogged=false]
-[23:27:55] [Server thread/INFO]: [Dynmap] 3716: minecraft:rail[shape=south_west,waterlogged=true]
-[23:27:55] [Server thread/INFO]: [Dynmap] 3717: minecraft:rail[shape=south_west,waterlogged=false]
-[23:27:55] [Server thread/INFO]: [Dynmap] 3718: minecraft:rail[shape=north_west,waterlogged=true]
-[23:27:55] [Server thread/INFO]: [Dynmap] 3719: minecraft:rail[shape=north_west,waterlogged=false]
-[23:27:55] [Server thread/INFO]: [Dynmap] 3720: minecraft:rail[shape=north_east,waterlogged=true]
-[23:27:55] [Server thread/INFO]: [Dynmap] 3721: minecraft:rail[shape=north_east,waterlogged=false]
-
 # Rails - flat - north/south
-patchblock:id=rail,data=0,data=1,patch0=HorizY001ZTop
+[-1.16.5]patchblock:id=rail,data=0,patch0=HorizY001ZTop
+[1.17-]patchblock:id=rail,data=0,data=1,patch0=HorizY001ZTop
 # Rails - flat - east/west
-patchblock:id=rail,data=2,data=3,patch0=HorizY001ZTop@90
+[-1.16.5]patchblock:id=rail,data=1,patch0=HorizY001ZTop@90
+[1.17-]patchblock:id=rail,data=2,data=3,patch0=HorizY001ZTop@90
 # Rails - ascending to east
-patchblock:id=rail,data=4,data=5,patch0=SlopeXUpZTop
+[-1.16.5]patchblock:id=rail,data=2,patch0=SlopeXUpZTop
+[1.17-]patchblock:id=rail,data=4,data=5,patch0=SlopeXUpZTop
 # Rails - ascending to west
-patchblock:id=rail,data=6,data=7,patch0=SlopeXUpZTop@180
+[-1.16.5]patchblock:id=rail,data=3,patch0=SlopeXUpZTop@180
+[1.17-]patchblock:id=rail,data=6,data=7,patch0=SlopeXUpZTop@180
 # Rails - ascending to north
-patchblock:id=rail,data=8,data=9,patch0=SlopeXUpZTop@270
+[-1.16.5]patchblock:id=rail,data=4,patch0=SlopeXUpZTop@270
+[1.17-]patchblock:id=rail,data=8,data=9,patch0=SlopeXUpZTop@270
 # Rails - ascending to south 
-patchblock:id=rail,data=10,data=11,patch0=SlopeXUpZTop@90
+[-1.16.5]patchblock:id=rail,data=5,patch0=SlopeXUpZTop@90
+[1.17-]patchblock:id=rail,data=10,data=11,patch0=SlopeXUpZTop@90
 # Rails - southeast corner
-patchblock:id=rail,data=12,data=13,patch0=HorizY001ZTop@90
+[-1.16.5]patchblock:id=rail,data=6,patch0=HorizY001ZTop@90
+[1.17-]patchblock:id=rail,data=12,data=13,patch0=HorizY001ZTop@90
 # Rails - southwest corner
-patchblock:id=rail,data=14,data=15,patch0=HorizY001ZTop@180
+[-1.16.5]patchblock:id=rail,data=7,patch0=HorizY001ZTop@180
+[1.17-]patchblock:id=rail,data=14,data=15,patch0=HorizY001ZTop@180
 # Rails - northwest corner
-patchblock:id=rail,data=16,data=17,patch0=HorizY001ZTop@270
+[-1.16.5]patchblock:id=rail,data=8,patch0=HorizY001ZTop@270
+[1.17-]patchblock:id=rail,data=16,data=17,patch0=HorizY001ZTop@270
 # Rails - northeast corner
-patchblock:id=rail,data=18,data=19,patch0=HorizY001ZTop
+[-1.16.5]patchblock:id=rail,data=9,patch0=HorizY001ZTop
+[1.17-]patchblock:id=rail,data=18,data=19,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=1,data=12,data=13,patch0=HorizY001ZTop
+[-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
 # 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=2,data=3,data=14,data=15,patch0=HorizY001ZTop@90
+[-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
 # 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=4,data=5,data=16,data=17,patch0=SlopeXUpZTop
+[-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
 # 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=6,data=7,data=18,data=19,patch0=SlopeXUpZTop@180
+[-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
 # 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=8,data=9,data=20,data=21,patch0=SlopeXUpZTop@270
+[-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
 # 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=10,data=11,data=22,data=23,patch0=SlopeXUpZTop@90
+[-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
 
 # Ladder
 patchblock:id=ladder,data=0,data=1,patch0=VertX0In@270

DynmapCore/src/main/resources/texture_1.txt

@@ -784,50 +784,19 @@ 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
-block:id=powered_rail,data=0-11,patch0=0:powered_rail_on,transparency=TRANSPARENT
+[-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
 # Powered rail - unpowered
-block:id=powered_rail,data=12-23,patch0=0:powered_rail,transparency=TRANSPARENT
+[-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
 
 # Detector rail - powered
-block:id=detector_rail,data=0-11,patch0=0:detector_rail_on,transparency=TRANSPARENT
+[-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
 # Detector rail - unpowered
-block:id=detector_rail,data=12-23,patch0=0:detector_rail,transparency=TRANSPARENT
-
-[23:42:01] [Server thread/INFO]: [Dynmap] 1361: minecraft:detector_rail[powered=true,shape=north_south,waterlogged=true]
-[23:42:01] [Server thread/INFO]: [Dynmap] 1362: minecraft:detector_rail[powered=true,shape=north_south,waterlogged=false]
-[23:42:01] [Server thread/INFO]: [Dynmap] 1363: minecraft:detector_rail[powered=true,shape=east_west,waterlogged=true]
-[23:42:01] [Server thread/INFO]: [Dynmap] 1364: minecraft:detector_rail[powered=true,shape=east_west,waterlogged=false]
-[23:42:01] [Server thread/INFO]: [Dynmap] 1365: minecraft:detector_rail[powered=true,shape=ascending_east,waterlogged=true]
-[23:42:01] [Server thread/INFO]: [Dynmap] 1366: minecraft:detector_rail[powered=true,shape=ascending_east,waterlogged=false]
-[23:42:01] [Server thread/INFO]: [Dynmap] 1367: minecraft:detector_rail[powered=true,shape=ascending_west,waterlogged=true]
-[23:42:01] [Server thread/INFO]: [Dynmap] 1368: minecraft:detector_rail[powered=true,shape=ascending_west,waterlogged=false]
-[23:42:01] [Server thread/INFO]: [Dynmap] 1369: minecraft:detector_rail[powered=true,shape=ascending_north,waterlogged=true]
-[23:42:01] [Server thread/INFO]: [Dynmap] 1370: minecraft:detector_rail[powered=true,shape=ascending_north,waterlogged=false]
-[23:42:01] [Server thread/INFO]: [Dynmap] 1371: minecraft:detector_rail[powered=true,shape=ascending_south,waterlogged=true]
-[23:42:01] [Server thread/INFO]: [Dynmap] 1372: minecraft:detector_rail[powered=true,shape=ascending_south,waterlogged=false]
-[23:42:01] [Server thread/INFO]: [Dynmap] 1373: minecraft:detector_rail[powered=false,shape=north_south,waterlogged=true]
-[23:42:01] [Server thread/INFO]: [Dynmap] 1374: minecraft:detector_rail[powered=false,shape=north_south,waterlogged=false]
-[23:42:01] [Server thread/INFO]: [Dynmap] 1375: minecraft:detector_rail[powered=false,shape=east_west,waterlogged=true]
-[23:42:01] [Server thread/INFO]: [Dynmap] 1376: minecraft:detector_rail[powered=false,shape=east_west,waterlogged=false]
-[23:42:01] [Server thread/INFO]: [Dynmap] 1377: minecraft:detector_rail[powered=false,shape=ascending_east,waterlogged=true]
-[23:42:01] [Server thread/INFO]: [Dynmap] 1378: minecraft:detector_rail[powered=false,shape=ascending_east,waterlogged=false]
-[23:42:01] [Server thread/INFO]: [Dynmap] 1379: minecraft:detector_rail[powered=false,shape=ascending_west,waterlogged=true]
-[23:42:01] [Server thread/INFO]: [Dynmap] 1380: minecraft:detector_rail[powered=false,shape=ascending_west,waterlogged=false]
-[23:42:01] [Server thread/INFO]: [Dynmap] 1381: minecraft:detector_rail[powered=false,shape=ascending_north,waterlogged=true]
-[23:42:01] [Server thread/INFO]: [Dynmap] 1382: minecraft:detector_rail[powered=false,shape=ascending_north,waterlogged=false]
-[23:42:01] [Server thread/INFO]: [Dynmap] 1383: minecraft:detector_rail[powered=false,shape=ascending_south,waterlogged=true]
-[23:42:01] [Server thread/INFO]: [Dynmap] 1384: minecraft:detector_rail[powered=false,shape=ascending_south,waterlogged=false]
+[-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
 
-# Rail - heading north-south
-block:id=rail,data=0,data=1,patch0=0:rail,transparency=TRANSPARENT
-# Rail - heading east-west
-block:id=rail,data=2,data=3,patch0=0:rail,transparency=TRANSPARENT
-# Rail - incline to east
-# Rail - incline to west
-block:id=rail,data=4,data=5,data=6,data=7,patch0=0:rail,transparency=TRANSPARENT
-# Rail - incline to north
-# Rail - incline to south
-block:id=rail,data=8,data=9,data=10,data=11,patch0=0:rail,transparency=TRANSPARENT
 
 # Web
 block:id=cobweb,patch0-1=0:cobweb,transparency=TRANSPARENT
@@ -968,20 +937,25 @@ block:id=oak_door,data=*,patch0=0:oak_door_top,patch1=0:oak_door_bottom,transpar
 # Ladder
 block:id=ladder,patch0=0:ladder,transparency=TRANSPARENT
 # Rail - heading north-south
-block:id=rail,data=0,data=1,patch0=0:rail,transparency=TRANSPARENT
+[-1.16.5]block:id=rail,data=0,patch0=0:rail,transparency=TRANSPARENT
+[1.17-]block:id=rail,data=0,data=1,patch0=0:rail,transparency=TRANSPARENT
 # Rail - heading east-west
-block:id=rail,data=2,data=3,patch0=0:rail,transparency=TRANSPARENT
+[-1.16.5]block:id=rail,data=1,patch0=0:rail,transparency=TRANSPARENT
+[1.17-]block:id=rail,data=2,data=3,patch0=0:rail,transparency=TRANSPARENT
 # Rail - incline to east
 # Rail - incline to west
-block:id=rail,data=4,data=5,data=6,data=7,patch0=0:rail,transparency=TRANSPARENT
+[-1.16.5]block:id=rail,data=2,data=3,patch0=0:rail,transparency=TRANSPARENT
+[1.17-]block:id=rail,data=4,data=5,data=6,data=7,patch0=0:rail,transparency=TRANSPARENT
 # Rail - incline to north
 # Rail - incline to south
-block:id=rail,data=8,data=9,data=10,data=11,patch0=0:rail,transparency=TRANSPARENT
+[-1.16.5]block:id=rail,data=4,data=5,patch0=0:rail,transparency=TRANSPARENT
+[1.17-]block:id=rail,data=8,data=9,data=10,data=11,patch0=0:rail,transparency=TRANSPARENT
 # Rails - southeast corner
 # Rails - southwest corner
 # Rails - northwest corner
 # Rails - northeast corner
-block:id=rail,data=12,data=13,data=14,data=15,data=16,data=17,data=18,data=19,patch0=0:rail_corner,transparency=TRANSPARENT
+[-1.16.5]block:id=rail,data=6,data=7,data=8,data=9,patch0=0:rail_corner,transparency=TRANSPARENT
+[1.17-]block:id=rail,data=12,data=13,data=14,data=15,data=16,data=17,data=18,data=19,patch0=0:rail_corner,transparency=TRANSPARENT
 # Cobblestone Stairs
 block:id=cobblestone_stairs,patch0-2=0:cobblestone,transparency=SEMITRANSPARENT
 # Lever
@@ -1426,9 +1400,11 @@ block:id=quartz_pillar,data=2,top=0:quartz_pillar,bottom=0:quartz_pillar,north=6
 block:id=quartz_stairs,patch0=0:quartz_block_side,patch1=0:quartz_block_top,patch2=0:quartz_block_bottom,transparency=SEMITRANSPARENT
 
 # Activator rail - powered
-block:id=activator_rail,data=0-11,patch0=0:activator_rail_on,transparency=TRANSPARENT
+[-1.16.5]block:id=activator_rail,data=0-5,patch0=0:activator_rail_on,transparency=TRANSPARENT
+[1.17-]block:id=activator_rail,data=0-11,patch0=0:activator_rail_on,transparency=TRANSPARENT
 # Activator rail - unpowered
-block:id=activator_rail,data=12-23,patch0=0:activator_rail,transparency=TRANSPARENT
+[-1.16.5]block:id=activator_rail,data=6-11,patch0=0:activator_rail,transparency=TRANSPARENT
+[1.17-]block:id=activator_rail,data=12-23,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