Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Aliases Update for Minecraft 1.17 #69

Merged
merged 3 commits into from
Jun 16, 2021
Merged

Aliases Update for Minecraft 1.17 #69

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa1c52c
First Pass
APickledWalrus Jun 10, 2021
c1078c7
Pass 2 (fixes)
APickledWalrus Jun 10, 2021
575c99b
Pass 3 (fixes)
APickledWalrus Jun 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 90 additions & 4 deletions building.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,93 @@ nether update:

any blackstone slab¦s = blackstone slab, polished blackstone slab, polished blackstone brick slab
any blackstone stair¦s = blackstone stairs, polished blackstone stairs, polished blackstone brick stairs
[any] slab¦s = any wooden slab, stone slab, sandstone slab, petrified oak slab, cobblestone slab, brick slab, stone brick slab, nether brick slab, quartz slab, red sandstone slab, purpur slab, prismarine slab, prismarine brick slab, dark prismarine slab, stone slab, smooth stone slab, granite slab, diorite slab, andesite slab, polished granite slab, polished diorite slab, polished andesite slab, mossy stone brick slab, mossy cobblestone slab, smooth sandstone slab, smooth red sandstone slab, cut sandstone slab, cut red sandstone slab, smooth quartz slab, red nether brick slab, end stone brick slab, any blackstone slab
[any] stair¦s = any wood stairs, any stone stairs, any sandstone stairs, brick stairs, nether brick stairs, quartz stairs, purpur stairs, prismarine stairs, prismarine brick stairs, dark prismarine stairs, smooth quartz stairs, red nether brick stairs, end stone brick stairs, any blackstone stairs


[any] slab¦s = any slab, any blackstone slab
[any] stair¦s = any stair, any blackstone stair

caves and cliffs update part 1:
minecraft version = 1.17 or newer

(amethyst block¦s|block¦s of amethyst) = minecraft:amethyst_block
budding amethyst¦s = minecraft:budding_amethyst

{waxed}:
{default}: minecraft:-
waxed: minecraft:waxed_-
{waxed} (copper block¦s|block¦s of copper) = -copper_block
{waxed} exposed copper [block¦s] = -exposed_copper
{waxed} weathered copper [block¦s] = -weathered_copper
{waxed} oxidized copper [block¦s] = -oxidized_copper
{waxed} cut copper [block¦s] = -cut_copper
{waxed} exposed cut copper [block¦s] = -exposed_cut_copper
{waxed} weathered cut copper [block¦s] = -weathered_cut_copper
{waxed} oxidized cut copper [block¦s] = -oxidized_cut_copper

{waterloggable} {stairs} {stairs shape} {directional} {waxed} cut copper stair¦s = -cut_copper_stairs
{waterloggable} {stairs} {stairs shape} {directional} {waxed} exposed copper stair¦s = -exposed_cut_copper_stairs
{waterloggable} {stairs} {stairs shape} {directional} {waxed} weathered copper stair¦s = -weathered_cut_copper_stairs
{waterloggable} {stairs} {stairs shape} {directional} {waxed} oxidized copper stair¦s = -oxidized_cut_copper_stairs

any non-waxed [cut] copper stair¦s = cut copper stairs, exposed copper stairs, weathered copper stairs, oxidized copper stairs
any waxed [cut] copper stair¦s = waxed cut copper stairs, waxed exposed copper stairs, waxed weathered copper stairs, waxed oxidized copper stairs
any [cut] copper stair¦s = any non-waxed copper stairs, any waxed copper stairs

{waterloggable} {slab} {waxed} cut copper slab¦s = -cut_copper_slab
{waterloggable} {slab} {waxed} exposed copper slab¦s = -exposed_cut_copper_slab
{waterloggable} {slab} {waxed} weathered copper slab¦s = -weathered_cut_copper_slab
{waterloggable} {slab} {waxed} oxidized copper slab¦s = -oxidized_cut_copper_slab

any non-waxed [cut] copper slab¦s = cut copper slab, exposed copper slab, weathered copper slab, oxidized copper slab
any waxed [cut] copper slab¦s = waxed cut copper slab, waxed exposed copper slab, waxed weathered copper slab, waxed oxidized copper slab
any [cut] copper slab¦s = any non-waxed copper slab, any waxed copper slab

{axis-aligned} deepslate [block¦s] = minecraft:deepslate
chiseled deepslate [block¦s] = minecraft:chiseled_deepslate

cobbled deepslate [block¦s] = minecraft:cobbled_deepslate
{waterloggable} {stairs} {stairs shape} {directional} cobbled deepslate stair¦s = minecraft:cobbled_deepslate_stairs
{waterloggable} {slab} cobbled deepslate slab¦s = minecraft:cobbled_deepslate_slab

