From de01fd19b7bd4f4947746324c4fdc39b62a5623a Mon Sep 17 00:00:00 2001 From: TheLimeGlass Date: Thu, 5 Jan 2023 15:21:49 -0700 Subject: [PATCH 01/12] Fixes up mangrove type blocks and a few 1.19 missed materials --- building.sk | 28 ++++++++++----- decoration.sk | 89 +++++++++++++++++++++++++---------------------- redstone.sk | 10 ++++-- transportation.sk | 13 ++++--- 4 files changed, 84 insertions(+), 56 deletions(-) diff --git a/building.sk b/building.sk index 4cfe44a..3d4d98f 100644 --- a/building.sk +++ b/building.sk @@ -10,6 +10,7 @@ unchanged building blocks: # Sediments dirt [block¦s] = minecraft:dirt + any dirt = dirt block sand [block¦s] = minecraft:sand gravel [block¦s] = minecraft:gravel clay block¦s = minecraft:clay @@ -77,6 +78,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 block, 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 @@ -85,8 +87,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} @@ -273,14 +275,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 @@ -743,7 +744,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 @@ -772,10 +772,16 @@ 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 @@ -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 = any wooden slab, mangrove slab + [any] slab = 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 \ No newline at end of file + [any] stripped log [block¦s] = any stripped log, stripped mangrove log diff --git a/decoration.sk b/decoration.sk index 88ef763..08708cf 100644 --- a/decoration.sk +++ b/decoration.sk @@ -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 @@ -322,10 +322,10 @@ 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 @@ -620,12 +620,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 @@ -664,8 +665,6 @@ nether update part 2: before caves and cliffs update part 1: minecraft version = 1.16.5 or older - - (grass|dirt) path [block]¦s = minecraft:grass_path caves and cliffs update part 1: minecraft version = 1.17 or newer @@ -682,8 +681,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 @@ -732,30 +731,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 + hanging roots = minecraft:hanging_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 = 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] 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 diff --git a/redstone.sk b/redstone.sk index fa088ce..afce5da 100644 --- a/redstone.sk +++ b/redstone.sk @@ -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 @@ -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 diff --git a/transportation.sk b/transportation.sk index 8c7d9dd..d494a58 100644 --- a/transportation.sk +++ b/transportation.sk @@ -122,14 +122,19 @@ the wild update: # boat with chest spruce (chest boat¦s|boat¦s with chest) = minecraft:spruce_chest_boat[relatedEntity=spruce chest boat] + spruce boat¦s = spruce boat, spruce chest boat birch (chest boat¦s|boat¦s with chest) = minecraft:birch_chest_boat[relatedEntity=birch chest boat] + birch boat¦s = birch boat, birch chest boat jungle (chest boat¦s|boat¦s with chest) = minecraft:jungle_chest_boat[relatedEntity=jungle chest boat] + jungle boat¦s = jungle boat, jungle chest boat acacia (chest boat¦s|boat¦s with chest) = minecraft:acacia_chest_boat[relatedEntity=acacia chest boat] + acacia boat¦s = acacia boat, acacia chest boat oak (chest boat¦s|boat¦s with chest) = minecraft:oak_chest_boat[relatedEntity=oak chest boat] + 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] + dark oak boat¦s = dark oak boat, 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 + mangrove boat¦s = minecraft:mangrove_boat[relatedEntity=mangrove boat], mangrove chest boat - # mangrove - mangrove boat¦s = minecraft:mangrove_boat[relatedEntity=mangrove boat] - [any] boat¦s = any boat, mangrove boat \ No newline at end of file + [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, mangrove boat From 8e9e0bdfb4242d763fd6c817b8b01a29ca0f1203 Mon Sep 17 00:00:00 2001 From: TheLimeGlass Date: Thu, 5 Jan 2023 15:42:14 -0700 Subject: [PATCH 02/12] Fix signs --- decoration.sk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/decoration.sk b/decoration.sk index 08708cf..93be62e 100644 --- a/decoration.sk +++ b/decoration.sk @@ -333,6 +333,12 @@ 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 + oak sign¦s = oak floor sign, oak wall sign + birch sign¦s = birch floor sign, birch wall sign + jungle sign¦s = jungle floor sign, jungle wall sign + spruce sign¦s = spruce floor sign, spruce wall sign + acacia sign¦s = acacia floor sign, acacia wall sign + 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 @@ -651,6 +657,8 @@ nether update: {lantern hanging} soul lantern¦s = minecraft:soul_lantern any lantern = lantern, soul lantern + crimson sign¦s = crimson floor sign, crimson wall sign + 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 @@ -751,6 +759,7 @@ the wild update: (potted|flower pot with [a]) mangrove (propagule|sapling) = minecraft:potted_mangrove_propagule (any flower pot|[any] potted plant) = any flower pot, potted mangrove propagule + 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 From 75a9dd444386f8920a2340ea4b3467cdbffd285d Mon Sep 17 00:00:00 2001 From: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> Date: Thu, 26 Jan 2023 20:06:42 -0700 Subject: [PATCH 03/12] Update building.sk --- building.sk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/building.sk b/building.sk index 3d4d98f..703ac8c 100644 --- a/building.sk +++ b/building.sk @@ -78,7 +78,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 block, coarse dirt, podzol + 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 From 3d577160a6fc10db43bcf159efec92c528d89a88 Mon Sep 17 00:00:00 2001 From: TheLimeGlass Date: Fri, 10 Mar 2023 13:29:01 -0700 Subject: [PATCH 04/12] Address reviews --- decoration.sk | 20 ++++++++++---------- transportation.sk | 18 ++++++++++-------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/decoration.sk b/decoration.sk index 93be62e..570c377 100644 --- a/decoration.sk +++ b/decoration.sk @@ -332,13 +332,13 @@ village update potted flowers and saplings: 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 - oak sign¦s = oak floor sign, oak wall sign - birch sign¦s = birch floor sign, birch wall sign - jungle sign¦s = jungle floor sign, jungle wall sign - spruce sign¦s = spruce floor sign, spruce wall sign - acacia sign¦s = acacia floor sign, acacia wall sign - dark oak sign¦s = dark oak floor sign, dark oak wall 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 @@ -657,8 +657,8 @@ nether update: {lantern hanging} soul lantern¦s = minecraft:soul_lantern any lantern = lantern, soul lantern - crimson sign¦s = crimson floor sign, crimson wall sign - warped sign¦s = warped floor sign, warped wall sign + [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 @@ -759,7 +759,7 @@ the wild update: (potted|flower pot with [a]) mangrove (propagule|sapling) = minecraft:potted_mangrove_propagule (any flower pot|[any] potted plant) = any flower pot, potted mangrove propagule - mangrove sign¦s = mangrove floor sign, mangrove wall sign + [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 diff --git a/transportation.sk b/transportation.sk index d494a58..94cfc68 100644 --- a/transportation.sk +++ b/transportation.sk @@ -122,19 +122,21 @@ the wild update: # boat with chest spruce (chest boat¦s|boat¦s with chest) = minecraft:spruce_chest_boat[relatedEntity=spruce chest boat] - spruce boat¦s = spruce boat, 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] - birch boat¦s = birch boat, 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] - jungle boat¦s = jungle boat, 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] - acacia boat¦s = acacia boat, 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] - oak boat¦s = oak boat, 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] - dark oak boat¦s = dark oak boat, dark oak chest boat + any dark oak boat¦s = dark oak boat, dark oak chest boat + + mangrove boat¦s = minecraft:mangrove_boat[relatedEntity=mangrove boat] mangrove (chest boat¦s|boat¦s with chest) = minecraft:mangrove_chest_boat[relatedEntity=mangrove chest boat] - mangrove boat¦s = minecraft:mangrove_boat[relatedEntity=mangrove boat], 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, mangrove boat + [any] boat = any boat, chested boat, any mangrove boat From c237405a2d6fffa94ca9697d714c30841a005889 Mon Sep 17 00:00:00 2001 From: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> Date: Fri, 10 Mar 2023 14:16:24 -0700 Subject: [PATCH 05/12] Update building.sk Co-authored-by: Patrick Miller --- building.sk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/building.sk b/building.sk index 703ac8c..00e0968 100644 --- a/building.sk +++ b/building.sk @@ -810,8 +810,8 @@ the wild update: [any] wood¦s = any wood, mangrove wood [any] [wood[en]] plank¦s = any wooden plank, mangrove planks - [any] wood[en] slab = any wooden slab, mangrove slab - [any] slab = any slab, mangrove slab + [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 From 6439fcb66f01411620a13e8c2cafec401ae76928 Mon Sep 17 00:00:00 2001 From: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> Date: Fri, 10 Mar 2023 14:16:40 -0700 Subject: [PATCH 06/12] Update decoration.sk Co-authored-by: Patrick Miller --- decoration.sk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/decoration.sk b/decoration.sk index 570c377..8ce0d3b 100644 --- a/decoration.sk +++ b/decoration.sk @@ -755,7 +755,7 @@ the wild update: # mangrove {waterloggable} mangrove (propagule|sapling)¦s = minecraft:mangrove_propagule - [any] sapling = any sapling, mangrove sapling + [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 From 25da9f9e4d331e3e373b4edf02e7c6020ee4d58d Mon Sep 17 00:00:00 2001 From: TheLimeGlass Date: Fri, 10 Mar 2023 14:28:16 -0700 Subject: [PATCH 07/12] Address reviews --- building.sk | 1 - decoration.sk | 7 ++++--- transportation.sk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/building.sk b/building.sk index 00e0968..b935a7b 100644 --- a/building.sk +++ b/building.sk @@ -787,7 +787,6 @@ the wild update: # other build blocks reinforced deepslate = minecraft:reinforced_deepslate - mangrove roots = minecraft:mangrove_roots # Sculk sculk [block¦s] = minecraft:sculk diff --git a/decoration.sk b/decoration.sk index 8ce0d3b..073c6ed 100644 --- a/decoration.sk +++ b/decoration.sk @@ -536,6 +536,10 @@ directionals before flattening: {skull types} item¦s = minecraft:skull ({wall orientations}|{skull floor orientations}) {skull types} = minecraft:skull + (grass|dirt) path [block]¦s = minecraft:dirt_path + coarse dirt [block¦s] = minecraft:coarse_dirt + any dirt = any dirt, dirt path, coarse dirt + banners: minecraft version = 1.11 to 1.12.2 {wall orientations} {placed banner colors} wall banner¦s = minecraft:wall_banner @@ -737,9 +741,6 @@ caves and cliffs update part 1: {waterloggable} {surface} glow lichen¦s = minecraft:glow_lichen 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 diff --git a/transportation.sk b/transportation.sk index 94cfc68..d777ada 100644 --- a/transportation.sk +++ b/transportation.sk @@ -138,5 +138,5 @@ the wild update: 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] {wood type} (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 From 00dddc59816df60f674a3c4a176da32f2eeef58e Mon Sep 17 00:00:00 2001 From: TheLimeGlass Date: Fri, 10 Mar 2023 14:56:29 -0700 Subject: [PATCH 08/12] Address reviews --- building.sk | 3 ++- decoration.sk | 8 +++----- transportation.sk | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/building.sk b/building.sk index b935a7b..098c7c8 100644 --- a/building.sk +++ b/building.sk @@ -10,7 +10,8 @@ unchanged building blocks: # Sediments dirt [block¦s] = minecraft:dirt - any dirt = dirt block + coarse dirt [block¦s] = minecraft:coarse_dirt + any dirt = dirt block, coarse dirt sand [block¦s] = minecraft:sand gravel [block¦s] = minecraft:gravel clay block¦s = minecraft:clay diff --git a/decoration.sk b/decoration.sk index 073c6ed..7b0a828 100644 --- a/decoration.sk +++ b/decoration.sk @@ -536,10 +536,6 @@ directionals before flattening: {skull types} item¦s = minecraft:skull ({wall orientations}|{skull floor orientations}) {skull types} = minecraft:skull - (grass|dirt) path [block]¦s = minecraft:dirt_path - coarse dirt [block¦s] = minecraft:coarse_dirt - any dirt = any dirt, dirt path, coarse dirt - banners: minecraft version = 1.11 to 1.12.2 {wall orientations} {placed banner colors} wall banner¦s = minecraft:wall_banner @@ -741,6 +737,9 @@ caves and cliffs update part 1: {waterloggable} {surface} glow lichen¦s = minecraft:glow_lichen 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 @@ -749,7 +748,6 @@ the wild update: mangrove root¦s = minecraft:mangrove_roots muddy mangrove roots = minecraft:muddy_mangrove_roots - hanging roots = minecraft:hanging_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 diff --git a/transportation.sk b/transportation.sk index d777ada..94cfc68 100644 --- a/transportation.sk +++ b/transportation.sk @@ -138,5 +138,5 @@ the wild update: 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] {wood type} (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] (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 From e1b1f92cc40681607d7629d1079e27e5ceaeb4e5 Mon Sep 17 00:00:00 2001 From: TheLimeGlass Date: Fri, 10 Mar 2023 18:47:20 -0700 Subject: [PATCH 09/12] Address reviews --- decoration.sk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/decoration.sk b/decoration.sk index 7b0a828..0da0427 100644 --- a/decoration.sk +++ b/decoration.sk @@ -665,12 +665,15 @@ 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 + (grass|dirt) path [block]¦s = minecraft:grass_path + any dirt = any dirt, dirt path + before caves and cliffs update part 1: minecraft version = 1.16.5 or older From 79cf2184531ee0f4a8c2b73cef9f645c3ad3bc34 Mon Sep 17 00:00:00 2001 From: TheLimeGlass Date: Fri, 10 Mar 2023 19:06:46 -0700 Subject: [PATCH 10/12] Address reviews --- decoration.sk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/decoration.sk b/decoration.sk index 0da0427..0990e6c 100644 --- a/decoration.sk +++ b/decoration.sk @@ -663,6 +663,9 @@ nether update: [any] floor sign¦s = any floor sign, crimson floor sign, warped floor sign [any] sign¦s = any wall sign, any floor sign + (grass|dirt) path [block]¦s = minecraft:grass_path + any dirt = any dirt, dirt path + nether update part 2: minecraft version = 1.16.2 or newer @@ -671,9 +674,6 @@ nether update part 2: {waterloggable} {lantern hanging} soul lantern¦s = minecraft:soul_lantern any lantern = lantern, soul lantern - (grass|dirt) path [block]¦s = minecraft:grass_path - any dirt = any dirt, dirt path - before caves and cliffs update part 1: minecraft version = 1.16.5 or older From d0d5f25f8a91219f0e87047bc464163f0db21a02 Mon Sep 17 00:00:00 2001 From: TheLimeGlass Date: Fri, 10 Mar 2023 19:13:22 -0700 Subject: [PATCH 11/12] Revert review --- decoration.sk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/decoration.sk b/decoration.sk index 0990e6c..1798df4 100644 --- a/decoration.sk +++ b/decoration.sk @@ -663,9 +663,6 @@ nether update: [any] floor sign¦s = any floor sign, crimson floor sign, warped floor sign [any] sign¦s = any wall sign, any floor sign - (grass|dirt) path [block]¦s = minecraft:grass_path - any dirt = any dirt, dirt path - nether update part 2: minecraft version = 1.16.2 or newer @@ -677,9 +674,12 @@ nether update part 2: 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 From ef84d87b0e7758cf614f3fe4f53ea36641ec802a Mon Sep 17 00:00:00 2001 From: TheLimeGlass Date: Fri, 10 Mar 2023 19:37:10 -0700 Subject: [PATCH 12/12] Address reviews --- building.sk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/building.sk b/building.sk index 098c7c8..3ee1a13 100644 --- a/building.sk +++ b/building.sk @@ -10,8 +10,6 @@ unchanged building blocks: # Sediments dirt [block¦s] = minecraft:dirt - coarse dirt [block¦s] = minecraft:coarse_dirt - any dirt = dirt block, coarse dirt sand [block¦s] = minecraft:sand gravel [block¦s] = minecraft:gravel clay block¦s = minecraft:clay @@ -266,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}: