From 04147aadb111a75f2ee42f5bacbeb72d231c138d Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Tue, 15 Feb 2022 22:39:15 -0600 Subject: [PATCH] Fix brewing stand model --- DynmapCore/src/main/resources/models_1.txt | 9 ++++++++- DynmapCore/src/main/resources/texture_1.txt | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt index 46469cc7..861ed48f 100644 --- a/DynmapCore/src/main/resources/models_1.txt +++ b/DynmapCore/src/main/resources/models_1.txt @@ -843,7 +843,14 @@ customblock:id=water,id=lava,class=org.dynmap.hdmap.renderer.FluidStateRenderer boxblock:id=enchanting_table,ymax=0.75 # Brewing Stand -patchblock:id=brewing_stand,patch0=HorizY001ZTop,patch1=StandSide,patch2=StandSide@90,patch3=StandSide@180,patch4=StandSide@270,patch5=StandArm,patch6=StandArm@120,patch7=StandArm@240 +modellist:id=%brewing_stand,state=has_bottle_0:true/has_bottle_1:true/has_bottle_2:true,box=7.000000/0.000000/7.000000:9.000000/14.000000/9.000000:d/0/7.000000/7.000000/9.000000/9.000000:w/0/7.000000/2.000000/9.000000/16.000000:e/0/7.000000/2.000000/9.000000/16.000000:n/0/7.000000/2.000000/9.000000/16.000000:u/0/7.000000/7.000000/9.000000/9.000000:s/0/7.000000/2.000000/9.000000/16.000000,box=9.000000/0.000000/5.000000:15.000000/2.000000/11.000000:d/1/9.000000/5.000000/15.000000/11.000000:w/1/5.000000/14.000000/11.000000/16.000000:e/1/5.000000/14.000000/11.000000/16.000000:n/1/9.000000/14.000000/15.000000/16.000000:u/1/9.000000/5.000000/15.000000/11.000000:s/1/9.000000/14.000000/15.000000/16.000000,box=2.000000/0.000000/1.000000:8.000000/2.000000/7.000000:d/1/2.000000/1.000000/8.000000/7.000000:w/1/1.000000/14.000000/7.000000/16.000000:e/1/1.000000/14.000000/7.000000/16.000000:n/1/2.000000/14.000000/8.000000/16.000000:u/1/2.000000/1.000000/8.000000/7.000000:s/1/2.000000/14.000000/8.000000/16.000000,box=2.000000/0.000000/9.000000:8.000000/2.000000/15.000000:d/1/2.000000/9.000000/8.000000/15.000000:w/1/9.000000/14.000000/15.000000/16.000000:e/1/9.000000/14.000000/15.000000/16.000000:n/1/2.000000/14.000000/8.000000/16.000000:u/1/2.000000/9.000000/8.000000/15.000000:s/1/2.000000/14.000000/8.000000/16.000000,box=8.000000/0.000000/8.000000:16.000000/16.000000/8.000000:n/0/0.000000/0.000000/8.000000/16.000000:s/0/8.000000/0.000000/0.000000/16.000000,box=-0.410000/0.000000/8.000000:7.590000/16.000000/8.000000/0.000000/-45.000000/0.000000/8.000000/8.000000/8.000000:n/0/8.000000/0.000000/0.000000/16.000000:s/0/0.000000/0.000000/8.000000/16.000000,box=-0.410000/0.000000/8.000000:7.590000/16.000000/8.000000/0.000000/45.000000/0.000000/8.000000/8.000000/8.000000:n/0/8.000000/0.000000/0.000000/16.000000:s/0/0.000000/0.000000/8.000000/16.000000 +modellist:id=%brewing_stand,state=has_bottle_0:true/has_bottle_1:true/has_bottle_2:false,box=7.000000/0.000000/7.000000:9.000000/14.000000/9.000000:d/0/7.000000/7.000000/9.000000/9.000000:w/0/7.000000/2.000000/9.000000/16.000000:e/0/7.000000/2.000000/9.000000/16.000000:n/0/7.000000/2.000000/9.000000/16.000000:u/0/7.000000/7.000000/9.000000/9.000000:s/0/7.000000/2.000000/9.000000/16.000000,box=9.000000/0.000000/5.000000:15.000000/2.000000/11.000000:d/1/9.000000/5.000000/15.000000/11.000000:w/1/5.000000/14.000000/11.000000/16.000000:e/1/5.000000/14.000000/11.000000/16.000000:n/1/9.000000/14.000000/15.000000/16.000000:u/1/9.000000/5.000000/15.000000/11.000000:s/1/9.000000/14.000000/15.000000/16.000000,box=2.000000/0.000000/1.000000:8.000000/2.000000/7.000000:d/1/2.000000/1.000000/8.000000/7.000000:w/1/1.000000/14.000000/7.000000/16.000000:e/1/1.000000/14.000000/7.000000/16.000000:n/1/2.000000/14.000000/8.000000/16.000000:u/1/2.000000/1.000000/8.000000/7.000000:s/1/2.000000/14.000000/8.000000/16.000000,box=2.000000/0.000000/9.000000:8.000000/2.000000/15.000000:d/1/2.000000/9.000000/8.000000/15.000000:w/1/9.000000/14.000000/15.000000/16.000000:e/1/9.000000/14.000000/15.000000/16.000000:n/1/2.000000/14.000000/8.000000/16.000000:u/1/2.000000/9.000000/8.000000/15.000000:s/1/2.000000/14.000000/8.000000/16.000000,box=8.000000/0.000000/8.000000:16.000000/16.000000/8.000000:n/0/0.000000/0.000000/8.000000/16.000000:s/0/8.000000/0.000000/0.000000/16.000000,box=-0.410000/0.000000/8.000000:7.590000/16.000000/8.000000/0.000000/-45.000000/0.000000/8.000000/8.000000/8.000000:n/0/8.000000/0.000000/0.000000/16.000000:s/0/0.000000/0.000000/8.000000/16.000000,box=0.000000/0.000000/8.000000:8.000000/16.000000/8.000000/0.000000/45.000000/0.000000/8.000000/8.000000/8.000000:n/0/8.000000/0.000000/16.000000/16.000000:s/0/16.000000/0.000000/8.000000/16.000000 +modellist:id=%brewing_stand,state=has_bottle_0:true/has_bottle_1:false/has_bottle_2:true,box=7.000000/0.000000/7.000000:9.000000/14.000000/9.000000:d/0/7.000000/7.000000/9.000000/9.000000:w/0/7.000000/2.000000/9.000000/16.000000:e/0/7.000000/2.000000/9.000000/16.000000:n/0/7.000000/2.000000/9.000000/16.000000:u/0/7.000000/7.000000/9.000000/9.000000:s/0/7.000000/2.000000/9.000000/16.000000,box=9.000000/0.000000/5.000000:15.000000/2.000000/11.000000:d/1/9.000000/5.000000/15.000000/11.000000:w/1/5.000000/14.000000/11.000000/16.000000:e/1/5.000000/14.000000/11.000000/16.000000:n/1/9.000000/14.000000/15.000000/16.000000:u/1/9.000000/5.000000/15.000000/11.000000:s/1/9.000000/14.000000/15.000000/16.000000,box=2.000000/0.000000/1.000000:8.000000/2.000000/7.000000:d/1/2.000000/1.000000/8.000000/7.000000:w/1/1.000000/14.000000/7.000000/16.000000:e/1/1.000000/14.000000/7.000000/16.000000:n/1/2.000000/14.000000/8.000000/16.000000:u/1/2.000000/1.000000/8.000000/7.000000:s/1/2.000000/14.000000/8.000000/16.000000,box=2.000000/0.000000/9.000000:8.000000/2.000000/15.000000:d/1/2.000000/9.000000/8.000000/15.000000:w/1/9.000000/14.000000/15.000000/16.000000:e/1/9.000000/14.000000/15.000000/16.000000:n/1/2.000000/14.000000/8.000000/16.000000:u/1/2.000000/9.000000/8.000000/15.000000:s/1/2.000000/14.000000/8.000000/16.000000,box=8.000000/0.000000/8.000000:16.000000/16.000000/8.000000:n/0/0.000000/0.000000/8.000000/16.000000:s/0/8.000000/0.000000/0.000000/16.000000,box=-0.410000/0.000000/8.000000:7.590000/16.000000/8.000000/0.000000/45.000000/0.000000/8.000000/8.000000/8.000000:n/0/8.000000/0.000000/0.000000/16.000000:s/0/0.000000/0.000000/8.000000/16.000000,box=0.000000/0.000000/8.000000:8.000000/16.000000/8.000000/0.000000/-45.000000/0.000000/8.000000/8.000000/8.000000:n/0/8.000000/0.000000/16.000000/16.000000:s/0/16.000000/0.000000/8.000000/16.000000 +modellist:id=%brewing_stand,state=has_bottle_0:true/has_bottle_1:false/has_bottle_2:false,box=7.000000/0.000000/7.000000:9.000000/14.000000/9.000000:d/0/7.000000/7.000000/9.000000/9.000000:w/0/7.000000/2.000000/9.000000/16.000000:e/0/7.000000/2.000000/9.000000/16.000000:n/0/7.000000/2.000000/9.000000/16.000000:u/0/7.000000/7.000000/9.000000/9.000000:s/0/7.000000/2.000000/9.000000/16.000000,box=9.000000/0.000000/5.000000:15.000000/2.000000/11.000000:d/1/9.000000/5.000000/15.000000/11.000000:w/1/5.000000/14.000000/11.000000/16.000000:e/1/5.000000/14.000000/11.000000/16.000000:n/1/9.000000/14.000000/15.000000/16.000000:u/1/9.000000/5.000000/15.000000/11.000000:s/1/9.000000/14.000000/15.000000/16.000000,box=2.000000/0.000000/1.000000:8.000000/2.000000/7.000000:d/1/2.000000/1.000000/8.000000/7.000000:w/1/1.000000/14.000000/7.000000/16.000000:e/1/1.000000/14.000000/7.000000/16.000000:n/1/2.000000/14.000000/8.000000/16.000000:u/1/2.000000/1.000000/8.000000/7.000000:s/1/2.000000/14.000000/8.000000/16.000000,box=2.000000/0.000000/9.000000:8.000000/2.000000/15.000000:d/1/2.000000/9.000000/8.000000/15.000000:w/1/9.000000/14.000000/15.000000/16.000000:e/1/9.000000/14.000000/15.000000/16.000000:n/1/2.000000/14.000000/8.000000/16.000000:u/1/2.000000/9.000000/8.000000/15.000000:s/1/2.000000/14.000000/8.000000/16.000000,box=8.000000/0.000000/8.000000:16.000000/16.000000/8.000000:n/0/0.000000/0.000000/8.000000/16.000000:s/0/8.000000/0.000000/0.000000/16.000000,box=0.000000/0.000000/8.000000:8.000000/16.000000/8.000000/0.000000/-45.000000/0.000000/8.000000/8.000000/8.000000:n/0/8.000000/0.000000/16.000000/16.000000:s/0/16.000000/0.000000/8.000000/16.000000,box=0.000000/0.000000/8.000000:8.000000/16.000000/8.000000/0.000000/45.000000/0.000000/8.000000/8.000000/8.000000:n/0/8.000000/0.000000/16.000000/16.000000:s/0/16.000000/0.000000/8.000000/16.000000 +modellist:id=%brewing_stand,state=has_bottle_0:false/has_bottle_1:true/has_bottle_2:true,box=7.000000/0.000000/7.000000:9.000000/14.000000/9.000000:d/0/7.000000/7.000000/9.000000/9.000000:w/0/7.000000/2.000000/9.000000/16.000000:e/0/7.000000/2.000000/9.000000/16.000000:n/0/7.000000/2.000000/9.000000/16.000000:u/0/7.000000/7.000000/9.000000/9.000000:s/0/7.000000/2.000000/9.000000/16.000000,box=9.000000/0.000000/5.000000:15.000000/2.000000/11.000000:d/1/9.000000/5.000000/15.000000/11.000000:w/1/5.000000/14.000000/11.000000/16.000000:e/1/5.000000/14.000000/11.000000/16.000000:n/1/9.000000/14.000000/15.000000/16.000000:u/1/9.000000/5.000000/15.000000/11.000000:s/1/9.000000/14.000000/15.000000/16.000000,box=2.000000/0.000000/1.000000:8.000000/2.000000/7.000000:d/1/2.000000/1.000000/8.000000/7.000000:w/1/1.000000/14.000000/7.000000/16.000000:e/1/1.000000/14.000000/7.000000/16.000000:n/1/2.000000/14.000000/8.000000/16.000000:u/1/2.000000/1.000000/8.000000/7.000000:s/1/2.000000/14.000000/8.000000/16.000000,box=2.000000/0.000000/9.000000:8.000000/2.000000/15.000000:d/1/2.000000/9.000000/8.000000/15.000000:w/1/9.000000/14.000000/15.000000/16.000000:e/1/9.000000/14.000000/15.000000/16.000000:n/1/2.000000/14.000000/8.000000/16.000000:u/1/2.000000/9.000000/8.000000/15.000000:s/1/2.000000/14.000000/8.000000/16.000000,box=-0.410000/0.000000/8.000000:7.590000/16.000000/8.000000/0.000000/-45.000000/0.000000/8.000000/8.000000/8.000000:n/0/8.000000/0.000000/0.000000/16.000000:s/0/0.000000/0.000000/8.000000/16.000000,box=-0.410000/0.000000/8.000000:7.590000/16.000000/8.000000/0.000000/45.000000/0.000000/8.000000/8.000000/8.000000:n/0/8.000000/0.000000/0.000000/16.000000:s/0/0.000000/0.000000/8.000000/16.000000,box=8.000000/0.000000/8.000000:16.000000/16.000000/8.000000:n/0/16.000000/0.000000/8.000000/16.000000:s/0/8.000000/0.000000/16.000000/16.000000 +modellist:id=%brewing_stand,state=has_bottle_0:false/has_bottle_1:true/has_bottle_2:false,box=7.000000/0.000000/7.000000:9.000000/14.000000/9.000000:d/0/7.000000/7.000000/9.000000/9.000000:w/0/7.000000/2.000000/9.000000/16.000000:e/0/7.000000/2.000000/9.000000/16.000000:n/0/7.000000/2.000000/9.000000/16.000000:u/0/7.000000/7.000000/9.000000/9.000000:s/0/7.000000/2.000000/9.000000/16.000000,box=9.000000/0.000000/5.000000:15.000000/2.000000/11.000000:d/1/9.000000/5.000000/15.000000/11.000000:w/1/5.000000/14.000000/11.000000/16.000000:e/1/5.000000/14.000000/11.000000/16.000000:n/1/9.000000/14.000000/15.000000/16.000000:u/1/9.000000/5.000000/15.000000/11.000000:s/1/9.000000/14.000000/15.000000/16.000000,box=2.000000/0.000000/1.000000:8.000000/2.000000/7.000000:d/1/2.000000/1.000000/8.000000/7.000000:w/1/1.000000/14.000000/7.000000/16.000000:e/1/1.000000/14.000000/7.000000/16.000000:n/1/2.000000/14.000000/8.000000/16.000000:u/1/2.000000/1.000000/8.000000/7.000000:s/1/2.000000/14.000000/8.000000/16.000000,box=2.000000/0.000000/9.000000:8.000000/2.000000/15.000000:d/1/2.000000/9.000000/8.000000/15.000000:w/1/9.000000/14.000000/15.000000/16.000000:e/1/9.000000/14.000000/15.000000/16.000000:n/1/2.000000/14.000000/8.000000/16.000000:u/1/2.000000/9.000000/8.000000/15.000000:s/1/2.000000/14.000000/8.000000/16.000000,box=-0.410000/0.000000/8.000000:7.590000/16.000000/8.000000/0.000000/-45.000000/0.000000/8.000000/8.000000/8.000000:n/0/8.000000/0.000000/0.000000/16.000000:s/0/0.000000/0.000000/8.000000/16.000000,box=8.000000/0.000000/8.000000:16.000000/16.000000/8.000000:n/0/16.000000/0.000000/8.000000/16.000000:s/0/8.000000/0.000000/16.000000/16.000000,box=0.000000/0.000000/8.000000:8.000000/16.000000/8.000000/0.000000/45.000000/0.000000/8.000000/8.000000/8.000000:n/0/8.000000/0.000000/16.000000/16.000000:s/0/16.000000/0.000000/8.000000/16.000000 +modellist:id=%brewing_stand,state=has_bottle_0:false/has_bottle_1:false/has_bottle_2:true,box=7.000000/0.000000/7.000000:9.000000/14.000000/9.000000:d/0/7.000000/7.000000/9.000000/9.000000:w/0/7.000000/2.000000/9.000000/16.000000:e/0/7.000000/2.000000/9.000000/16.000000:n/0/7.000000/2.000000/9.000000/16.000000:u/0/7.000000/7.000000/9.000000/9.000000:s/0/7.000000/2.000000/9.000000/16.000000,box=9.000000/0.000000/5.000000:15.000000/2.000000/11.000000:d/1/9.000000/5.000000/15.000000/11.000000:w/1/5.000000/14.000000/11.000000/16.000000:e/1/5.000000/14.000000/11.000000/16.000000:n/1/9.000000/14.000000/15.000000/16.000000:u/1/9.000000/5.000000/15.000000/11.000000:s/1/9.000000/14.000000/15.000000/16.000000,box=2.000000/0.000000/1.000000:8.000000/2.000000/7.000000:d/1/2.000000/1.000000/8.000000/7.000000:w/1/1.000000/14.000000/7.000000/16.000000:e/1/1.000000/14.000000/7.000000/16.000000:n/1/2.000000/14.000000/8.000000/16.000000:u/1/2.000000/1.000000/8.000000/7.000000:s/1/2.000000/14.000000/8.000000/16.000000,box=2.000000/0.000000/9.000000:8.000000/2.000000/15.000000:d/1/2.000000/9.000000/8.000000/15.000000:w/1/9.000000/14.000000/15.000000/16.000000:e/1/9.000000/14.000000/15.000000/16.000000:n/1/2.000000/14.000000/8.000000/16.000000:u/1/2.000000/9.000000/8.000000/15.000000:s/1/2.000000/14.000000/8.000000/16.000000,box=-0.410000/0.000000/8.000000:7.590000/16.000000/8.000000/0.000000/45.000000/0.000000/8.000000/8.000000/8.000000:n/0/8.000000/0.000000/0.000000/16.000000:s/0/0.000000/0.000000/8.000000/16.000000,box=8.000000/0.000000/8.000000:16.000000/16.000000/8.000000:n/0/16.000000/0.000000/8.000000/16.000000:s/0/8.000000/0.000000/16.000000/16.000000,box=0.000000/0.000000/8.000000:8.000000/16.000000/8.000000/0.000000/-45.000000/0.000000/8.000000/8.000000/8.000000:n/0/8.000000/0.000000/16.000000/16.000000:s/0/16.000000/0.000000/8.000000/16.000000 +modellist:id=%brewing_stand,state=has_bottle_0:false/has_bottle_1:false/has_bottle_2:false,box=7.000000/0.000000/7.000000:9.000000/14.000000/9.000000:d/0/7.000000/7.000000/9.000000/9.000000:w/0/7.000000/2.000000/9.000000/16.000000:e/0/7.000000/2.000000/9.000000/16.000000:n/0/7.000000/2.000000/9.000000/16.000000:u/0/7.000000/7.000000/9.000000/9.000000:s/0/7.000000/2.000000/9.000000/16.000000,box=9.000000/0.000000/5.000000:15.000000/2.000000/11.000000:d/1/9.000000/5.000000/15.000000/11.000000:w/1/5.000000/14.000000/11.000000/16.000000:e/1/5.000000/14.000000/11.000000/16.000000:n/1/9.000000/14.000000/15.000000/16.000000:u/1/9.000000/5.000000/15.000000/11.000000:s/1/9.000000/14.000000/15.000000/16.000000,box=2.000000/0.000000/1.000000:8.000000/2.000000/7.000000:d/1/2.000000/1.000000/8.000000/7.000000:w/1/1.000000/14.000000/7.000000/16.000000:e/1/1.000000/14.000000/7.000000/16.000000:n/1/2.000000/14.000000/8.000000/16.000000:u/1/2.000000/1.000000/8.000000/7.000000:s/1/2.000000/14.000000/8.000000/16.000000,box=2.000000/0.000000/9.000000:8.000000/2.000000/15.000000:d/1/2.000000/9.000000/8.000000/15.000000:w/1/9.000000/14.000000/15.000000/16.000000:e/1/9.000000/14.000000/15.000000/16.000000:n/1/2.000000/14.000000/8.000000/16.000000:u/1/2.000000/9.000000/8.000000/15.000000:s/1/2.000000/14.000000/8.000000/16.000000,box=8.000000/0.000000/8.000000:16.000000/16.000000/8.000000:n/0/16.000000/0.000000/8.000000/16.000000:s/0/8.000000/0.000000/16.000000/16.000000,box=0.000000/0.000000/8.000000:8.000000/16.000000/8.000000/0.000000/-45.000000/0.000000/8.000000/8.000000/8.000000:n/0/8.000000/0.000000/16.000000/16.000000:s/0/16.000000/0.000000/8.000000/16.000000,box=0.000000/0.000000/8.000000:8.000000/16.000000/8.000000/0.000000/45.000000/0.000000/8.000000/8.000000/8.000000:n/0/8.000000/0.000000/16.000000/16.000000:s/0/16.000000/0.000000/8.000000/16.000000 # Cauldron modellist:id=%cauldron,box=0.000000/3.000000/0.000000:2.000000/16.000000/16.000000:s/0:w/0:d/1:u/2:n/0:e/0,box=2.000000/3.000000/2.000000:14.000000/4.000000/14.000000:d/1:u/1,box=14.000000/3.000000/0.000000:16.000000/16.000000/16.000000:s/0:w/0:d/1:u/2:n/0:e/0,box=2.000000/3.000000/0.000000:14.000000/16.000000/2.000000:s/0:d/1:u/2:n/0,box=2.000000/3.000000/14.000000:14.000000/16.000000/16.000000:s/0:d/1:u/2:n/0,box=0.000000/0.000000/0.000000:4.000000/3.000000/2.000000:s/0:w/0:d/3:n/0:e/0,box=0.000000/0.000000/2.000000:2.000000/3.000000/4.000000:s/0:w/0:d/3:e/0,box=12.000000/0.000000/0.000000:16.000000/3.000000/2.000000:s/0:w/0:d/3:n/0:e/0,box=14.000000/0.000000/2.000000:16.000000/3.000000/4.000000:s/0:w/0:d/3:e/0,box=0.000000/0.000000/14.000000:4.000000/3.000000/16.000000:s/0:w/0:d/3:n/0:e/0,box=0.000000/0.000000/12.000000:2.000000/3.000000/14.000000:w/0:d/3:n/0:e/0,box=12.000000/0.000000/14.000000:16.000000/3.000000/16.000000:s/0:w/0:d/3:n/0:e/0,box=14.000000/0.000000/12.000000:16.000000/3.000000/14.000000:w/0:d/3:n/0:e/0 diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt index 02bbb011..f3a6e022 100644 --- a/DynmapCore/src/main/resources/texture_1.txt +++ b/DynmapCore/src/main/resources/texture_1.txt @@ -1139,7 +1139,7 @@ block:id=%nether_wart,state=age:3,patch0=0:nether_wart_stage2,transparency=TRANS # Enchantment table block:id=enchanting_table,top=0:enchanting_table_top,allsides=0:enchanting_table_side,bottom=0:enchanting_table_bottom,stdrot=true,transparency=TRANSPARENT # Brewing stand -block:id=brewing_stand,patch0=0:brewing_stand_base,patch1-7=0:brewing_stand,transparency=TRANSPARENT +block:id=%brewing_stand,patch0=0:brewing_stand,patch1=0:brewing_stand_base,transparency=TRANSPARENT,stdrot=true # Cauldron block:id=%cauldron,patch0=0:cauldron_side,patch1=0:cauldron_inner,patch2=0:cauldron_top,patch3=0:cauldron_bottom,transparency=TRANSPARENT,stdrot=true