polished deepslate [block¦s] = minecraft:polished_deepslate
{waterloggable} {stairs} {stairs shape} {directional} polished deepslate stair¦s = minecraft:polished_deepslate_stairs
{waterloggable} {slab} polished deepslate slab¦s = minecraft:polished_deepslate_slab

deepslate tile¦s = minecraft:deepslate_tiles
cracked deepslate tile¦s = minecraft:cracked_deepslate_tiles
any deepslate tile¦s = deepslate tile, cracked tile brick
{waterloggable} {stairs} {stairs shape} {directional} deepslate tile stair¦s = minecraft:deepslate_tile_stairs
{waterloggable} {slab} deepslate tile slab¦s = minecraft:deepslate_tile_slab

deepslate brick¦s = minecraft:deepslate_bricks
cracked deepslate brick¦s = minecraft:cracked_deepslate_bricks
any deepslate brick¦s = deepslate brick, cracked deepslate brick
{waterloggable} {stairs} {stairs shape} {directional} deepslate brick stair¦s = minecraft:deepslate_brick_stairs
{waterloggable} {slab} deepslate brick slab¦s = minecraft:deepslate_brick_slab

[any] stair¦s = any stair, any copper stairs, cobbled deepslate stairs, polished deepslate stairs, deepslate tile stairs, deepslate brick stairs
[any] slab¦s = any slab, any copper slab, cobbled deepslate slab, polished deepslate slab, deepslate tile slab, deepslate brick slab

(raw iron block¦s|block¦s of raw iron) = minecraft:raw_iron_block
(raw copper block¦s|block¦s of raw copper) = minecraft:raw_copper_block
(raw gold block¦s|block¦s of raw gold) = minecraft:raw_gold_block

calcite = minecraft:calcite
tuff = minecraft:tuff
dripstone block¦s = minecraft:dripstone_block
smooth basalt = minecraft:smooth_basalt
rooted dirt [block¦s] = minecraft:rooted_dirt

tinted glass = minecraft:tinted_glass

copper ore¦s = minecraft:copper_ore
deepslate coal ore¦s = minecraft:deepslate_coal_ore
deepslate iron ore¦s = minecraft:deepslate_iron_ore
deepslate copper ore¦s = minecraft:deepslate_copper_ore
deepslate gold ore¦s = minecraft:deepslate_gold_ore
deepslate redstone ore¦s = minecraft:deepslate_redstone_ore
deepslate emerald ore¦s = minecraft:deepslate_emerald_ore
deepslate lapis lazuli ore¦s = minecraft:deepslate_lapis_lazuli_ore
deepslate diamond ore¦s = minecraft:deepslate_diamond_ore

[any] stone ore = any ore
[any] deepslate ore = deepslate coal ore, deepslate iron ore, deepslate copper ore, deepslate gold ore, deepslate redstone ore, deepslate emerald ore, deepslate lapis lazuli ore, deepslate diamond ore
[any] ore = any stone ore, any deepslate ore
60 changes: 60 additions & 0 deletions decoration.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,67 @@ nether update:

nether update part 2:
minecraft version = 1.16.2 or newer

{waterloggable} {axis-aligned} chain¦s = minecraft:chain
{waterloggable} {lantern hanging} lantern = minecraft:lantern
{waterloggable} {lantern hanging} soul lantern¦s = minecraft:soul_lantern
any lantern = lantern, soul lantern

caves and cliffs update part 1:
minecraft version = 1.17 or newer

{waterloggable} {orientable} small amethyst bud¦s = minecraft:small_amethyst_bud
{waterloggable} {orientable} medium amethyst bud¦s = minecraft:medium_amethyst_bud
{waterloggable} {orientable} large amethyst bud¦s = minecraft:large_amethyst_bud
[any] amethyst bud¦s = small amethyst bud, medium amethyst bud, large amethyst bud
{waterloggable} {orientable} amethyst cluster¦s = minecraft:amethyst_cluster

azalea¦s = minecraft:azalea
flowering azalea¦s = minecraft:flowering_azalea
{decayable} azalea lea(f|ves) = minecraft:azalea_leaves
{decayable} flowering azalea lea(f|ves) = minecraft:flowering_azalea_leaves
[any] lea(f|ves) = any leaves, azalea leaves, flowering azalea leaves

candle¦s = minecraft:candle
{colored} candle¦s = -candle

{pointed dripstone thickness}:
{default} = -
base = -[thickness=base]
frustum = -[thickness=frustum]
middle = -[thickness=middle]
tip = -[thickness=tip]
tip merge = -[thickness=tip_merge]
{pointed dripstone direction}:
{default} = -
(floor [attached]|upward facing) = -[vertical_direction=down]
(ceiling [attached]|downward facing) = -[vertical_direction=up]
{waterloggable} {pointed dripstone direction} pointed dripstone {pointed dripstone thickess} = minecraft:pointed_dripstone

