Skip to content

Commit 7afa569

Browse files
committed
Bugfixes
1 parent 7d7629d commit 7afa569

File tree

4 files changed

+79
-73
lines changed

4 files changed

+79
-73
lines changed

building.sk

Lines changed: 62 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,4 @@
11
# The blocks whose ID layout hasn't changed for a long time (at least since 1.8).
2-
unchanged building blocks:
3-
# Stones
4-
stone [block¦s] = minecraft:stone
5-
6-
cobble[stone] [block¦s] = minecraft:cobblestone
7-
moss[y] cobble[stone] [block¦s] = minecraft:mossy_cobblestone
8-
any cobble[stone] [block¦s] = cobblestone, mossy cobblestone
9-
10-
# Sediments
11-
dirt [block¦s] = minecraft:dirt
12-
sand [block¦s] = minecraft:sand
13-
gravel [block¦s] = minecraft:gravel
14-
clay block¦s = minecraft:clay
15-
mycelium [block¦s] = minecraft:mycelium
16-
17-
# Underground
18-
gold ore¦s = minecraft:gold_ore
19-
iron ore¦s = minecraft:iron_ore
20-
coal ore¦s = minecraft:coal_ore
21-
lapis [lazuli] ore¦s = minecraft:lapis_ore
22-
diamond ore¦s = minecraft:diamond_ore
23-
redstone ore¦s = minecraft:redstone_ore
24-
emerald ore¦s = minecraft:emerald_ore
25-
[nether] quartz ore¦s = minecraft:quartz_ore
26-
any ore = gold ore, iron ore, coal ore, lapis ore, diamond ore, redstone ore, emerald ore, nether quartz ore
27-
28-
obsidian [block¦s] = minecraft:obsidian
29-
bedrock [block¦s] = minecraft:bedrock
30-
31-
# Mineral blocks
32-
(gold block¦s|block¦s of gold) = minecraft:gold_block
33-
(iron block¦s|block¦s of iron) = minecraft:iron_block
34-
(coal block¦s|block¦s of coal) = minecraft:coal_block
35-
(lapis [lazuli] block¦s|block¦s of lapis [lazuli]) = minecraft:lapis_block
36-
(diamond block¦s|block¦s of diamond) = minecraft:diamond_block
37-
(redstone block¦s|block¦s of redstone) = minecraft:redstone_block
38-
(emerald block¦s|block¦s of emerald) = minecraft:emerald_block
39-
([nether] quartz block¦s|block¦s of [nether] quartz) = minecraft:quartz_block
40-
41-
# Underwater
42-
sponge¦s = minecraft:sponge
43-
wet sponge¦s = minecraft:wet_sponge
44-
45-
# Construction/Decorative
46-
[red] brick block¦s = minecraft:brick_block
47-
[(plain|unstained|undyed)] glass [block¦s] = minecraft:glass
48-
book[ ]shel(f|ves) = minecraft:bookshelf
49-
50-
# Nether
51-
netherrack [block¦s] = minecraft:netherrack
52-
soul sand [block¦s] = minecraft:soul_sand
53-
glowstone [block¦s] = minecraft:glowstone
54-
nether brick block¦s = minecraft:nether_brick
55-
56-
# Miscellaneous
57-
ice [block¦s] = minecraft:ice
58-
snow block¦s = minecraft:snow
59-
hay [(bale|block)¦s] = minecraft:hay_block
60-
packed ice [block¦s] = minecraft:packed_ice
61-
end[ ]stone [block¦s] = minecraft:end_stone
622

633
# 1.13 changed the IDs of a lot of blocks since they're no longer defined by data value.
644
# This section is for blocks that had a different ID prior to 1.13.
@@ -83,6 +23,7 @@ old blocks before flattening:
8323
grass [block¦s] = minecraft:grass
8424
coarse dirt [block¦s] = minecraft:dirt {Damage:1}
8525
podzol [block¦s] = minecraft:dirt {Damage:2}
26+
[nether] quartz ore¦s = minecraft:quartz_ore
8627

8728
# All wood
8829
# planks
@@ -253,6 +194,7 @@ building blocks after flattening:
253194
grass [block¦s] = minecraft:grass_block
254195
coarse dirt [block¦s] = minecraft:coarse_dirt
255196
podzol [block¦s] = minecraft:podzol
197+
[nether] quartz ore¦s = minecraft:nether_quartz_ore
256198

