Skip to content

Commit 6ba4330

Browse files
TheBentoBoxTheBentoBox
authored
Merge pull request #15 from APickledWalrus/master
Rotations and Variations
2 parents 0cc56d4 + 73442b9 commit 6ba4330

File tree

2 files changed

+152
-50
lines changed

2 files changed

+152
-50
lines changed

‎+global-variations.sk‎

Lines changed: 59 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,23 @@ data values:
2323
[dark] green = - {Damage:13}
2424
red = - {Damage:14}
2525
black = - {Damage:15}
26+
{opposite colored}:
27+
white = - {Damage:15}
28+
orange = - {Damage:14}
29+
magenta = - {Damage:13}
30+
light blue = - {Damage:12}
31+
yellow = - {Damage:11}
32+
(lime [green]|light green) = - {Damage:10}
33+
pink = - {Damage:9}
34+
[dark] gr(a|e)y = - {Damage:8}
35+
light gr(a|e)y = - {Damage:7}
36+
cyan = - {Damage:6}
37+
purple = - {Damage:5}
38+
blue = - {Damage:4}
39+
brown = - {Damage:3}
40+
[dark] green = - {Damage:2}
41+
red = - {Damage:1}
42+
black = - {Damage:0}
2643
# For blocks that were colored via ID even in 1.12. Rarely used, but it needs to be a different
2744
# variation than the 1.13 ID-based one because 'light_gray' used to be 'silver' in IDs.
2845
{old colored IDs}:
@@ -47,50 +64,50 @@ data values:
4764
# Dispenser, dropper, pistons, end rods.
4865
{orientable}:
4966
{default} = - {Damage:1}
50-
(down[ward[s]]( |-)[(facing|pointing)]) = - {Damage:0}
51-
(up[ward[s]]( |-)[(facing|pointing)]) = - {Damage:1}
52-
(north[ward[s]]( |-)[(facing|pointing)]) = - {Damage:2}
53-
(south[ward[s]]( |-)[(facing|pointing)]) = - {Damage:3}
54-
(west[ward[s]]( |-)[(facing|pointing)]) = - {Damage:4}
55-
(east[ward[s]]( |-)[(facing|pointing)]) = - {Damage:5}
67+
down[ward[s]][( |-)(facing|pointing)] = - {Damage:0}
68+
up[ward[s]][( |-)(facing|pointing)] = - {Damage:1}
69+
north[ward[s]][( |-)(facing|pointing)] = - {Damage:2}
70+
south[ward[s]][( |-)(facing|pointing)] = - {Damage:3}
71+
west[ward[s]][( |-)(facing|pointing)] = - {Damage:4}
72+
east[ward[s]][( |-)(facing|pointing)] = - {Damage:5}
5673

5774
# For all stairs
5875
{stair direction}:
5976
{default} = - {Damage:0}
60-
[right[( |-)]side up] (east[ward[s]]( |-)[(facing|pointing)]) = - {Damage:0}
61-
[right[( |-)]side up] (west[ward[s]]( |-)[(facing|pointing)]) = - {Damage:1}
62-
[right[( |-)]side up] (south[ward[s]]( |-)[(facing|pointing)]) = - {Damage:2}
63-
[right[( |-)]side up] (north[ward[s]]( |-)[(facing|pointing)]) = - {Damage:3}
64-
up[( |-)]side down (east[ward[s]]( |-)[(facing|pointing)]) = - {Damage:4}
65-
up[( |-)]side down (west[ward[s]]( |-)[(facing|pointing)]) = - {Damage:5}
66-
up[( |-)]side down (south[ward[s]]( |-)[(facing|pointing)]) = - {Damage:6}
67-
up[( |-)]side down (north[ward[s]]( |-)[(facing|pointing)]) = - {Damage:7}
77+
[right[( |-)]side up] east[ward[s]][( |-)(facing|pointing)] = - {Damage:0}
78+
[right[( |-)]side up] west[ward[s]][( |-)(facing|pointing)] = - {Damage:1}
79+
[right[( |-)]side up] south[ward[s]][( |-)(facing|pointing)] = - {Damage:2}
80+
[right[( |-)]side up] north[ward[s]][( |-)(facing|pointing)] = - {Damage:3}
81+
up[( |-)]side down east[ward[s]][( |-)(facing|pointing)] = - {Damage:4}
82+
up[( |-)]side down west[ward[s]][( |-)(facing|pointing)] = - {Damage:5}
83+
up[( |-)]side down south[ward[s]][( |-)(facing|pointing)] = - {Damage:6}
84+
up[( |-)]side down north[ward[s]][( |-)(facing|pointing)] = - {Damage:7}
6885