spore blossom¦s = minecraft:spore_blossom

moss carpet¦s = minecraft:moss_carpet
moss block¦s = minecraft:moss_block

{waterloggable} hanging root¦s = minecraft:hanging_roots

{dripleaf tilt}:
{default}: -
fully tilted: -[tilt=full]
non-tilted: -[tilt=none]
partially tilted: -[tilt=partial]
unstabl(e|y tilted): -[tilt=unstable]
{waterloggable} {directional} {dripleaf tilt} big dripleaf = minecraft:big_dripleaf
{waterloggable} {directional} big dripleaf stem = minecraft:big_dripleaf_stem
{waterloggable} {directional} {block half} small dripleaf = minecraft:small_dripleaf

(infested|silverfish) deepslate [block]¦s = minecraft:infested_deepslate
[any] (infested|silverfish) block¦s = any infested block, infested deepslate

{waterloggable} cobbled deepslate wall¦s = minecraft:cobbled_deepslate_wall
{waterloggable} polished deepslate wall¦s = minecraft:polished_deepslate_wall
{waterloggable} deepslate brick wall¦s = minecraft:deepslate_brick_wall
{waterloggable} deepslate tile wall¦s = minecraft:cobbled_deepslate_tile_wall

{waterloggable} glow lichen¦s = minecraft:glow_lichen
glow item frame [item]¦s = minecraft:glow_item_frame[relatedEntity=glow item frame]
15 changes: 13 additions & 2 deletions foodstuffs.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,16 @@ unchanged foods:

village and pillage update foods:
minecraft version = 1.14 or newer
dried kelp = minecraft:dried_kelp
sweet berr(y|ies) = minecraft:sweet_berries

buzzy bee update update foods:
minecraft version = 1.15 or newer
honey bottle¦s = minecraft:honey_bottle

caves and cliffs update part 1:
minecraft version = 1.17 or newer
glow berr(y|ies) = minecraft:glow_berries

# Before the flattening in 1.13, some foods used data values.
foods before flattening:
minecraft version = 1.12.2 or older
Expand Down Expand Up @@ -111,6 +114,14 @@ food categories after update aquatic:
[any] dessert¦s = cookie, cake, pumpkin pie
[any] food = any fish, fruit, root vegetables, stews, meats, monster meats, desserts, bread, baked potato, poisonous potato, dried kelp

food categories after village and pillage update:
minecraft version = 1.14 or newer
[any] food = any food, sweet berry

food categories after buzzy bee update:
minecraft version = 1.15 or newer
[any] food = any fish, fruit, root vegetables, stews, meats, monster meats, desserts, bread, baked potato, poisonous potato, dried kelp, honey bottle
[any] food = any food, honey bottle

food categories after caves and cliffs update part 1:
minecraft version = 1.17 or newer
[any] food = any food, glow berry
7 changes: 7 additions & 0 deletions misc-eggs.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,3 +167,10 @@ nether update part 2:
minecraft version = 1.16.2 or newer
(piglin brute [spawn] egg|spawn piglin brute)¦s = minecraft:piglin_brute_spawn_egg
[any] spawn egg¦s = any spawn egg, spawn piglin brute

caves and cliffs update part 1:
minecraft version = 1.17 or newer
(axolotl [spawn] egg|spawn axolotl)¦s = minecraft:axolotl_spawn_egg
(goat [spawn] egg|spawn goat)¦s = minecraft:goat_spawn_egg
(glow squid [spawn] egg|spawn glow squid)¦s = minecraft:glow_squid_spawn_egg
[any] spawn egg¦s = any spawn egg, spawn axolotl, spawn goat, spawn glow squid
29 changes: 25 additions & 4 deletions misc.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,10 @@ unchanged buckets:

new buckets:
minecraft version = 1.13 or newer
tropical fish bucket¦s = minecraft:tropical_fish_bucket
cod bucket¦s = minecraft:cod_bucket
pufferfish bucket¦s = minecraft:pufferfish_bucket
salmon bucket¦s = minecraft:salmon_bucket
(tropical fish bucket¦s|bucket¦s of tropical fish) = minecraft:tropical_fish_bucket
(cod bucket¦s|bucket¦s of cod) = minecraft:cod_bucket
(pufferfish bucket¦s|bucket¦s of pufferfish) = minecraft:pufferfish_bucket
(salmon bucket¦s|bucket¦s of salmon) = minecraft:salmon_bucket
any bucket = empty bucket, water bucket, lava bucket, milk, tropical fish bucket, cod bucket, pufferfish bucket, salmon bucket
any fish bucket = tropical fish bucket, cod bucket, pufferfish bucket, salmon bucket

Expand Down Expand Up @@ -300,10 +300,31 @@ nether update:
minecraft version = 1.16 or newer