257199
# Wood
258200
# planks
@@ -351,6 +293,66 @@ building blocks after flattening:
351293
(lit pumpkin|jack(-| )o['](-| )lantern)¦s = minecraft:jack_o_lantern
352294
melon [block]¦s = minecraft:melon
353295

296+
# These were not changed in 1.13
297+
unchanged building blocks:
298+
# Stones
299+
stone [block¦s] = minecraft:stone
300+
301+
cobble[stone] [block¦s] = minecraft:cobblestone
302+
moss[y] cobble[stone] [block¦s] = minecraft:mossy_cobblestone
303+
any cobble[stone] [block¦s] = cobblestone, mossy cobblestone
304+
305+
# Sediments
306+
dirt [block¦s] = minecraft:dirt
307+
sand [block¦s] = minecraft:sand
308+
gravel [block¦s] = minecraft:gravel
309+
clay block¦s = minecraft:clay
310+
mycelium [block¦s] = minecraft:mycelium
311+
312+
# Underground
313+
gold ore¦s = minecraft:gold_ore
314+
iron ore¦s = minecraft:iron_ore
315+
coal ore¦s = minecraft:coal_ore
316+
lapis [lazuli] ore¦s = minecraft:lapis_ore
317+
diamond ore¦s = minecraft:diamond_ore
318+
redstone ore¦s = minecraft:redstone_ore
319+
emerald ore¦s = minecraft:emerald_ore
320+
any ore = gold ore, iron ore, coal ore, lapis ore, diamond ore, redstone ore, emerald ore, nether quartz ore
321+
322+
obsidian [block¦s] = minecraft:obsidian
323+
bedrock [block¦s] = minecraft:bedrock
324+
325+
# Mineral blocks
326+
(gold block¦s|block¦s of gold) = minecraft:gold_block
327+
(iron block¦s|block¦s of iron) = minecraft:iron_block
328+
(coal block¦s|block¦s of coal) = minecraft:coal_block
329+
(lapis [lazuli] block¦s|block¦s of lapis [lazuli]) = minecraft:lapis_block
330+
(diamond block¦s|block¦s of diamond) = minecraft:diamond_block
331+
(redstone block¦s|block¦s of redstone) = minecraft:redstone_block
332+
(emerald block¦s|block¦s of emerald) = minecraft:emerald_block
333+
([nether] quartz block¦s|block¦s of [nether] quartz) = minecraft:quartz_block
334+
335+
# Underwater
336+
sponge¦s = minecraft:sponge
337+
wet sponge¦s = minecraft:wet_sponge
338+
339+
# Construction/Decorative
340+
[red] brick block¦s = minecraft:brick_block
341+
[(plain|unstained|undyed)] glass [block¦s] = minecraft:glass
342+
book[ ]shel(f|ves) = minecraft:bookshelf
343+
344+
# Nether
345+
netherrack [block¦s] = minecraft:netherrack
346+
soul sand [block¦s] = minecraft:soul_sand
347+
glowstone [block¦s] = minecraft:glowstone
348+
nether brick block¦s = minecraft:nether_brick
349+
350+
# Miscellaneous
351+
ice [block¦s] = minecraft:ice
352+
snow block¦s = minecraft:snow
353+
hay [(bale|block)¦s] = minecraft:hay_block
354+
packed ice [block¦s] = minecraft:packed_ice
355+
end[ ]stone [block¦s] = minecraft:end_stone
354356

355357
#== UPDATE-SPECIFICS
356358
# Building blocks added in 1.9 whose IDs have never changed. End City stuff, namely.

decoration.sk

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ decoratives before flattening:
4848
(red flower¦s|popp(y|ies)) = minecraft:red_flower {Damage:0}
4949
blue orchid¦s = minecraft:red_flower {Damage:1}
5050
allium¦s = minecraft:red_flower {Damage:2}
51-
azue bluet¦s = minecraft:red_flower {Damage:3}
51+
azure bluet¦s = minecraft:red_flower {Damage:3}
5252
red tulip¦s = minecraft:red_flower {Damage:4}
5353
orange tulip¦s = minecraft:red_flower {Damage:5}
5454
white tulip¦s = minecraft:red_flower {Damage:6}
5555
pink tulip¦s = minecraft:red_flower {Damage:7}
5656
oxeye dais(y|ies) = minecraft:red_flower {Damage:8}
5757
any tulip¦s = red tulip, orange tulip, white tulip, pink tulip
58-
any small flower = dandelion, poppy, blue orchid, allium, azue bluet, any tulip, oxeye daisy
58+
any small flower = dandelion, poppy, blue orchid, allium, azure bluet, any tulip, oxeye daisy
5959

6060
# Large flowers
6161
sunflower¦s = minecraft:double_plant {Damage:0}
@@ -151,14 +151,14 @@ decoratives after flattening:
151151
(red flower¦s|popp(y|ies)) = minecraft:poppy
152152
blue orchid¦s = minecraft:blue_orchid
153153
allium¦s = minecraft:allium
154-
azue bluet¦s = minecraft:azue_bluet
154+
azure bluet¦s = minecraft:azure_bluet
155155
red tulip¦s = minecraft:red_tulip
156156
orange tulip¦s = minecraft:orange_tulip
157157
white tulip¦s = minecraft:white_tulip
158158
pink tulip¦s = minecraft:pink_tulip
159159
oxeye dais(y|ies) = minecraft:oxeye_daisy
160160
any tulip¦s = red tulip, orange tulip, white tulip, pink tulip
161-
any small flower = dandelion, poppy, blue orchid, allium, azue bluet, any tulip, oxeye daisy
161+
any small flower = dandelion, poppy, blue orchid, allium, azure bluet, any tulip, oxeye daisy
162162

163163
# Large flowers
164164
{block half} sunflower¦s = minecraft:sunflower
@@ -176,8 +176,8 @@ decoratives after flattening:
176176
{waterloggable} nether brick fence¦s = minecraft:nether_brick_fence
177177

178178
# Silverfish blocks
179-
(infested|silverfish) stone [block¦s] = minecraft:infested_stone
180-
(infested|silverfish) cobblestone [block¦s] = minecraft:infested_cobblestone
179+
(infested|silverfish) stone [block]¦s = minecraft:infested_stone
180+
(infested|silverfish) cobblestone [block]¦s = minecraft:infested_cobblestone
181181
(infested|silverfish) stone brick [block]¦s = minecraft:infested_stone_bricks
182182
(infested|silverfish) mossy stone brick [block]¦s = minecraft:infested_mossy_stone_bricks
183183
(infested|silverfish) cracked stone brick [block]¦s = minecraft:infested_cracked_stone_bricks

other.sk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ update aquatic unlisted blocks:
8888
(downwards|whirlpool|dragging) bubble column = minecraft:bubble_column[drag=true]
8989
bubble column = upwards bubble column, downwards bubble column
9090

91-
water:
91+
# Figure out how they work in their fluid form on 1.13
92+
fluids:
9293
[stationary] water = minecraft:water
93-
flowing water = minecraft:flowing_water
94+
[stationary] lava = minecraft:lava

redstone.sk

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,17 @@ 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
16-
[any] daylight (detector|sensor)¦s = normal daylight detector, inverted daylight detector
1715

1816
{orientable} dispenser¦s = minecraft:dispenser
1917
{orientable} dropper¦s = minecraft:dropper
2018
tnt [block¦s] = minecraft:tnt
2119
hopper¦s = minecraft:hopper
20+
21+
iron trapdoor¦s = minecraft:iron_trapdoor
2222

2323
{orientable} [(normal|non-sticky)] piston¦s = minecraft:piston
2424
{orientable} sticky piston¦s = minecraft:sticky_piston
2525
{orientable} piston head¦s = minecraft:piston_head
26-
(piston extension|block 36|block moved by piston|moving block¦s) = minecraft:piston_extension
2726

2827
redstone before flattening:
2928
minecraft version = 1.12 or older
@@ -52,7 +51,6 @@ redstone before flattening:
5251

5352
# Trapdoors
5453
[oak] wood[en] trapdoor¦s = minecraft:trapdoor
55-
iron trapdoor¦s = minecraft:iron_trapdoor
5654
[any] trapdoor¦s = wood trapdoor, iron trapdoor
5755

5856
# Fences and doors
@@ -114,7 +112,7 @@ redstone before flattening:
114112
note block¦s = minecraft:noteblock
115113
tripwire hook¦s = minecraft:tripwire_hook
116114
trapped chest¦s = minecraft:trapped_chest
117-
115+
(piston extension|block 36|moving piston|moving block¦s) = minecraft:piston_extension
118116

119117
redstone after flattening:
120118
minecraft version = 1.13 or newer
@@ -170,6 +168,11 @@ redstone after flattening:
170168
note block¦s = minecraft:note_block
171169
{directional} {powerable} tripwire hook¦s = minecraft:tripwire_hook
172170
{directional} {waterloggable} trapped chest¦s = minecraft:trapped_chest
171+
inverted daylight (detector|sensor)¦s = minecraft:daylight_detector[inverted=true]
172+
(piston extension|block 36|moving piston|moving block¦s) = minecraft:moving_piston
173+
174+
categories:
175+
[any] daylight (detector|sensor)¦s = normal daylight detector, inverted daylight detector
173176

174177
exploration update:
175178
minecraft version = 1.11 or newer

0 commit comments

Comments
 (0)