From 18f2bba608991fedc9216ca4d7631a6a65b0db8d Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Wed, 19 Jan 2022 22:38:25 -0600 Subject: [PATCH] Fix piston head models --- DynmapCore/src/main/resources/models_1.txt | 6 +++--- DynmapCore/src/main/resources/texture_1.txt | 10 +++++----- 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 ec85b9e9..8840cab2 100644 --- a/DynmapCore/src/main/resources/models_1.txt +++ b/DynmapCore/src/main/resources/models_1.txt @@ -621,7 +621,7 @@ block:id=repeater,data=12,data=13,data=14,data=15,data=28,data=29,data=30,data=3 rotate:id=repeater,data=0,rot=270 # Sticky piston # Piston: -boxlist:id=piston,id=sticky_piston,data=4,box=0:1:0:0.75:0:1:0/3/2/2/2/,box=0.375:0.625:0.75:1.0:0.375:0.625:3/3/2/2/2/2 +boxlist:id=piston,id=sticky_piston,data=4,box=0:1:0:0.75:0:1:0/3/2/2/2/2,box=0.375:0.625:0.75:1.0:0.375:0.625:3/3/4/4/4/4 patchblock:id=piston,id=sticky_piston,data=0 patchrotate:id=piston,data=4,rotx=90 patchblock:id=piston,id=sticky_piston,data=1 @@ -632,7 +632,7 @@ patchblock:id=piston,id=sticky_piston,data=3 patchrotate:id=piston,data=4,rotx=90,roty=270 patchblock:id=piston,id=sticky_piston,data=5 patchrotate:id=piston,data=4,rotx=180 -boxlist:id=piston,id=sticky_piston,data=10,box=0:1:0:0.75:0:1:0/3/2/2/2/,box=0:1:0.75:1.0:0:1:3/1/2/2/2/2 +boxlist:id=piston,id=sticky_piston,data=10,box=0:1:0:0.75:0:1:0/3/2/2/2/2,box=0:1:0.75:1.0:0:1:3/1/4/4/4/4 patchblock:id=piston,id=sticky_piston,data=6 patchrotate:id=piston,data=10,rotx=90 patchblock:id=piston,id=sticky_piston,data=7 @@ -644,7 +644,7 @@ patchrotate:id=piston,data=10,rotx=90,roty=270 patchblock:id=piston,id=sticky_piston,data=11 patchrotate:id=piston,data=10,rotx=180 # Piston head -boxlist:id=piston_head,data=16,data=17,data=18,data=19,box=0:1:0.75:1:0:1:3/1/2/2/2/,box=0.375:0.625:0:0.75:0.375:0.625:2/2/2/2/2/2 +boxlist:id=piston_head,data=16,data=17,data=18,data=19,box=0:1:0.75:1:0:1:3/1/2/2/2/2,box=0.375:0.625:0:0.75:0.375:0.625:2/2/4/4/4/4 patchblock:id=piston_head,data=0,data=1,data=2,data=3 patchrotate:id=piston_head,data=16,rotx=90 patchblock:id=piston_head,data=4,data=5,data=6,data=7 diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt index ada13379..10c17683 100644 --- a/DynmapCore/src/main/resources/texture_1.txt +++ b/DynmapCore/src/main/resources/texture_1.txt @@ -190,7 +190,7 @@ texture:id=detector_rail_on texture:id=detector_rail texture:id=piston_bottom texture:id=piston_inner -texture:id=piston_side +texture:id=piston_side,format=CUSTOM,tile0=0:0/16:16/0:0,tile1=0:0/12:4/4:6,tile2=12:0/4:4/0:6 texture:id=piston_top texture:id=piston_top_sticky texture:id=dandelion @@ -813,12 +813,12 @@ block:id=tall_seagrass,data=0,patch0-3=1000:tall_seagrass_top,transparency=TRANS block:id=tall_seagrass,data=1,patch0-3=1000:tall_seagrass_bottom,transparency=TRANSPARENT # Piston -block:id=piston,patch0=0:piston_bottom,patch1=0:piston_top,patch2=0:piston_side,patch3=0:piston_inner +block:id=piston,patch0=0:piston_bottom,patch1=0:piston_top,patch2=0:piston_side,patch3=0:piston_inner,patch4=6002:piston_side # Sticky piston -block:id=sticky_piston,patch0=0:piston_bottom,patch1=0:piston_top_sticky,patch2=0:piston_side,patch3=0:piston_inner +block:id=sticky_piston,patch0=0:piston_bottom,patch1=0:piston_top_sticky,patch2=0:piston_side,patch3=0:piston_inner,patch4=6002:piston_side # Piston head -block:id=piston_head,data=0,data=2,data=4,data=6,data=8,data=10,data=12,data=14,data=16,data=18,data=20,data=22,patch0=0:piston_bottom,patch1=0:piston_top,patch2=0:piston_side,patch3=0:piston_inner,transparency=TRANSPARENT -block:id=piston_head,data=1,data=3,data=5,data=7,data=9,data=11,data=13,data=15,data=17,data=19,data=21,data=23,patch0=0:piston_bottom,patch1=0:piston_top_sticky,patch2=0:piston_side,patch3=0:piston_inner,transparency=TRANSPARENT +block:id=piston_head,data=0,data=2,data=4,data=6,data=8,data=10,data=12,data=14,data=16,data=18,data=20,data=22,patch0=0:piston_bottom,patch1=0:piston_top,patch2=0:piston_side,patch3=0:piston_inner,patch4=6001:piston_side,transparency=TRANSPARENT +block:id=piston_head,data=1,data=3,data=5,data=7,data=9,data=11,data=13,data=15,data=17,data=19,data=21,data=23,patch0=0:piston_bottom,patch1=0:piston_top_sticky,patch2=0:piston_side,patch3=0:piston_inner,patch4=6001:piston_side,transparency=TRANSPARENT # Moving piston (don't show) block:id=moving_piston # Wool