Upstream
/
dynmap
mirror of https://github.com/webbukkit/dynmap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix end rods, and water shading in cauldron

This commit is contained in:
Mike Primm 2022-02-14 00:24:57 -06:00
parent dc129548aa
commit de79f8e8bc
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DynmapCore/src/main/resources/models_1.txt
View File

@ -1190,7 +1190,12 @@ customblock:id=acacia_fence,class=org.dynmap.hdmap.renderer.FenceWallBlockStateR
customblock:id=spruce_door,id=birch_door,id=jungle_door,id=acacia_door,id=dark_oak_door,class=org.dynmap.hdmap.renderer.DoorStateRenderer
# End rod
#block:id=end_rod,patch0=0:end_rod,transparency=TRANSPARENT
modellist:id=%end_rod,state=facing:north,box=6.000000/0.000000/6.000000:10.000000/1.000000/10.000000:u/0/2.000000/2.000000/6.000000/6.000000:n/0/2.000000/6.000000/6.000000/7.000000:w/0/2.000000/6.000000/6.000000/7.000000:e/0/2.000000/6.000000/6.000000/7.000000:d/0/6.000000/6.000000/2.000000/2.000000:s/0/2.000000/6.000000/6.000000/7.000000:R/90/0/0,box=7.000000/1.000000/7.000000:9.000000/16.000000/9.000000:u/0/2.000000/0.000000/4.000000/2.000000:n/0/0.000000/0.000000/2.000000/15.000000:w/0/0.000000/0.000000/2.000000/15.000000:e/0/0.000000/0.000000/2.000000/15.000000:s/0/0.000000/0.000000/2.000000/15.000000:R/90/0/0
modellist:id=%end_rod,state=facing:east,box=6.000000/0.000000/6.000000:10.000000/1.000000/10.000000:u/0/2.000000/2.000000/6.000000/6.000000:n/0/2.000000/6.000000/6.000000/7.000000:w/0/2.000000/6.000000/6.000000/7.000000:e/0/2.000000/6.000000/6.000000/7.000000:d/0/6.000000/6.000000/2.000000/2.000000:s/0/2.000000/6.000000/6.000000/7.000000:R/90/90/0,box=7.000000/1.000000/7.000000:9.000000/16.000000/9.000000:u/0/2.000000/0.000000/4.000000/2.000000:n/0/0.000000/0.000000/2.000000/15.000000:w/0/0.000000/0.000000/2.000000/15.000000:e/0/0.000000/0.000000/2.000000/15.000000:s/0/0.000000/0.000000/2.000000/15.000000:R/90/90/0
modellist:id=%end_rod,state=facing:south,box=6.000000/0.000000/6.000000:10.000000/1.000000/10.000000:u/0/2.000000/2.000000/6.000000/6.000000:n/0/2.000000/6.000000/6.000000/7.000000:w/0/2.000000/6.000000/6.000000/7.000000:e/0/2.000000/6.000000/6.000000/7.000000:d/0/6.000000/6.000000/2.000000/2.000000:s/0/2.000000/6.000000/6.000000/7.000000:R/90/180/0,box=7.000000/1.000000/7.000000:9.000000/16.000000/9.000000:u/0/2.000000/0.000000/4.000000/2.000000:n/0/0.000000/0.000000/2.000000/15.000000:w/0/0.000000/0.000000/2.000000/15.000000:e/0/0.000000/0.000000/2.000000/15.000000:s/0/0.000000/0.000000/2.000000/15.000000:R/90/180/0
modellist:id=%end_rod,state=facing:west,box=6.000000/0.000000/6.000000:10.000000/1.000000/10.000000:u/0/2.000000/2.000000/6.000000/6.000000:n/0/2.000000/6.000000/6.000000/7.000000:w/0/2.000000/6.000000/6.000000/7.000000:e/0/2.000000/6.000000/6.000000/7.000000:d/0/6.000000/6.000000/2.000000/2.000000:s/0/2.000000/6.000000/6.000000/7.000000:R/90/270/0,box=7.000000/1.000000/7.000000:9.000000/16.000000/9.000000:u/0/2.000000/0.000000/4.000000/2.000000:n/0/0.000000/0.000000/2.000000/15.000000:w/0/0.000000/0.000000/2.000000/15.000000:e/0/0.000000/0.000000/2.000000/15.000000:s/0/0.000000/0.000000/2.000000/15.000000:R/90/270/0
modellist:id=%end_rod,state=facing:up,box=6.000000/0.000000/6.000000:10.000000/1.000000/10.000000:u/0/2.000000/2.000000/6.000000/6.000000:n/0/2.000000/6.000000/6.000000/7.000000:w/0/2.000000/6.000000/6.000000/7.000000:e/0/2.000000/6.000000/6.000000/7.000000:d/0/6.000000/6.000000/2.000000/2.000000:s/0/2.000000/6.000000/6.000000/7.000000,box=7.000000/1.000000/7.000000:9.000000/16.000000/9.000000:u/0/2.000000/0.000000/4.000000/2.000000:n/0/0.000000/0.000000/2.000000/15.000000:w/0/0.000000/0.000000/2.000000/15.000000:e/0/0.000000/0.000000/2.000000/15.000000:s/0/0.000000/0.000000/2.000000/15.000000
modellist:id=%end_rod,state=facing:down,box=6.000000/0.000000/6.000000:10.000000/1.000000/10.000000:u/0/2.000000/2.000000/6.000000/6.000000:n/0/2.000000/6.000000/6.000000/7.000000:w/0/2.000000/6.000000/6.000000/7.000000:e/0/2.000000/6.000000/6.000000/7.000000:d/0/6.000000/6.000000/2.000000/2.000000:s/0/2.000000/6.000000/6.000000/7.000000:R/180/0/0,box=7.000000/1.000000/7.000000:9.000000/16.000000/9.000000:u/0/2.000000/0.000000/4.000000/2.000000:n/0/0.000000/0.000000/2.000000/15.000000:w/0/0.000000/0.000000/2.000000/15.000000:e/0/0.000000/0.000000/2.000000/15.000000:s/0/0.000000/0.000000/2.000000/15.000000:R/180/0/0
# Chorus Plant
modellist:id=%chorus_plant,state=east:true/south:true/north:true/west:true/up:true/down:true,box=4.000000/4.000000/0.000000:12.000000/12.000000/4.000000:e/0:u/0:d/0:n/0:w/0,box=4.000000/4.000000/0.000000:12.000000/12.000000/4.000000:e/0:u/0:d/0:n/0:w/0:R/0/90/0,box=4.000000/4.000000/0.000000:12.000000/12.000000/4.000000:e/0:u/0:d/0:n/0:w/0:R/0/180/0,box=4.000000/4.000000/0.000000:12.000000/12.000000/4.000000:e/0:u/0:d/0:n/0:w/0:R/0/270/0,box=4.000000/4.000000/0.000000:12.000000/12.000000/4.000000:e/0:u/0:d/0:n/0:w/0:R/270/0/0,box=4.000000/4.000000/0.000000:12.000000/12.000000/4.000000:e/0:u/0:d/0:n/0:w/0:R/90/0/0

