Skip to content

Commit 7b47b41

Browse files
authored
Simplify decoration variations
The change to the bed half variation, in particular, is minor but I remember bensku saying beds had HUNDREDS of aliases due to having colors, halves, and directionals all combined. Any bit helps.
1 parent 8bf0d1e commit 7b47b41

File tree

1 file changed

+44
-44
lines changed

1 file changed

+44
-44
lines changed

decoration.sk

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ decoratives before flattening:
106106
{colored} stained glass pane¦s = minecraft:stained_glass_pane
107107
any stained glass pane¦s = white stained glass pane, orange stained glass pane, magenta stained glass pane, light blue stained glass pane, yellow stained glass pane, lime stained glass pane, pink stained glass pane, dark gray stained glass pane, light gray stained glass pane, cyan stained glass pane, purple stained glass pane, blue stained glass pane, brown stained glass pane, dark green stained glass pane, red stained glass pane, black stained glass pane
108108

109-
# Glazed terracotta colors actually are separated by IDs even here in 1.12. It uses a separate
110-
# "old" variation because light_gray blocks used to be called silver in their IDs.
109+
# Glazed terracotta colors actually are separated by IDs even here in 1.12. It uses a separate
110+
# "old" variation because light_gray blocks used to be called silver in their IDs.
111111
{old colored IDs} glazed terracotta [block¦s] = -glazed_terracotta
112112

113113
# Signs
@@ -217,11 +217,11 @@ decoratives after flattening:
217217
# Beds
218218
{bed part}:
219219
{default} = -[part=foot]
220-
(foot|end) = -[part=foot]
220+
foot = -[part=foot]
221221
head = -[part=head]
222222
{bed occupied}:
223223
{default} = -[occupied=false]
224-
(vacant|empty|unoccupied) = -[occupied=false]
224+
unoccupied = -[occupied=false]
225225
occupied = -[occupied=true]
226226
{directional} {bed occupied} {colored} bed {bed part} = -bed
227227

@@ -326,53 +326,53 @@ update aquatic:
326326

327327
unchanged orientations:
328328
{skull floor orientations}:
329-
north[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:0}
330-
north-northeast[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:1}
331-
northeast[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:2}
332-
east-northeast[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:3}
333-
east[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:4}
334-
east-southeast[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:5}
335-
southeast[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:6}
336-
south-southeast[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:7}
337-
south[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:8}
338-
south-southwest[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:9}
339-
southwest[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:10}
340-
west-southwest[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:11}
341-
west[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:12}
342-
west-northwest[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:13}
343-
northwest[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:14}
344-
north-northwest[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:15}
329+
north[ward] [rotated] = - {Damage:1,Rot:0}
330+
north-northeast[ward] [rotated] = - {Damage:1,Rot:1}
331+
northeast[ward] [rotated] = - {Damage:1,Rot:2}
332+
east-northeast[ward] [rotated] = - {Damage:1,Rot:3}
333+
east[ward] [rotated] = - {Damage:1,Rot:4}
334+
east-southeast[ward] [rotated] = - {Damage:1,Rot:5}
335+
southeast[ward] [rotated] = - {Damage:1,Rot:6}
336+
south-southeast[ward] [rotated] = - {Damage:1,Rot:7}
337+
south[ward] [rotated] = - {Damage:1,Rot:8}
338+
south-southwest[ward] [rotated] = - {Damage:1,Rot:9}
339+
southwest[ward] [rotated] = - {Damage:1,Rot:10}
340+
west-southwest[ward] [rotated] = - {Damage:1,Rot:11}
341+
west[ward] [rotated] = - {Damage:1,Rot:12}
342+
west-northwest[ward] [rotated] = - {Damage:1,Rot:13}
343+
northwest[ward] [rotated] = - {Damage:1,Rot:14}
344+
north-northwest[ward] [rotated] = - {Damage:1,Rot:15}
345345
{banner standing orientations}:
346-
south[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:0}
347-
south-southwest[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:1}
348-
southwest[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:2}
349-
west-southwest[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:3}
350-
west[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:4}
351-
west-northwest[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:5}
352-
northwest[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:6}
353-
north-northwest[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:7}
354-
north[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:8}
355-
north-northeast[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:9}
356-
northeast[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:10}
357-
east-northeast[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:11}
358-
east[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:12}
359-
east-southeast[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:13}
360-
southeast[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:14}
361-
south-southeast[ward[s]][( |-)rotat(ion|ed)] = - {Damage:1,Rot:15}
346+
south[ward] [rotated] = - {Damage:1,Rot:0}
347+
south-southwest[ward] [rotated] = - {Damage:1,Rot:1}
348+
southwest[ward] [rotated] = - {Damage:1,Rot:2}
349+
west-southwest[ward] [rotated] = - {Damage:1,Rot:3}
350+
west[ward] [rotated] = - {Damage:1,Rot:4}
351+
west-northwest[ward] [rotated] = - {Damage:1,Rot:5}
352+
northwest[ward] [rotated] = - {Damage:1,Rot:6}
353+
north-northwest[ward] [rotated] = - {Damage:1,Rot:7}
354+
north[ward] [rotated] = - {Damage:1,Rot:8}
355+
north-northeast[ward] [rotated] = - {Damage:1,Rot:9}
356+
northeast[ward] [rotated] = - {Damage:1,Rot:10}
357+
east-northeast[ward] [rotated] = - {Damage:1,Rot:11}
358+
east[ward] [rotated] = - {Damage:1,Rot:12}
359+
east-southeast[ward] [rotated] = - {Damage:1,Rot:13}
360+
southeast[ward] [rotated] = - {Damage:1,Rot:14}
361+
south-southeast[ward] [rotated] = - {Damage:1,Rot:15}
362362

363363
old orientations:
364364
minecraft version = 1.12.2 or older
365365
{skull types}:
366-
skelet(on|al) (skull|head)¦s = - {SkullType:0}
367-
wither skle(on|al) (skull|head)¦s = - {SkullType:1}
368-
zombi(e|fied) (head|skull)¦s = - {SkullType:2}
366+
skeleton (skull|head)¦s = - {SkullType:0}
367+
wither skeleton (skull|head)¦s = - {SkullType:1}
368+
zombie (head|skull)¦s = - {SkullType:2}
369369
player (head|skull)¦s = - {SkullType:3}
370370
creeper (head|skull)¦s = - {SkullType:4}
371371
{wall orientations}:
372-
north[ward[s]][( |-)(facing|pointing)] = - {Damage:3}
373-
south[ward[s]][( |-)(facing|pointing)] = - {Damage:2}
374-
east[ward[s]][( |-)(facing|pointing)] = - {Damage:4}
375-
west[ward[s]][( |-)(facing|pointing)] = - {Damage:5}
372+
north[ward] [facing] = - {Damage:3}
373+
south[ward] [facing] = - {Damage:2}
374+
east[ward] [facing] = - {Damage:4}
375+
west[ward] [facing] = - {Damage:5}
376376

377377
combat update skulls:
378378
minecraft version = 1.9 to 1.12.2
@@ -415,4 +415,4 @@ directionals after flattening:
415415
# BANNERS
416416
{directional} {colored} wall banner¦s = -wall_banner
417417
{banner standing orientations} {colored} [standing] banner¦s = -banner
418-
{colored} banner item¦s = -banner
418+
{colored} banner item¦s = -banner

0 commit comments

Comments
 (0)