6986
# For blocks that can be attached to sides of another block, such as torches.
7087
{attached}:
7188
{default} = - {Damage:5}
72-
(down[ward[s]]( |-)[(facing|pointing)]) = - {Damage:0}
73-
(east[ward[s]]( |-)[(facing|pointing)]) wall = - {Damage:1}
74-
(west[ward[s]]( |-)[(facing|pointing)]) wall = - {Damage:2}
75-
(south[ward[s]]( |-)[(facing|pointing)]) wall = - {Damage:3}
76-
(north[ward[s]]( |-)[(facing|pointing)]) wall = - {Damage:4}
77-
(up[ward[s]]( |-)[(facing|pointing)]|floor) = - {Damage:5}
89+
down[ward[s]][( |-)(facing|pointing)] = - {Damage:0}
90+
east[ward[s]][( |-)(facing|pointing)] wall = - {Damage:1}
91+
west[ward[s]][( |-)(facing|pointing)] wall = - {Damage:2}
92+
south[ward[s]][( |-)(facing|pointing)] wall = - {Damage:3}
93+
north[ward[s]][( |-)(facing|pointing)] wall = - {Damage:4}
94+
up[ward[s]][( |-)(facing|pointing)]|floor = - {Damage:5}
7895

7996
# For blocks that can be attached to sides of another block and toggled, namely buttons.
8097
{attached toggleable}:
8198
{default} = - {Damage:5}
82-
[(unpressed|inactive)] (down[ward[s]]( |-)[(facing|pointing)]) = - {Damage:0}
83-
[(unpressed|inactive)] (east[ward[s]]( |-)[(facing|pointing)]) = - {Damage:1}
84-
[(unpressed|inactive)] (west[ward[s]]( |-)[(facing|pointing)]) = - {Damage:2}
85-
[(unpressed|inactive)] (south[ward[s]]( |-)[(facing|pointing)]) = - {Damage:3}
86-
[(unpressed|inactive)] (north[ward[s]]( |-)[(facing|pointing)]) = - {Damage:4}
87-
[(unpressed|inactive)] (up[ward[s]]( |-)[(facing|pointing)]) = - {Damage:5}
88-
(pressed|active) (down[ward[s]]( |-)[(facing|pointing)]) = - {Damage:8}
89-
(pressed|active) (east[ward[s]]( |-)[(facing|pointing)]) = - {Damage:9}
90-
(pressed|active) (west[ward[s]]( |-)[(facing|pointing)]) = - {Damage:10}
91-
(pressed|active) (south[ward[s]]( |-)[(facing|pointing)]) = - {Damage:11}
92-
(pressed|active) (north[ward[s]]( |-)[(facing|pointing)]) = - {Damage:12}
93-
(pressed|active) (up[ward[s]]( |-)[(facing|pointing)]) = - {Damage:13}
99+
[(unpressed|inactive)] down[ward[s]][( |-)(facing|pointing)] = - {Damage:0}
100+
[(unpressed|inactive)] east[ward[s]][( |-)(facing|pointing)] = - {Damage:1}
101+
[(unpressed|inactive)] west[ward[s]][( |-)(facing|pointing)] = - {Damage:2}
102+
[(unpressed|inactive)] south[ward[s]][( |-)(facing|pointing)] = - {Damage:3}
103+
[(unpressed|inactive)] north[ward[s]][( |-)(facing|pointing)] = - {Damage:4}
104+
[(unpressed|inactive)] up[ward[s]][( |-)(facing|pointing)] = - {Damage:5}
105+
(pressed|active) down[ward[s]][( |-)(facing|pointing)] = - {Damage:8}
106+
(pressed|active) east[ward[s]][( |-)(facing|pointing)] = - {Damage:9}
107+
(pressed|active) west[ward[s]][( |-)(facing|pointing)] = - {Damage:10}
108+
(pressed|active) south[ward[s]][( |-)(facing|pointing)] = - {Damage:11}
109+
(pressed|active) north[ward[s]][( |-)(facing|pointing)] = - {Damage:12}
110+
(pressed|active) up[ward[s]][( |-)(facing|pointing)] = - {Damage:13}
94111

