Skip to content

Commit

Permalink
Merge pull request #81 from SkriptLang/fix/mangrove-and-more
Browse files Browse the repository at this point in the history 
Fixes up mangrove type blocks and a few 1.19 missed materials
  • Loading branch information
@TheLimeGlass
TheLimeGlass authored Mar 11, 2023
2 parents 4e1c70e + ef84d87 commit fb9c304
Show file tree
Hide file tree
Showing 4 changed files with 100 additions and 59 deletions.
30 changes: 21 additions & 9 deletions building.sk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ old blocks before flattening:
grass [block¦s] = minecraft:grass
coarse dirt [block¦s] = minecraft:dirt {Damage:1}
podzol [block¦s] = minecraft:dirt {Damage:2}
any dirt = any dirt, coarse dirt, podzol
[nether] quartz ore¦s = minecraft:quartz_ore
unlit redstone ore¦s = minecraft:redstone_ore
lit redstone ore¦s = minecraft:lit_redstone_ore
Expand All @@ -85,8 +86,8 @@ old blocks before flattening:

# All wood
# planks
{old wood type} plank¦s = minecraft:planks
[any] plank¦s = oak planks, spruce planks, birch planks, jungle planks, acacia planks, dark oak planks
{old wood type} [wood[en]] plank¦s = minecraft:planks
[any] [wood[en]] plank¦s = oak planks, spruce planks, birch planks, jungle planks, acacia planks, dark oak planks

# logs
[vertical] oak [wood[en]] log¦s = minecraft:log {Damage:0}
Expand Down Expand Up @@ -263,6 +264,8 @@ building blocks after flattening:
any andesite¦s = raw andesite, polished andesite

any [natural] stone¦s = stone, any granite, any diorite, any andesite
coarse dirt [block¦s] = minecraft:coarse_dirt
any dirt = dirt block, coarse dirt

# Sediments
{snowable}:
Expand All @@ -273,14 +276,13 @@ building blocks after flattening:
{snowable} grass [block¦s] = minecraft:grass_block
{snowable} podzol [block¦s] = minecraft:podzol
{snowable} mycelium [block¦s] = minecraft:mycelium
coarse dirt [block¦s] = minecraft:coarse_dirt
[nether] quartz ore¦s = minecraft:nether_quartz_ore
{lightable} redstone ore¦s = minecraft:redstone_ore

# Wood
# planks
{wood type} plank[s] = -planks
[any] plank¦s = oak planks, spruce planks, birch planks, jungle planks, acacia planks, dark oak planks
{wood type} [wood[en]] plank[s] = -planks
[any] [wood[en]] plank¦s = oak planks, spruce planks, birch planks, jungle planks, acacia planks, dark oak planks

# Normal logs
{axis-aligned} {tree type} log¦s = -log
Expand Down Expand Up @@ -743,7 +745,6 @@ caves and cliffs update part 1:
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

Expand Down Expand Up @@ -772,16 +773,21 @@ the wild update:

# muds
mud = minecraft:mud
muddy mangrove roots = minecraft:muddy_mangrove_roots
packed mud = minecraft:packed_mud
mud bricks = minecraft:mud_bricks

# mud brick stuffs
{waterloggable} mud brick stairs = minecraft:mud_brick_stairs
[any] stairs = any stairs, mud brick stairs

# mangrove
[any] stairs = any stairs, mangrove stairs

{waterloggable} {slab} mud brick slab¦s = minecraft:mud_brick_slab
[any] slab¦s = any slab, mud brick slab

# other build blocks
reinforced deepslate = minecraft:reinforced_deepslate
mangrove roots = minecraft:mangrove_roots

# Sculk
sculk [block¦s] = minecraft:sculk
Expand All @@ -801,11 +807,17 @@ the wild update:
{waterloggable} {summonable} {shriekable} shrieker = minecraft:sculk_shrieker