4
DynmapCore/src/main/resources/texture_1.txt
View File

@ -1558,7 +1558,7 @@ block:id=dark_oak_door,data=*,patch0=0:dark_oak_door_top,patch1=0:dark_oak_door_
# End rod
block:id=end_rod,data=*,patch0=0:end_rod,transparency=TRANSPARENT
block:id=%end_rod,patch0=0:end_rod,transparency=TRANSPARENT,stdrot=true
# Chorus Plant
block:id=%chorus_plant,patch0=0:chorus_plant,transparency=TRANSPARENT
@ -3062,7 +3062,7 @@ block:id=black_banner,id=black_wall_banner,data=*,patch0=0:oak_planks,patch1=0:b
[1.17-]block:id=%black_candle_cake,data=1,patch0=0:cake_side,patch1=0:cake_side,patch2=0:cake_bottom,patch3=0:cake_side,patch4=0:cake_top,patch5=0:cake_side,patch6=0:black_candle,patch7=0:black_candle,patch8=0:black_candle,patch9=0:black_candle,patch10=0:black_candle,patch11=0:black_candle,patch12=0:black_candle,patch13=0:black_candle,patch14=0:black_candle,patch15=0:black_candle,transparency=SEMITRANSPARENT,stdrot=true
# Water Cauldron
[1.17-]block:id=%water_cauldron,patch0=0:cauldron_side,patch1=0:cauldron_inner,patch2=0:cauldron_top,patch3=0:cauldron_bottom,patch4=12000:water_still,transparency=TRANSPARENT,stdrot=true
[1.17-]block:id=%water_cauldron,patch0=0:cauldron_side,patch1=0:cauldron_inner,patch2=0:cauldron_top,patch3=0:cauldron_bottom,patch4=3000:water_still,transparency=TRANSPARENT,stdrot=true
# Lava Cauldron
[1.17-]block:id=%lava_cauldron,patch0=0:cauldron_side,patch1=0:cauldron_inner,patch2=0:cauldron_top,patch3=0:cauldron_bottom,patch4=0:lava_still,transparency=TRANSPARENT,stdrot=true
# Powder Snow Cauldron