95112
# For wood types defined by data values in older versions. Not all wooden blocks can use this,
96113
# just ones that were all stored in one ID using DVs 0-5 to represent them.
@@ -129,20 +146,20 @@ block states:
129146
# Dispenser, dropper, pistons, end rods.
130147
{orientable}:
131148
{default} = -[facing=up]
132-
(down[ward[s]]( |-)[(facing|pointing)]) = -[facing=down]
133-
(up[ward[s]]( |-)[(facing|pointing)]) = -[facing=up]
134-
(north[ward[s]]( |-)[(facing|pointing)]) = -[facing=north]
135-
(south[ward[s]]( |-)[(facing|pointing)]) = -[facing=south]
136-
(west[ward[s]]( |-)[(facing|pointing)]) = -[facing=west]
137-
(east[ward[s]]( |-)[(facing|pointing)]) = -[facing=east]
149+
down[ward[s]][( |-)(facing|pointing)] = -[facing=down]
150+
up[ward[s]][( |-)(facing|pointing)] = -[facing=up]
151+
north[ward[s]][( |-)(facing|pointing)] = -[facing=north]
152+
south[ward[s]][( |-)(facing|pointing)] = -[facing=south]
153+
west[ward[s]][( |-)(facing|pointing)] = -[facing=west]
154+
east[ward[s]][( |-)(facing|pointing)] = -[facing=east]
138155

139156
# For blocks that can only point in four directions.
140157
{directional}:
141158
{default} = -[facing=east]
142-
(north[ward[s]]( |-)[(facing|pointing)]) = -[facing=north]
143-
(south[ward[s]]( |-)[(facing|pointing)]) = -[facing=south]
144-
(west[ward[s]]( |-)[(facing|pointing)]) = -[facing=west]
145-
(east[ward[s]]( |-)[(facing|pointing)]) = -[facing=east]
159+
north[ward[s]][( |-)(facing|pointing)] = -[facing=north]
160+
south[ward[s]][( |-)(facing|pointing)] = -[facing=south]
161+
west[ward[s]][( |-)(facing|pointing)] = -[facing=west]
162+
east[ward[s]][( |-)(facing|pointing)] = -[facing=east]
146163

147164
# For anything that can exist in either the top or bottom half of a block (slabs), can be flipped
148165
# (stairs), or that has top and bottom halves (double plants, doors, etc.)

‎decoration.sk‎

Lines changed: 93 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,6 @@ decoratives before flattening:
115115
[floor] sign¦s = minecraft:standing_sign
116116
any sign¦s = wall sign, floor sign
117117

118-
# Banners
119-
wall banner = minecraft:wall_banner
120-
[standing] banner¦s = minecraft:standing_banner, minecraft:banner
121-
122118
# Miscellaneous
123119
{attached} torch¦es = minecraft:torch
124120
chest¦s = minecraft:chest
@@ -213,10 +209,6 @@ decoratives after flattening:
213209
# Glazed terracotta was slightly changed in 1.13 because silver became light_gray in IDs.
214210
{colored} glazed terracotta [block¦s] = -glazed_terracotta
215211