{axis-aligned} mangrove (wood|bark) [block¦s] = minecraft:mangrove_wood
[any] wood¦s = any wood, mangrove wood

[any] [wood[en]] plank¦s = any wooden plank, mangrove planks
[any] wood[en] slab¦s = any wooden slab, mangrove slab
[any] slab¦s = any slab, mangrove slab

{axis-aligned} mangrove log¦s = minecraft:mangrove_log
[any] log¦s = any log, mangrove log

{axis-aligned} stripped mangrove (bark|wood) [block¦s] = minecraft:stripped_mangrove_wood
[any] stripped (bark|wood) [block¦s] = any stripped bark, stripped mangrove bark

{axis-aligned} stripped mangrove log¦s = minecraft:stripped_mangrove_log
[any] stripped log [block¦s] = any stripped log, stripped mangrove log
[any] stripped log [block¦s] = any stripped log, stripped mangrove log
104 changes: 61 additions & 43 deletions decoration.sk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,27 +263,27 @@ decoratives after flattening:

# Flower pots now each have their own ID!
[empty] flower pot¦s = minecraft:flower_pot
(potted|flower pot with) (dandelion|yellow flower) = minecraft:potted_dandelion
(potted|flower pot with) (poppy|red flower) = minecraft:potted_poppy
(potted|flower pot with) [blue] orchid = minecraft:potted_blue_orchid
(potted|flower pot with) allium = minecraft:potted_allium
(potted|flower pot with) azure bluet = minecraft:potted_azure_bluet
(potted|flower pot with) red tulip = minecraft:potted_red_tulip
(potted|flower pot with) orange tulip = minecraft:potted_orange_tulip
(potted|flower pot with) white tulip = minecraft:potted_white_tulip
(potted|flower pot with) pink tulip = minecraft:potted_pink_tulip
(potted|flower pot with) oxeye daisy = minecraft:potted_oxeye_daisy
(potted|flower pot with) oak [wood[en]] sapling = minecraft:potted_oak_sapling
(potted|flower pot with) spruce [wood[en]] sapling = minecraft:potted_spruce_sapling
(potted|flower pot with) birch [wood[en]] sapling = minecraft:potted_birch_sapling
(potted|flower pot with) jungle [wood[en]] sapling = minecraft:potted_jungle_sapling
(potted|flower pot with) acacia [wood[en]] sapling = minecraft:potted_acacia_sapling
(potted|flower pot with) dark oak [wood[en]] sapling = minecraft:potted_dark_oak_sapling
(potted|flower pot with) red mushroom = minecraft:potted_red_mushroom
(potted|flower pot with) brown mushroom = minecraft:potted_brown_mushroom
(potted|flower pot with) cactus = minecraft:potted_cactus
(potted|flower pot with) dead bush = minecraft:potted_dead_bush
(potted|flower pot with) fern = minecraft:potted_fern
(potted|flower pot with [a]) (dandelion|yellow flower) = minecraft:potted_dandelion
(potted|flower pot with [a]) (poppy|red flower) = minecraft:potted_poppy
(potted|flower pot with [a]) [blue] orchid = minecraft:potted_blue_orchid
(potted|flower pot with [a]) allium = minecraft:potted_allium
(potted|flower pot with [a]) azure bluet = minecraft:potted_azure_bluet
(potted|flower pot with [a]) red tulip = minecraft:potted_red_tulip
(potted|flower pot with [a]) orange tulip = minecraft:potted_orange_tulip
(potted|flower pot with [a]) white tulip = minecraft:potted_white_tulip
(potted|flower pot with [a]) pink tulip = minecraft:potted_pink_tulip
(potted|flower pot with [a]) oxeye daisy = minecraft:potted_oxeye_daisy
(potted|flower pot with [a]) oak [wood[en]] sapling = minecraft:potted_oak_sapling
(potted|flower pot with [a]) spruce [wood[en]] sapling = minecraft:potted_spruce_sapling
(potted|flower pot with [a]) birch [wood[en]] sapling = minecraft:potted_birch_sapling
(potted|flower pot with [a]) jungle [wood[en]] sapling = minecraft:potted_jungle_sapling
(potted|flower pot with [a]) acacia [wood[en]] sapling = minecraft:potted_acacia_sapling
(potted|flower pot with [a]) dark oak [wood[en]] sapling = minecraft:potted_dark_oak_sapling
(potted|flower pot with [a]) red mushroom = minecraft:potted_red_mushroom
(potted|flower pot with [a]) brown mushroom = minecraft:potted_brown_mushroom
(potted|flower pot with [a]) cactus = minecraft:potted_cactus
(potted|flower pot with [a]) dead bush = minecraft:potted_dead_bush
(potted|flower pot with [a]) fern = minecraft:potted_fern
(any flower pot|[any] potted plant) = potted dandelion, potted poppy, potted blue orchid, potted allium, potted azure bluet, potted red tulip, potted orange tulip, potted white tulip, potted pink tulip, potted oxeye daisy, potted oak sapling, potted spruce sapling, potted birch sapling, potted jungle sapling, potted acacia sapling, potted dark oak sapling, potted red mushroom, potted brown mushroom, potted cactus, potted dead bush, potted fern

