From f886fbc614a371da63b616cb918d06938337fe27 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Tue, 22 Nov 2011 11:43:39 +0800 Subject: [PATCH] Handle special case slab and double-slab renders, invisible stairs --- colorschemes/default.txt | 3 +++ colorschemes/flames.txt | 3 +++ colorschemes/ovocean.txt | 3 +++ colorschemes/sk89q.txt | 3 +++ src/main/resources/texture.txt | 6 +++++- 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/colorschemes/default.txt b/colorschemes/default.txt index 17bffa79..7b5b6df1 100644 --- a/colorschemes/default.txt +++ b/colorschemes/default.txt @@ -119,6 +119,7 @@ Iron Block Double Stone Slab 43 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255 43:0 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255 +43:6 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255 Double Stone Slab - Sandstone 43:1 218 210 158 255 174 168 126 255 109 105 79 255 87 84 63 255 Double Stone Slab - Wood @@ -132,6 +133,7 @@ Double Stone Slab - Stone Brick Stone Slab 44 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255 44:0 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255 +44:6 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255 Stone Slab - Sandstone 44:1 218 210 158 255 174 168 126 255 109 105 79 255 87 84 63 255 Stone Slab - Wood @@ -160,6 +162,7 @@ Monster Spawner 52 0 150 110 196 0 150 130 196 0 150 110 196 0 150 130 196 Wooden Stair 53 157 128 79 255 125 102 63 255 78 64 39 255 62 51 31 255 +53:4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 Chest 54 125 91 38 255 100 72 30 255 62 45 19 255 50 36 15 255 Redstone Wire diff --git a/colorschemes/flames.txt b/colorschemes/flames.txt index d502ca1a..bd66a197 100644 --- a/colorschemes/flames.txt +++ b/colorschemes/flames.txt @@ -119,6 +119,7 @@ Iron Block Double Stone Slab 43 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255 43:0 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255 +43:6 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255 Double Stone Slab - Sandstone 43:1 192 178 110 255 160 148 92 255 134 124 77 255 160 148 92 255 Double Stone Slab - Wood @@ -132,6 +133,7 @@ Double Stone Slab - Stone Brick Stone Slab 44 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255 44:0 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255 +44:6 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255 Stone Slab - Sandstone 44:1 192 178 110 255 160 148 92 255 134 124 77 255 160 148 92 255 Stone Slab - Wood @@ -160,6 +162,7 @@ Monster Spawner 52 0 150 110 196 0 150 130 196 0 150 110 196 0 150 130 196 Wooden Stair 53 157 128 79 255 125 102 63 255 78 64 39 255 62 51 31 255 +53:4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 Chest 54 125 91 38 255 100 72 30 255 62 45 19 255 50 36 15 255 Redstone Wire diff --git a/colorschemes/ovocean.txt b/colorschemes/ovocean.txt index 5b298720..7b511ffe 100644 --- a/colorschemes/ovocean.txt +++ b/colorschemes/ovocean.txt @@ -119,6 +119,7 @@ Iron Block Double Stone Slab 43 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255 43:0 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255 +43:6 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255 Double Stone Slab - Sandstone 43:1 218 210 158 255 174 168 126 255 109 105 79 255 87 84 63 255 Double Stone Slab - Wood @@ -132,6 +133,7 @@ Double Stone Slab - Stone Brick Stone Slab 44 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255 44:0 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255 +44:6 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255 Stone Slab - Sandstone 44:1 218 210 158 255 174 168 126 255 109 105 79 255 87 84 63 255 Stone Slab - Wood @@ -160,6 +162,7 @@ Monster Spawner 52 0 150 110 196 0 150 130 196 0 150 110 196 0 150 130 196 Wooden Stair 53 157 128 79 255 125 102 63 255 78 64 39 255 62 51 31 255 +53:4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 Chest 54 125 91 38 255 100 72 30 255 62 45 19 255 50 36 15 255 Redstone Wire diff --git a/colorschemes/sk89q.txt b/colorschemes/sk89q.txt index 8eae672e..cd6f8788 100644 --- a/colorschemes/sk89q.txt +++ b/colorschemes/sk89q.txt @@ -64,6 +64,7 @@ 43:3 118 112 96 255 98 93 80 255 82 78 67 255 98 93 80 255 43:4 170 86 62 255 136 68 49 255 85 43 31 255 68 34 24 255 43:5 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255 +43:6 122 112 99 255 101 93 82 255 85 78 69 255 101 93 82 255 44 122 112 99 254 101 93 82 254 85 78 69 254 101 93 82 254 44:0 122 112 99 254 101 93 82 254 85 78 69 254 101 93 82 254 44:1 192 178 110 255 160 148 92 255 134 124 77 255 160 148 92 255 @@ -71,6 +72,7 @@ 44:3 118 112 96 255 98 93 80 255 82 78 67 255 98 93 80 255 44:4 170 86 62 255 136 68 49 255 85 43 31 255 68 34 24 255 44:5 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255 +44:6 122 112 99 254 101 93 82 254 85 78 69 254 101 93 82 254 45 230 103 73 255 192 86 61 255 160 71 50 255 192 86 61 255 46 255 79 30 255 231 72 27 255 193 60 22 255 231 72 27 255 47 125 91 38 192 100 72 30 192 62 45 19 192 50 36 15 192 @@ -80,6 +82,7 @@ 51 255 170 30 200 255 170 30 200 212 141 25 200 255 170 30 200 52 255 228 52 255 255 228 52 255 212 190 43 255 255 228 52 255 53 145 109 80 255 121 91 67 255 101 76 56 255 121 91 67 255 +53:4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 54 165 132 100 255 138 110 84 255 115 92 70 255 138 110 84 255 55 116 21 21 255 97 18 18 255 81 15 15 255 97 18 18 255 56 115 230 255 255 105 210 232 255 88 175 194 255 105 210 232 255 diff --git a/src/main/resources/texture.txt b/src/main/resources/texture.txt index 389c3d43..49a43952 100644 --- a/src/main/resources/texture.txt +++ b/src/main/resources/texture.txt @@ -255,6 +255,8 @@ block:id=43,data=3,allfaces=16 block:id=43,data=4,allfaces=7 # Double Slab - Stone Brick block:id=43,data=5,allfaces=54 +# Double Slab - Stone (all sides) +block:id=43,data=6,allsides=6,topbottom=6 # Slab - stone block:id=44,data=0,allsides=5,topbottom=6,transparency=SEMITRANSPARENT # Slab - Sandstone @@ -267,6 +269,8 @@ block:id=44,data=3,allfaces=16,transparency=SEMITRANSPARENT block:id=44,data=4,allfaces=7,transparency=SEMITRANSPARENT # Slab - Stone Brick block:id=44,data=5,allfaces=54,transparency=SEMITRANSPARENT +# Slab - Stone (all sides) +block:id=44,data=6,allsides=6,topbottom=6,transparency=SEMITRANSPARENT # Brick Block block:id=45,allfaces=7 # TNT @@ -286,7 +290,7 @@ block:id=51,allsides=129,top=162,transparency=TRANSPARENT # Monster spawner block:id=52,allfaces=65,transparency=TRANSPARENT # Wooden stairs -block:id=53,allsides=4,topbottom=4004,transparency=SEMITRANSPARENT +block:id=53,data=0,data=1,data=2,data=3,allsides=4,topbottom=4004,transparency=SEMITRANSPARENT # Chest - single, facing west block:id=54,data=0,topbottom=25,south=26,north=26,east=26,west=27,userenderdata=true # Chest - single, facing south