Skip to content

Commit 0de0ec2

Browse files
TheBentoBoxTheBentoBox
authored
Merge pull request #16 from APickledWalrus/master
Fixes and Minor Additions
2 parents 6ba4330 + ca29968 commit 0de0ec2

File tree

5 files changed

+38
-32
lines changed

5 files changed

+38
-32
lines changed

‎building.sk‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,8 @@ old blocks before flattening:
227227
[unlit] pumpkin¦s = minecraft:pumpkin
228228
(lit pumpkin|jack-o[']-lantern)¦s = minecraft:lit_pumpkin
229229
melon [block]¦s = minecraft:melon_block
230+
231+
any ice [block¦s] = ice, packed ice
230232

231233
# 1.13 removed data values and separated tons of blocks into their own IDs.
232234
# This section contains building blocks whose IDs were changed by 1.13.
@@ -475,4 +477,5 @@ update aquatic:
475477

476478
# Miscellaneous
477479
blue ice [block¦s] = minecraft:blue_ice
480+
any ice [block¦s] = ice, packed ice, blue ice
478481
dried kelp block¦s = minecraft:dried_kelp_block

‎combat.sk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ weapons:
105105
gold[en] sword¦s = minecraft:golden_sword
106106
iron sword¦s = minecraft:iron_sword
107107
diamond sword¦s = minecraft:diamond_sword
108+
[any] sword¦s = wooden sword, stone sword, golden sword, iron sword, diamond sword
108109

109110
bow¦s = minecraft:bow
110111
arrow¦s = minecraft:arrow

‎other.sk‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44
unlisted blocks:
55
end[er] portal [block¦s] = minecraft:end_portal
66
fire = minecraft:fire
7-
<<<<<<< HEAD
87
pumpkin stem = minecraft:pumpkin_stem
98
melon stem = minecraft:melon_stem
109
tripwire [(string|line)] = minecraft:tripwire
11-
=======
1210
air = minecraft:air
1311
barrier [block]¦s = minecraft:barrier
14-
>>>>>>> 7ff2a77811d6ee82a8e01316c70eeed071d246f8
1512

1613
# Unlisted blocks that had a different ID before the flattening.
1714
unlisted before flattening:
@@ -20,18 +17,18 @@ unlisted before flattening:
2017

2118
{command block direction}:
2219
{default} = - {Damage:1}
23-
(down[ward[s]]( |-)[(facing|pointing)]) = - {Damage:0}
24-
(up[ward[s]]( |-)[(facing|pointing)]) = - {Damage:1}
25-
(north[ward[s]]( |-)[(facing|pointing)]) = - {Damage:2}
26-
(south[ward[s]]( |-)[(facing|pointing)]) = - {Damage:3}
27-
(west[ward[s]]( |-)[(facing|pointing)]) = - {Damage:4}
28-
(east[ward[s]]( |-)[(facing|pointing)]) = - {Damage:5}
29-
(down[ward[s]]( |-)[(facing|pointing)]) conditional = - {Damage:8}
30-
(up[ward[s]]( |-)[(facing|pointing)]) conditional = - {Damage:9}
31-
(north[ward[s]]( |-)[(facing|pointing)]) conditional = - {Damage:10}
32-
(south[ward[s]]( |-)[(facing|pointing)]) conditional = - {Damage:11}
33-
(west[ward[s]]( |-)[(facing|pointing)]) conditional = - {Damage:12}
34-
(east[ward[s]]( |-)[(facing|pointing)]) conditional = - {Damage:13}
20+
down[ward[s]][( |-)(facing|pointing)] = - {Damage:0}
21+
up[ward[s]][( |-)(facing|pointing)] = - {Damage:1}
22+
north[ward[s]][( |-)(facing|pointing)] = - {Damage:2}
23+
south[ward[s]][( |-)(facing|pointing)] = - {Damage:3}
24+
west[ward[s]][( |-)(facing|pointing)] = - {Damage:4}
25+
east[ward[s]][( |-)(facing|pointing)] = - {Damage:5}
26+
down[ward[s]][( |-)(facing|pointing)] conditional = - {Damage:8}
27+
up[ward[s]][( |-)(facing|pointing)] conditional = - {Damage:9}
28+
north[ward[s]][( |-)(facing|pointing)] conditional = - {Damage:10}
29+
south[ward[s]][( |-)(facing|pointing)] conditional = - {Damage:11}
30+
west[ward[s]][( |-)(facing|pointing)] conditional = - {Damage:12}
31+
east[ward[s]][( |-)(facing|pointing)] conditional = - {Damage:13}
3532
{command block direction} [impulse] command block¦s = minecraft:command_block
3633

3734
# Unlisted blocks added in 1.9

‎redstone.sk‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ unchanged redstone:
1212
(iron|heavy weighted) pressure plate¦s = minecraft:heavy_weighted_pressure_plate
1313

1414
(normal|uninverted) daylight (detector|sensor)¦s = minecraft:daylight_detector
15-
[inverted] daylight (detector|sensor)¦s = minecraft:daylight_detector_inverted
15+
inverted daylight (detector|sensor)¦s = minecraft:daylight_detector_inverted
1616
[any] daylight (detector|sensor)¦s = normal daylight detector, inverted daylight detector
1717

1818
{orientable} dispenser¦s = minecraft:dispenser
@@ -58,14 +58,14 @@ redstone before flattening:
5858
# Fences and doors
5959
{gate state}:
6060
{default} = - {Damage:0}
61-
[closed] (south[ward[s]]( |-)[(facing|pointing)]) = - {Damage:0}
62-
[closed] (west[ward[s]]( |-)[(facing|pointing)]) = - {Damage:1}
63-
[closed] (north[ward[s]]( |-)[(facing|pointing)]) = - {Damage:2}
64-
[closed] (east[ward[s]]( |-)[(facing|pointing)]) = - {Damage:3}
65-
open (south[ward[s]]( |-)[(facing|pointing)]) = - {Damage:4}
66-
open (west[ward[s]]( |-)[(facing|pointing)]) = - {Damage:5}
67-
open (north[ward[s]]( |-)[(facing|pointing)]) = - {Damage:6}
68-
open (east[ward[s]]( |-)[(facing|pointing)]) = - {Damage:7}
61+
[closed] south[ward[s]][( |-)(facing|pointing)] = - {Damage:0}
62+
[closed] west[ward[s]][( |-)(facing|pointing)] = - {Damage:1}
63+
[closed] north[ward[s]][( |-)(facing|pointing)] = - {Damage:2}
64+
[closed] east[ward[s]][( |-)(facing|pointing)] = - {Damage:3}
65+
open south[ward[s]][( |-)(facing|pointing)] = - {Damage:4}
66+
open west[ward[s]][( |-)(facing|pointing)] = - {Damage:5}
67+
open north[ward[s]][( |-)(facing|pointing)] = - {Damage:6}
68+
open east[ward[s]][( |-)(facing|pointing)] = - {Damage:7}
6969

7070
{gate state} oak [wood[en]] [fence] gate¦s = minecraft:fence_gate
7171
{gate state} spruce [wood[en]] [fence] gate¦s = minecraft:spruce_fence_gate
@@ -77,14 +77,14 @@ redstone before flattening:
7777

7878
{door state}:
7979
{default} = - {Damage:0}
80-
[closed] (east[ward[s]]( |-)[(facing|pointing)]) [bottom] = - {Damage:0}
81-
[closed] (south[ward[s]]( |-)[(facing|pointing)]) [bottom] = - {Damage:1}
82-
[closed] (west[ward[s]]( |-)[(facing|pointing)]) [bottom] = - {Damage:2}
83-
[closed] (north[ward[s]]( |-)[(facing|pointing)]) [bottom] = - {Damage:3}
84-
open (east[ward[s]]( |-)[(facing|pointing)]) [bottom] = - {Damage:4}
85-
open (south[ward[s]]( |-)[(facing|pointing)]) [bottom] = - {Damage:5}
86-
open (west[ward[s]]( |-)[(facing|pointing)]) [bottom] = - {Damage:6}
87-
open (north[ward[s]]( |-)[(facing|pointing)]) [bottom] = - {Damage:7}
80+
[closed] east[ward[s]][( |-)(facing|pointing)] [bottom] = - {Damage:0}
81+
[closed] south[ward[s]][( |-)(facing|pointing)] [bottom] = - {Damage:1}
82+
[closed] west[ward[s]][( |-)(facing|pointing)] [bottom] = - {Damage:2}
83+
[closed] north[ward[s]][( |-)(facing|pointing)] [bottom] = - {Damage:3}
84+
open east[ward[s]][( |-)(facing|pointing)] [bottom] = - {Damage:4}
85+
open south[ward[s]][( |-)(facing|pointing)] [bottom] = - {Damage:5}
86+
open west[ward[s]][( |-)(facing|pointing)] [bottom] = - {Damage:6}
87+
open north[ward[s]][( |-)(facing|pointing)] [bottom] = - {Damage:7}
8888
left( |-)hinged [closed] top = - {Damage:8}
8989
right( |-)hinged [closed] top = - {Damage:9}
9090
left( |-)hinged powered [closed] top = - {Damage:10}

‎tools.sk‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ tools:
2323
diamond axe¦s = minecraft:diamond_axe
2424
diamond shovel¦s = minecraft:diamond_shovel
2525
diamond hoe¦s = minecraft:diamond_hoe
26+
27+
[any] pickaxe¦s = wooden pickaxe, stone pickaxe, golden pickaxe, iron pickaxe, diamond pickaxe
28+
[any] axe¦s = wooden axe, stone axe, golden axe, iron axe, diamond axe
29+
[any] shovel¦s = wooden shovel, stone shovel, golden shovel, iron shovel, diamond axe
30+
[any] hoe¦s = wooden hoe, stone hoe, golden hoe, iron hoe, diamond hoe
2631

2732
compass¦es = minecraft:compass
2833
[golde[en]] clock¦s = minecraft:clock

0 commit comments

Comments
 (0)