# Miscellaneous
Expand Down Expand Up @@ -322,17 +322,23 @@ decoratives after flattening:

village update potted flowers and saplings:
minecraft version = 1.14 or newer
(potted|flower pot with) bamboo = minecraft:potted_bamboo
(potted|flower pot with) cornflower = minecraft:potted_cornflower
(potted|flower pot with) lily of the valley = minecraft:potted_lily_of_the_valley
(potted|flower pot with) wither rose = minecraft:potted_wither_rose
(potted|flower pot with [a]) bamboo = minecraft:potted_bamboo
(potted|flower pot with [a]) cornflower = minecraft:potted_cornflower
(potted|flower pot with [a]) lily of the valley = minecraft:potted_lily_of_the_valley
(potted|flower pot with [a]) wither rose = minecraft:potted_wither_rose
(any flower pot|[any] potted plant) = any potted plant, potted bamboo, potted cornflower, potted lily of the valley, potted wither rose
bamboo sapling = minecraft:bamboo_sapling

village and pillage decoratives:
minecraft version = 1.14 or newer
{waterloggable} {directional} {wood type} wall sign¦s = -wall_sign
{waterloggable} {rotatable} {wood type} [floor] sign¦s = -sign
{waterloggable} {rotatable} {wood type} floor sign¦s = -sign
[any] oak sign¦s = oak floor sign, oak wall sign
[any] birch sign¦s = birch floor sign, birch wall sign
[any] jungle sign¦s = jungle floor sign, jungle wall sign
[any] spruce sign¦s = spruce floor sign, spruce wall sign
[any] acacia sign¦s = acacia floor sign, acacia wall sign
[any] dark oak sign¦s = dark oak floor sign, dark oak wall sign
[any] wall sign¦s = oak wall sign, birch wall sign, jungle wall sign, spruce wall sign, acacia wall sign, dark oak wall sign
[any] floor sign¦s = oak floor sign, birch floor sign, jungle floor sign, spruce floor sign, acacia floor sign, dark oak floor sign
[any] sign¦s = any wall sign, any floor sign
Expand Down Expand Up @@ -620,12 +626,13 @@ nether update:

[any] nether fung(us|i) = crimson fungus, warped fungus
[any] nether root¦s = crimson roots, warped roots
[any] root¦s = crimson roots, warped roots
[any] fence¦s = oak fence, spruce fence, birch fence, jungle fence, acacia fence, dark oak fence, nether brick fence, crimson fence, warped fence