216-
# Banners
217-
{directional} {colored} wall banner = -wall_banner
218-
{colored} [standing] banner¦s = -banner
219-
220212
# Signs
221213
{waterloggable} {directional} wall sign¦s = minecraft:wall_sign
222214
{waterloggable} [floor] sign¦s = minecraft:sign
@@ -331,3 +323,96 @@ update aquatic:
331323
(trio of|[bundle of] three) = -[pickles=3]
332324
[bundle of] four = -[pickles=4]
333325
({waterlogged} {pickle count}|{pickle count} {waterlogged}) sea pickle¦s = minecraft:sea_pickle
326+
327+
unchanged orientations:
328+
{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}
345+
{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}
362+
363+
old orientations:
364+
minecraft version = 1.12.2 or older
365+
{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}
369+
player (head|skull)¦s = - {SkullType:3}
370+
creeper (head|skull)¦s = - {SkullType:4}
371+
{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}
376+
377+
combat update skulls:
378+
minecraft version = 1.9 to 1.12.2
379+
[ender[ ]]dragon (head|skull) item¦s = minecraft:skull {SkullType:5}
380+
#skulls on walls and floors
381+
({wall orientations}|{skull floor orientations}) [ender[ ]]dragon (head|skull)¦s = minecraft:skull {SkullType:5}
382+
383+
directionals before flattening:
384+
minecraft version = 1.12.2 or older
385+
{skull types} item¦s = minecraft:skull
386+
#skulls on walls and floors
387+
({wall orientations}|{skull floor orientations}) {skull types} = minecraft:skull
388+
#BANNERS
389+
{wall orientations} {opposite colored} wall banner¦s = minecraft:wall_banner
390+
{banner standing orientations} {opposite colored} [standing] banner¦s = minecraft:banner
391+
{opposite colored} banner item¦s = -banner
392+
393+
directionals after flattening:
394+
minecraft version = 1.13 or newer
395+
skelet(on|al) (skull|head) item¦s = minecraft:skeleton_skull
396+
wither skelet(on|al) (skull|head) item¦s = minecraft:wither_skeleton_skull
397+
zombi(e|fied) (head|skull) item¦s = minecraft:zombie_head
398+
player (head|skull) item¦s = minecraft:player_head
399+
creeper (head|skull) item¦s = minecraft:creeper_head
400+
[ender[ ]]dragon (head|skull) item¦s = minecraft:dragon_head
401+
#skulls on walls
402+
{directional} skelet(on|al) (skull|head)¦s = minecraft:skeleton_wall_skull
403+
{directional} wither skle(on|al) (skull|head)¦s = minecraft:wither_skeleton_wall_skull
404+
{directional} zombi(e|fied) (head|skull)¦s = minecraft:zombie_wall_head
405+
{directional} player (head|skull)¦s = minecraft:player_wall_head
406+
{directional} creeper (head|skull)¦s = minecraft:creeper_wall_head
407+
{directional} [ender[ ]]dragon (head|skull)¦s = minecraft:dragon_wall_head
408+
#skulls on floors
409+
{skull floor orientations} skelet(on|al) (skull|head)¦s = minecraft:skeleton_skull
410+
{skull floor orientations} wither skelet(on|al) (skull|head)¦s = minecraft:wither_skeleton_skull
411+
{skull floor orientations} zombi(e|fied) (head|skull)¦s = minecraft:zombie_head
412+
{skull floor orientations} player (head|skull)¦s = minecraft:player_head
413+
{skull floor orientations} creeper (head|skull)¦s = minecraft:creeper_head
414+
{skull floor orientations} [ender[ ]]dragon (head|skull)¦s = minecraft:dragon_head
415+
# BANNERS
416+
{directional} {colored} wall banner¦s = -wall_banner
417+
{banner standing orientations} {colored} [standing] banner¦s = -banner
418+
{colored} banner item¦s = -banner

0 commit comments

Comments
 (0)