From df3f6a2c19a354539ff58db7fee87193bca37dd3 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 30 Jan 2022 02:15:18 -0600 Subject: [PATCH] Fix Sculk Sensor --- DynmapCore/src/main/resources/models_1.txt | 21 ++------------------- DynmapCore/src/main/resources/texture_1.txt | 12 +++++++----- 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt index d29f2df4..43ee479c 100644 --- a/DynmapCore/src/main/resources/models_1.txt +++ b/DynmapCore/src/main/resources/models_1.txt @@ -2153,25 +2153,8 @@ patchblock:id=bubble_column [1.17-]*------* [1.17-]*------* [1.17-]******** -# Scolk Sensor -[1.17-]patch:id=patch554,Ox=0.000000,Oy=0.000000,Oz=0.000000,Ux=1.000000,Uy=0.000000,Uz=0.000000,Vx=0.000000,Vy=0.000000,Vz=1.000000,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top -[1.17-]patch:id=patch799,Ox=1.000000,Oy=0.000000,Oz=0.000000,Ux=0.000000,Uy=0.000000,Uz=0.000000,Vx=1.000000,Vy=0.500000,Vz=0.000000,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top -[1.17-]patch:id=patch800,Ox=1.000000,Oy=0.000000,Oz=1.000000,Ux=1.000000,Uy=0.000000,Uz=0.000000,Vx=1.000000,Vy=0.500000,Vz=1.000000,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top -[1.17-]patch:id=patch801,Ox=0.000000,Oy=0.000000,Oz=0.000000,Ux=0.000000,Uy=0.000000,Uz=1.000000,Vx=0.000000,Vy=0.500000,Vz=0.000000,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top -[1.17-]patch:id=patch802,Ox=0.000000,Oy=0.000000,Oz=1.000000,Ux=1.000000,Uy=0.000000,Uz=1.000000,Vx=0.000000,Vy=0.500000,Vz=1.000000,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top -[1.17-]patch:id=patch803,Ox=0.000000,Oy=0.500000,Oz=1.000000,Ux=1.000000,Uy=0.500000,Uz=1.000000,Vx=0.000000,Vy=0.500000,Vz=0.000000,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top -[1.17-]patch:id=patch804,Ox=0.364277,Oy=0.500000,Oz=0.364277,Ux=0.010723,Uy=0.500000,Uz=0.010723,Vx=0.364277,Vy=1.000000,Vz=0.364277,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top -[1.17-]patch:id=patch805,Ox=0.010723,Oy=0.500000,Oz=0.010723,Ux=0.364277,Uy=0.500000,Uz=0.364277,Vx=0.010723,Vy=1.000000,Vz=0.010723,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top -[1.17-]patch:id=patch806,Ox=0.989277,Oy=0.500000,Oz=0.010723,Ux=0.635723,Uy=0.500000,Uz=0.364277,Vx=0.989277,Vy=1.000000,Vz=0.010723,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top -[1.17-]patch:id=patch807,Ox=0.635723,Oy=0.500000,Oz=0.364277,Ux=0.989277,Uy=0.500000,Uz=0.010723,Vx=0.635723,Vy=1.000000,Vz=0.364277,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top -[1.17-]patch:id=patch808,Ox=0.989277,Oy=0.500000,Oz=0.989277,Ux=0.635723,Uy=0.500000,Uz=0.635723,Vx=0.989277,Vy=1.000000,Vz=0.989277,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top -[1.17-]patch:id=patch809,Ox=0.635723,Oy=0.500000,Oz=0.635723,Ux=0.989277,Uy=0.500000,Uz=0.989277,Vx=0.635723,Vy=1.000000,Vz=0.635723,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top -[1.17-]patch:id=patch810,Ox=0.364277,Oy=0.500000,Oz=0.635723,Ux=0.010723,Uy=0.500000,Uz=0.989277,Vx=0.364277,Vy=1.000000,Vz=0.635723,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top -[1.17-]patch:id=patch811,Ox=0.010723,Oy=0.500000,Oz=0.989277,Ux=0.364277,Uy=0.500000,Uz=0.635723,Vx=0.010723,Vy=1.000000,Vz=0.989277,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top - -[1.17-]patchblock:id=%sculk_sensor,data=0,data=1,data=6,data=7,data=12,data=13,patch0=patch799,patch1=patch800,patch2=patch554,patch3=patch801,patch4=patch802,patch5=patch803,patch6=patch804,patch7=patch805,patch8=patch806,patch9=patch807,patch10=patch808,patch11=patch809,patch12=patch810,patch13=patch811 -[1.17-]patchblock:id=%sculk_sensor,data=2,data=3,data=8,data=9,data=14,data=15,patch0=patch799,patch1=patch800,patch2=patch554,patch3=patch801,patch4=patch802,patch5=patch803,patch6=patch804,patch7=patch805,patch8=patch806,patch9=patch807,patch10=patch808,patch11=patch809,patch12=patch810,patch13=patch811 -[1.17-]patchblock:id=%sculk_sensor,data=4,data=5,data=10,data=11,patch0=patch799,patch1=patch800,patch2=patch554,patch3=patch801,patch4=patch802,patch5=patch803,patch6=patch804,patch7=patch805,patch8=patch806,patch9=patch807,patch10=patch808,patch11=patch809,patch12=patch810,patch13=patch811 +# Scolk Sensor (inactive) (sculk_sensor_bottom, sculk_sensor_side, sculk_sensor_tendril_inactive/active, sculk_sensor_top) +[1.17-]modellist:id=sculk_sensor,data=*,box=0/0/0:16/8/16:n/1/0/8/16/16:e/1/0/8/16/16:s/1/0/8/16/16:w/1/0/8/16/16:u/3/0/0/16/16:d/0/0/0/16/16,box=-1/8/3:7/16/3/0/45/0/3/12/3:n/2/4/8/12/16:s/2/12/8/4/16,box=9/8/3:17/16/3/0/-45/0/13/12/3:n/2/12/8/4/16:s/2/4/8/12/16,box=9/8/13:17/16/13/0/45/0/13/12/13:n/2/12/8/4/16:s/2/4/8/12/16,box=-1/8/13:7/16/13/0/-45/0/3/12/13:n/2/4/8/12/16:s/2/12/8/4/16 # Spore Blossom [1.17-]patch:id=patch812,Ox=0.062500,Oy=0.993750,Oz=0.062500,Ux=0.937500,Uy=0.993750,Uz=0.062500,Vx=0.062500,Vy=0.993750,Vz=0.937500,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top [1.17-]patch:id=patch813,Ox=0.062500,Oy=0.993750,Oz=0.937500,Ux=0.937500,Uy=0.993750,Uz=0.937500,Vx=0.062500,Vy=0.993750,Vz=0.062500,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt index b07c9ea0..204ae80a 100644 --- a/DynmapCore/src/main/resources/texture_1.txt +++ b/DynmapCore/src/main/resources/texture_1.txt @@ -3075,16 +3075,18 @@ block:id=black_banner,id=black_wall_banner,data=*,patch0=0:oak_planks,patch1=0:b [1.17-]block:id=powder_snow_cauldron,data=*,top=0:cauldron_top,bottom=0:cauldron_bottom,allsides=0:cauldron_side,stdrot=true,transparency=TRANSPARENT # Budding amethyst [1.17-]block:id=budding_amethyst,allfaces=0:budding_amethyst,stdrot=true -# Sculk Sensor +# Sculk Sensor (sculk_sensor_bottom, sculk_sensor_side, sculk_sensor_tendril_inactive/active, sculk_sensor_top) [1.17-]texture:id=sculk_sensor_side [1.17-]texture:id=sculk_sensor_bottom [1.17-]texture:id=sculk_sensor_top [1.17-]texture:id=sculk_sensor_tendril_inactive [1.17-]texture:id=sculk_sensor_tendril_active - -[1.17-]block:id=%sculk_sensor,data=0,data=1,data=6,data=7,data=12,data=13,patch0=0:sculk_sensor_side,patch1=0:sculk_sensor_side,patch2=0:sculk_sensor_bottom,patch3=0:sculk_sensor_side,patch4=0:sculk_sensor_side,patch5=0:sculk_sensor_top,patch6=0:sculk_sensor_tendril_inactive,patch7=0:sculk_sensor_tendril_inactive,patch8=0:sculk_sensor_tendril_inactive,patch9=0:sculk_sensor_tendril_inactive,patch10=0:sculk_sensor_tendril_inactive,patch11=0:sculk_sensor_tendril_inactive,patch12=0:sculk_sensor_tendril_inactive,patch13=0:sculk_sensor_tendril_inactive,transparency=SEMITRANSPARENT,stdrot=true -[1.17-]block:id=%sculk_sensor,data=2,data=3,data=8,data=9,data=14,data=15,patch0=0:sculk_sensor_side,patch1=0:sculk_sensor_side,patch2=0:sculk_sensor_bottom,patch3=0:sculk_sensor_side,patch4=0:sculk_sensor_side,patch5=0:sculk_sensor_top,patch6=0:sculk_sensor_tendril_active,patch7=0:sculk_sensor_tendril_active,patch8=0:sculk_sensor_tendril_active,patch9=0:sculk_sensor_tendril_active,patch10=0:sculk_sensor_tendril_active,patch11=0:sculk_sensor_tendril_active,patch12=0:sculk_sensor_tendril_active,patch13=0:sculk_sensor_tendril_active,transparency=SEMITRANSPARENT,stdrot=true -[1.17-]block:id=%sculk_sensor,data=4,data=5,data=10,data=11,patch0=0:sculk_sensor_side,patch1=0:sculk_sensor_side,patch2=0:sculk_sensor_bottom,patch3=0:sculk_sensor_side,patch4=0:sculk_sensor_side,patch5=0:sculk_sensor_top,patch6=0:sculk_sensor_tendril_inactive,patch7=0:sculk_sensor_tendril_inactive,patch8=0:sculk_sensor_tendril_inactive,patch9=0:sculk_sensor_tendril_inactive,patch10=0:sculk_sensor_tendril_inactive,patch11=0:sculk_sensor_tendril_inactive,patch12=0:sculk_sensor_tendril_inactive,patch13=0:sculk_sensor_tendril_inactive,transparency=SEMITRANSPARENT,stdrot=true +# Sculk Sensor (inactive) +[1.17-]block:id=sculk_sensor,data=0,data=1,data=6,data=7,data=10,data=11,data=14,data=15,data=18,data=19,data=22,data=23,data=26,data=27,data=30,data=31,data=34,data=35,data=38,data=39,data=42,data=43,data=46,data=47,data=50,data=51,data=54,data=55,data=58,data=59,data=62,data=63,data=66,data=67,data=70,data=71,data=74,data=75,data=78,data=79,data=82,data=83,data=86,data=87,data=90,data=91,patch0=0:sculk_sensor_bottom,patch1=0:sculk_sensor_side,patch2=0:sculk_sensor_tendril_inactive,patch3=0:sculk_sensor_top +# Sculk Sensor (active) +[1.17-]block:id=sculk_sensor,data=2,data=3,data=8,data=9,data=12,data=13,data=16,data=17,data=20,data=21,data=24,data=25,data=28,data=29,data=32,data=33,data=36,data=37,data=40,data=41,data=44,data=45,data=48,data=49,data=52,data=53,data=56,data=57,data=60,data=61,data=64,data=65,data=68,data=69,data=72,data=73,data=76,data=77,data=80,data=81,data=84,data=85,data=88,data=89,data=92,data=93,patch0=0:sculk_sensor_bottom,patch1=0:sculk_sensor_side,patch2=0:sculk_sensor_tendril_active,patch3=0:sculk_sensor_top +# Sculk Sensor (cooldown) +[1.17-]block:id=sculk_sensor,data=4,data=5,data=10,data=11,data=14,data=15,data=18,data=19,data=22,data=23,data=26,data=27,data=30,data=31,data=34,data=35,data=38,data=39,data=42,data=43,data=46,data=47,data=50,data=51,data=54,data=55,data=58,data=59,data=62,data=63,data=66,data=67,data=70,data=71,data=70,data=71,data=78,data=79,data=82,data=83,data=86,data=87,data=90,data=91,data=94,data=95,patch0=0:sculk_sensor_bottom,patch1=0:sculk_sensor_side,patch2=0:sculk_sensor_tendril_inactive,patch3=0:sculk_sensor_top # Spore blossom [1.17-]texture:id=spore_blossom_base [1.17-]texture:id=spore_blossom