(potted|flower pot with) crimson fungus = minecraft:potted_crimson_fungus
(potted|flower pot with) crimson roots = minecraft:potted_crimson_roots
(potted|flower pot with) warped fungus = minecraft:potted_warped_fungus
(potted|flower pot with) warped roots = minecraft:potted_warped_roots
(potted|flower pot with [a]) crimson fungus = minecraft:potted_crimson_fungus
(potted|flower pot with [a]) crimson roots = minecraft:potted_crimson_roots
(potted|flower pot with [a]) warped fungus = minecraft:potted_warped_fungus
(potted|flower pot with [a]) warped roots = minecraft:potted_warped_roots
(any flower pot|[any] potted plant) = any potted plant, potted crimson fungus, potted crimson roots, potted warped fungus, potted warped roots

{waterloggable} blackstone wall¦s = minecraft:blackstone_wall
Expand All @@ -650,26 +657,29 @@ nether update:
{lantern hanging} soul lantern¦s = minecraft:soul_lantern
any lantern = lantern, soul lantern

[any] crimson sign¦s = crimson floor sign, crimson wall sign
[any] warped sign¦s = warped floor sign, warped wall sign
[any] wall sign¦s = any wall sign, crimson wall sign, warped wall sign
[any] floor sign¦s = any floor sign, crimson floor sign, warped floor sign
[any] sign¦s = any wall sign, any floor sign

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

before caves and cliffs update part 1:
minecraft version = 1.16.5 or older

(grass|dirt) path [block]¦s = minecraft:grass_path
any dirt = any dirt, dirt path

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
Expand All @@ -682,8 +692,8 @@ caves and cliffs update part 1:
{decayable} flowering azalea lea(f|ves) = minecraft:flowering_azalea_leaves
[any] lea(f|ves) = any leaves, azalea leaves, flowering azalea leaves

(potted|flower pot with) azalea [bush] = minecraft:potted_azalea_bush
(potted|flower pot with) flowering azalea [bush] = minecraft:potted_flowering_azalea_bush
(potted|flower pot with [a]) azalea [bush] = minecraft:potted_azalea_bush
(potted|flower pot with [a]) flowering azalea [bush] = minecraft:potted_flowering_azalea_bush
(any flower pot|[any] potted plant) = potted azalea bush, potted flowering azalea bush

candle¦s = minecraft:candle
Expand Down Expand Up @@ -732,30 +742,38 @@ caves and cliffs update part 1:
glow item frame [item]¦s = minecraft:glow_item_frame[relatedEntity=glow item frame]

(grass|dirt) path [block]¦s = minecraft:dirt_path

any dirt = any dirt, dirt path

the wild update:
minecraft version = 1.19 or newer

frogspawn¦s = minecraft:frogspawn


mangrove root¦s = minecraft:mangrove_roots
muddy mangrove roots = minecraft:muddy_mangrove_roots
[any] root¦s = any roots, mangrove roots, muddy mangrove roots, hanging roots
rooted dirt [block¦s] = minecraft:rooted_dirt
any dirt = any dirt, rooted dirt

# mangrove
{waterloggable} mangrove (propagule|sapling)¦s = minecraft:mangrove_propagule
(potted|pot with) mangrove (propagule|sapling) = minecraft:potted_mangrove_propagule
[any] sapling¦s = any sapling, mangrove sapling
(potted|flower pot with [a]) mangrove (propagule|sapling) = minecraft:potted_mangrove_propagule
(any flower pot|[any] potted plant) = any flower pot, potted mangrove propagule

[any] mangrove sign¦s = mangrove floor sign, mangrove wall sign
[any] wall sign¦s = any wall sign, mangrove wall sign
[any] floor sign¦s = any floor sign, mangrove floor sign
[any] sign¦s = any wall sign, any floor sign

{decayable}:
{default} = -
decayable = -[persistent=false]
(persistent|permanent) = -[persistent=true]

{waterloggable} {decayable} mangrove lea(f|ves) = minecraft:mangrove_leaves
[any] lea(f|ves) = any leaves, mangrove leaves