netherite ingot¦s = minecraft:netherite_ingot
any ingot¦s = any ingot, netherite ingot
netherite scrap¦s = minecraft:netherite_scrap

[music] (disc|record) pigstep = minecraft:music_disc_pigstep
[any] [music] (disc|record) = music disc 11, music disc 13, music disc blocks, music disc cat, music disc chirp, music disc far, music disc mall, music disc mellohi, music disc stal, music disc strad, music disc wait, music disc ward, music disc pigstep

(snout|piglin) banner pattern¦s = minecraft:piglin_banner_pattern
[any] banner pattern¦s = flower charge banner pattern, creeper charge banner pattern, skull charge banner pattern, thing banner pattern, globe banner pattern, snout banner pattern

caves and cliffs update part 1:
minecraft version = 1.17 or newer

glow ink sac¦s = minecraft:glow_ink_sac

amethyst shard¦s = minecraft:amethyst_shard

powder snow bucket¦s = minecraft:powder_snow_bucket
(axolotl bucket¦s|bucket¦s of axolotl) = minecraft:axolotl_bucket
any bucket = any bucket, powder snow bucket, axolotl bucket
any fish bucket = any fish bucket, axolotl bucket

copper ingot¦s = minecraft:copper_ingot
any ingot¦s = any ingot, copper ingot

raw iron = minecraft:raw_iron
raw copper = minecraft:raw_copper
raw gold = minecraft:raw_gold
[any] raw ore¦s = raw iron, raw copper, raw gold
44 changes: 44 additions & 0 deletions other.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,3 +237,47 @@ nether update:
north-up = -[orientation=north_up]
south-up = -[orientation=south_up]
{jigsaw-orientation} jigsaw block¦s = minecraft:jigsaw

caves and cliffs update part 1:
minecraft version = 1.17 or newer

candle cake¦s = minecraft:candle_cake
{colored} candle cake¦s = -candle_cake

{berried}:
{default}: -
berried = -[berries=true]
cave vines = minecraft:cave_vines
cave vines plant = minecraft:cave_vines_plant

powder snow [block¦s] = minecraft:powder_snow

{light level}:
{default}: -
level (1|one): - {BlockStateTag: {level:"1"}}
level (2|two): - {BlockStateTag: {level:"2"}}
level (3|three): - {BlockStateTag: {level:"3"}}
level (4|four): - {BlockStateTag: {level:"4"}}
level (5|five): - {BlockStateTag: {level:"5"}}
level (6|six): - {BlockStateTag: {level:"6"}}
level (7|seven): - {BlockStateTag: {level:"7"}}
level (8|eight): - {BlockStateTag: {level:"8"}}
level (9|nine): - {BlockStateTag: {level:"9"}}
level (10|ten): - {BlockStateTag: {level:"10"}}
level (11|eleven): - {BlockStateTag: {level:"11"}}
level (12|twelve): - {BlockStateTag: {level:"12"}}
level (13|thirteen): - {BlockStateTag: {level:"13"}}
level (14|fourteen): - {BlockStateTag: {level:"14"}}
level (15|fifteen): - {BlockStateTag: {level:"15"}}
{light level} light [block¦s] = minecraft:light

# The following aliases will likely need to be moved to their 'proper' categories in the future
# As of 1.17, these items were not fully implemented

bundle¦s = minecraft:bundle

{sculk sensor activity}:
{default} = -
active = -[sculk_sensor_phase=active]
cooldown = -[sculk_sensor_phase=cooldown]
{waterlogged} {sculk sensor activity} sculk sensor = minecraft:sculk_sensor
5 changes: 5 additions & 0 deletions redstone.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,11 @@ nether update:
[any] wood[en] door¦s = oak door, spruce door, birch door, jungle door, acacia door, dark oak door, crimson door, warped door
[any] wood[en] trapdoor¦s = oak trapdoor, spruce trapdoor, birch trapdoor, jungle trapdoor, acacia trapdoor, dark oak trapdoor, crimson trapdoor, warped trapdoor

caves and cliffs update part 1:
minecraft version = 1.17 or newer

{waterloggable} {powered} {orientable} lightning rod¦s = minecraft:lightning_rod

global post flattening:
minecraft version = 1.13 or newer
[any] door¦s = iron door, any wooden door
Expand Down
4 changes: 4 additions & 0 deletions tools.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,9 @@ nether update:
[any] shovel¦s = wooden shovel, stone shovel, golden shovel, iron shovel, diamond shovel, netherite shovel
[any] hoe¦s = wooden hoe, stone hoe, golden hoe, iron hoe, diamond hoe, netherite hoe

caves and cliffs update part 1:
minecraft version = 1.17 or newer
spyglass¦es = minecraft:spyglass

global:
any tool¦s = any pickaxe, any axe, any shovel, any hoe