# mud brick stuffs
{waterloggable} mud brick stairs = minecraft:mud_brick_stairs
[any] stairs = any stairs, mud brick stairs

{waterloggable} mud brick wall¦s = minecraft:mud_brick_wall

# sculk stuffs
Expand Down
10 changes: 7 additions & 3 deletions redstone.sk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,9 +270,9 @@ caves and cliffs update part 1:
cooldown = -[sculk_sensor_phase=cooldown]
{waterloggable} {sculk sensor activity} sculk sensor¦s = minecraft:sculk_sensor


global post flattening:
minecraft version = 1.13 or newer

[any] door¦s = iron door, any wooden door
[any] button¦s = stone button, any wooden button
[any] trapdoor¦s = iron trapdoor, any wooden trapdoor
Expand All @@ -281,8 +281,12 @@ the wild update:
minecraft version = 1.19 or newer

[any] wood[en] button¦s = wood button, mangrove button
[any] button¦s = any button, mangrove button
[any] pressure plate¦s = pressure plate, mangrove pressure plate
[any] [fence] gate¦s = gate, mangrove gate
[any] wood[en] trapdoor¦s = wood trapdoor, mangrove trapdoor
[any] wood[en] door¦s = wood door, mangrove door
[any] fence¦s = fence, mangrove fence
[any] trapdoor¦s = any trapdoor, mangrove trapdoor
[any] wood[en] door¦s = any wood door, mangrove door
[any] door¦s = any door, mangrove door
[any] fence¦s = any fence, mangrove fence
[any] wood[en] pressure plate¦s = any wooden pressure plate, mangrove pressure plate
15 changes: 11 additions & 4 deletions transportation.sk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,21 @@ the wild update:

# boat with chest
spruce (chest boat¦s|boat¦s with chest) = minecraft:spruce_chest_boat[relatedEntity=spruce chest boat]
any spruce boat¦s = spruce boat, spruce chest boat
birch (chest boat¦s|boat¦s with chest) = minecraft:birch_chest_boat[relatedEntity=birch chest boat]
any birch boat¦s = birch boat, birch chest boat
jungle (chest boat¦s|boat¦s with chest) = minecraft:jungle_chest_boat[relatedEntity=jungle chest boat]
any jungle boat¦s = jungle boat, jungle chest boat
acacia (chest boat¦s|boat¦s with chest) = minecraft:acacia_chest_boat[relatedEntity=acacia chest boat]
any acacia boat¦s = acacia boat, acacia chest boat
oak (chest boat¦s|boat¦s with chest) = minecraft:oak_chest_boat[relatedEntity=oak chest boat]
any oak boat¦s = oak boat, oak chest boat
dark oak (chest boat¦s|boat¦s with chest) = minecraft:dark_oak_chest_boat[relatedEntity=dark oak chest boat]
mangrove (chest boat¦s|boat¦s with chest) = minecraft:mangrove_chest_boat[relatedEntity=mangrove chest boat]
[any] (chest boat¦s|boat¦s with chest) = spruce chest boat, birch chest boat, jungle chest boat, acacia chest boat, dark oak chest boat, mangrove chest boat
any dark oak boat¦s = dark oak boat, dark oak chest boat

# mangrove
mangrove boat¦s = minecraft:mangrove_boat[relatedEntity=mangrove boat]
[any] boat¦s = any boat, mangrove boat
mangrove (chest boat¦s|boat¦s with chest) = minecraft:mangrove_chest_boat[relatedEntity=mangrove chest boat]
any mangrove boat¦s = mangrove boat, mangrove chest boat

[any] (chest[ed] boat¦s|boat¦s with [a] chest) = spruce chest boat, birch chest boat, jungle chest boat, acacia chest boat, dark oak chest boat, mangrove chest boat
[any] boat = any boat, chested boat, any mangrove boat

0 comments on commit fb9c304

Please sign in to comment.