diff --git a/biomes/swamp/marsh-rotten.json b/biomes/swamp/marsh-rotten.json index 813cd7c6..ed9d5040 100644 --- a/biomes/swamp/marsh-rotten.json +++ b/biomes/swamp/marsh-rotten.json @@ -37,7 +37,7 @@ "block": "minecraft:grass_block" }, {"block": "minecraft:podzol"}, - {"block": "minecraft:coarse_dirt"}, + {"block": "minecraft:mud"}, { "weight": 4, "block": "minecraft:grass_block" diff --git a/biomes/swamp/shore/beach.json b/biomes/swamp/shore/beach.json index 85649ced..7b63a4ba 100644 --- a/biomes/swamp/shore/beach.json +++ b/biomes/swamp/shore/beach.json @@ -16,20 +16,8 @@ "style": {"style": "NOWHERE"}, "zoom": 0.2, "palette": [ - {"block": "minecraft:dirt"}, {"block": "minecraft:coarse_dirt"}, - {"block": "minecraft:rooted_dirt"} - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - {"block": "minecraft:dirt"}, - { - "weight": 2, - "block": "minecraft:coarse_dirt" - } + {"block": "minecraft:mud"} ] } ], diff --git a/biomes/swamp/swamp-mangrove-lake.json b/biomes/swamp/swamp-mangrove-lake.json index b0319525..08f56bbb 100644 --- a/biomes/swamp/swamp-mangrove-lake.json +++ b/biomes/swamp/swamp-mangrove-lake.json @@ -30,7 +30,7 @@ }, "zoom": 0.8, "palette": [ - {"block": "minecraft:dirt"}, + {"block": "minecraft:mud"}, {"block": "minecraft:coarse_dirt"} ] }, @@ -71,19 +71,12 @@ ] } ], - "entitySpawners": [ - "swamp/water-passive" - ], "objects": [{ "mode": "STILT", "onwater": true, "chance": 1, "clamp": {"maximumHeight": 225}, "density": 5, - "stiltOverride":{ - "style":{"style": "NOWHERE"}, - "palette": [{"block": "minecraft:mangrove_roots", "weight": 3},{"block": "minecraft:water"}] - }, "place": [ "trees/mangrove/mangrove1", "trees/mangrove/mangrove2", @@ -106,7 +99,6 @@ "trees/mangrove/mangrove19", "trees/mangrove/mangrove20" ], - "rotation": { "enabled": true, "yAxis": { @@ -116,18 +108,10 @@ "max": 360 } }, - "translate": {"y": -8, "yRandom": -3}, + "translate": {"y": -8}, "edit": [{ "find": [{"block": "minecraft:oak_fence"}], "replace": {"palette": [{"block": "minecraft:air"}]} - }, - { - "find": [{"block": "minecraft:acacia_wood"}], - "replace":{"palette": [{"block": "minecraft:mangrove_wood"}]} - }, - { - "find": [{"block": "minecraft:jungle_leaves"}], - "replace":{"palette": [{"block": "minecraft:mangrove_leaves"}]} }] }] -} +} \ No newline at end of file diff --git a/objects/trees/mangrove/mangrove1.iob b/objects/trees/mangrove/mangrove1.iob index 8a994c36..d8496640 100644 Binary files a/objects/trees/mangrove/mangrove1.iob and b/objects/trees/mangrove/mangrove1.iob differ diff --git a/objects/trees/mangrove/mangrove10.iob b/objects/trees/mangrove/mangrove10.iob index df3f07d7..06497164 100644 Binary files a/objects/trees/mangrove/mangrove10.iob and b/objects/trees/mangrove/mangrove10.iob differ diff --git a/objects/trees/mangrove/mangrove11.iob b/objects/trees/mangrove/mangrove11.iob index 3d37d0f4..3317cb04 100644 Binary files a/objects/trees/mangrove/mangrove11.iob and b/objects/trees/mangrove/mangrove11.iob differ diff --git a/objects/trees/mangrove/mangrove12.iob b/objects/trees/mangrove/mangrove12.iob index e433993b..b8fcd9ea 100644 Binary files a/objects/trees/mangrove/mangrove12.iob and b/objects/trees/mangrove/mangrove12.iob differ diff --git a/objects/trees/mangrove/mangrove13.iob b/objects/trees/mangrove/mangrove13.iob index e433993b..e9754955 100644 Binary files a/objects/trees/mangrove/mangrove13.iob and b/objects/trees/mangrove/mangrove13.iob differ diff --git a/objects/trees/mangrove/mangrove14.iob b/objects/trees/mangrove/mangrove14.iob index 7b943c06..6c7040c2 100644 Binary files a/objects/trees/mangrove/mangrove14.iob and b/objects/trees/mangrove/mangrove14.iob differ diff --git a/objects/trees/mangrove/mangrove15.iob b/objects/trees/mangrove/mangrove15.iob index 6e202351..6d9782bf 100644 Binary files a/objects/trees/mangrove/mangrove15.iob and b/objects/trees/mangrove/mangrove15.iob differ diff --git a/objects/trees/mangrove/mangrove16.iob b/objects/trees/mangrove/mangrove16.iob index 3297def7..c7ef99a3 100644 Binary files a/objects/trees/mangrove/mangrove16.iob and b/objects/trees/mangrove/mangrove16.iob differ diff --git a/objects/trees/mangrove/mangrove17.iob b/objects/trees/mangrove/mangrove17.iob index 07478b25..28c3a339 100644 Binary files a/objects/trees/mangrove/mangrove17.iob and b/objects/trees/mangrove/mangrove17.iob differ diff --git a/objects/trees/mangrove/mangrove18.iob b/objects/trees/mangrove/mangrove18.iob index 98f9ef02..b1855fc4 100644 Binary files a/objects/trees/mangrove/mangrove18.iob and b/objects/trees/mangrove/mangrove18.iob differ diff --git a/objects/trees/mangrove/mangrove19.iob b/objects/trees/mangrove/mangrove19.iob index 1159a0c1..9b3af00f 100644 Binary files a/objects/trees/mangrove/mangrove19.iob and b/objects/trees/mangrove/mangrove19.iob differ diff --git a/objects/trees/mangrove/mangrove2.iob b/objects/trees/mangrove/mangrove2.iob index 22de89a7..4cbdb9e2 100644 Binary files a/objects/trees/mangrove/mangrove2.iob and b/objects/trees/mangrove/mangrove2.iob differ diff --git a/objects/trees/mangrove/mangrove20.iob b/objects/trees/mangrove/mangrove20.iob index 14c5ba98..0750a5bd 100644 Binary files a/objects/trees/mangrove/mangrove20.iob and b/objects/trees/mangrove/mangrove20.iob differ diff --git a/objects/trees/mangrove/mangrove3.iob b/objects/trees/mangrove/mangrove3.iob index 4f411ed2..5722627b 100644 Binary files a/objects/trees/mangrove/mangrove3.iob and b/objects/trees/mangrove/mangrove3.iob differ diff --git a/objects/trees/mangrove/mangrove4.iob b/objects/trees/mangrove/mangrove4.iob index 2f4a1f6f..2b1af212 100644 Binary files a/objects/trees/mangrove/mangrove4.iob and b/objects/trees/mangrove/mangrove4.iob differ diff --git a/objects/trees/mangrove/mangrove5.iob b/objects/trees/mangrove/mangrove5.iob index ee8d6d19..226426fb 100644 Binary files a/objects/trees/mangrove/mangrove5.iob and b/objects/trees/mangrove/mangrove5.iob differ diff --git a/objects/trees/mangrove/mangrove6.iob b/objects/trees/mangrove/mangrove6.iob index e5fc4423..2e263fd8 100644 Binary files a/objects/trees/mangrove/mangrove6.iob and b/objects/trees/mangrove/mangrove6.iob differ diff --git a/objects/trees/mangrove/mangrove7.iob b/objects/trees/mangrove/mangrove7.iob index 6176448e..cb97bd18 100644 Binary files a/objects/trees/mangrove/mangrove7.iob and b/objects/trees/mangrove/mangrove7.iob differ diff --git a/objects/trees/mangrove/mangrove8.iob b/objects/trees/mangrove/mangrove8.iob index 4dbb1ac4..e21f92c1 100644 Binary files a/objects/trees/mangrove/mangrove8.iob and b/objects/trees/mangrove/mangrove8.iob differ diff --git a/objects/trees/mangrove/mangrove9.iob b/objects/trees/mangrove/mangrove9.iob index 08855f4c..42c326b6 100644 Binary files a/objects/trees/mangrove/mangrove9.iob and b/objects/trees/mangrove/mangrove9.iob differ diff --git a/objects/trees/mangrove/t1.iob b/objects/trees/mangrove/t1.iob index 578e7e43..00e70aeb 100644 Binary files a/objects/trees/mangrove/t1.iob and b/objects/trees/mangrove/t1.iob differ diff --git a/objects/trees/mangrove/t2.iob b/objects/trees/mangrove/t2.iob index 34af53dc..9d82f312 100644 Binary files a/objects/trees/mangrove/t2.iob and b/objects/trees/mangrove/t2.iob differ diff --git a/objects/trees/mangrove/t3.iob b/objects/trees/mangrove/t3.iob index 6e38afb4..3636eebb 100644 Binary files a/objects/trees/mangrove/t3.iob and b/objects/trees/mangrove/t3.iob differ diff --git a/objects/trees/mangrove/t4.iob b/objects/trees/mangrove/t4.iob index 03e3bc94..802e3631 100644 Binary files a/objects/trees/mangrove/t4.iob and b/objects/trees/mangrove/t4.iob differ diff --git a/objects/trees/mangrove/t5.iob b/objects/trees/mangrove/t5.iob index 6535cca1..ed1a77c4 100644 Binary files a/objects/trees/mangrove/t5.iob and b/objects/trees/mangrove/t5.iob differ diff --git a/objects/trees/mangrove/tree1.iob b/objects/trees/mangrove/tree1.iob index 89b7ff5c..ef5b1415 100644 Binary files a/objects/trees/mangrove/tree1.iob and b/objects/trees/mangrove/tree1.iob differ diff --git a/objects/trees/mangrove/tree10.iob b/objects/trees/mangrove/tree10.iob index 7a19f69a..19c708af 100644 Binary files a/objects/trees/mangrove/tree10.iob and b/objects/trees/mangrove/tree10.iob differ diff --git a/objects/trees/mangrove/tree11.iob b/objects/trees/mangrove/tree11.iob index d393bb8c..c4be1b3b 100644 Binary files a/objects/trees/mangrove/tree11.iob and b/objects/trees/mangrove/tree11.iob differ diff --git a/objects/trees/mangrove/tree12.iob b/objects/trees/mangrove/tree12.iob index 689cbe4d..71d00188 100644 Binary files a/objects/trees/mangrove/tree12.iob and b/objects/trees/mangrove/tree12.iob differ diff --git a/objects/trees/mangrove/tree13.iob b/objects/trees/mangrove/tree13.iob index d9b65802..777ce2ec 100644 Binary files a/objects/trees/mangrove/tree13.iob and b/objects/trees/mangrove/tree13.iob differ diff --git a/objects/trees/mangrove/tree14.iob b/objects/trees/mangrove/tree14.iob index 26a5c6c2..2878e439 100644 Binary files a/objects/trees/mangrove/tree14.iob and b/objects/trees/mangrove/tree14.iob differ diff --git a/objects/trees/mangrove/tree15.iob b/objects/trees/mangrove/tree15.iob index b78cb82d..bd031e39 100644 Binary files a/objects/trees/mangrove/tree15.iob and b/objects/trees/mangrove/tree15.iob differ diff --git a/objects/trees/mangrove/tree16.iob b/objects/trees/mangrove/tree16.iob index 1bea2ba3..abe4d61f 100644 Binary files a/objects/trees/mangrove/tree16.iob and b/objects/trees/mangrove/tree16.iob differ diff --git a/objects/trees/mangrove/tree17.iob b/objects/trees/mangrove/tree17.iob index 980173d6..4ccd0247 100644 Binary files a/objects/trees/mangrove/tree17.iob and b/objects/trees/mangrove/tree17.iob differ diff --git a/objects/trees/mangrove/tree18.iob b/objects/trees/mangrove/tree18.iob index 24e5dee7..e54c80f2 100644 Binary files a/objects/trees/mangrove/tree18.iob and b/objects/trees/mangrove/tree18.iob differ diff --git a/objects/trees/mangrove/tree19.iob b/objects/trees/mangrove/tree19.iob index 8f1761b3..4a597b34 100644 Binary files a/objects/trees/mangrove/tree19.iob and b/objects/trees/mangrove/tree19.iob differ diff --git a/objects/trees/mangrove/tree2.iob b/objects/trees/mangrove/tree2.iob index 34b6c96c..526569c3 100644 Binary files a/objects/trees/mangrove/tree2.iob and b/objects/trees/mangrove/tree2.iob differ diff --git a/objects/trees/mangrove/tree20.iob b/objects/trees/mangrove/tree20.iob index bb848033..dc6f8813 100644 Binary files a/objects/trees/mangrove/tree20.iob and b/objects/trees/mangrove/tree20.iob differ diff --git a/objects/trees/mangrove/tree21.iob b/objects/trees/mangrove/tree21.iob index 15c28fc7..b1356dd8 100644 Binary files a/objects/trees/mangrove/tree21.iob and b/objects/trees/mangrove/tree21.iob differ diff --git a/objects/trees/mangrove/tree3.iob b/objects/trees/mangrove/tree3.iob index ce435fa1..fbb18c17 100644 Binary files a/objects/trees/mangrove/tree3.iob and b/objects/trees/mangrove/tree3.iob differ diff --git a/objects/trees/mangrove/tree4.iob b/objects/trees/mangrove/tree4.iob index c17ff1d5..e747fe7c 100644 Binary files a/objects/trees/mangrove/tree4.iob and b/objects/trees/mangrove/tree4.iob differ diff --git a/objects/trees/mangrove/tree5.iob b/objects/trees/mangrove/tree5.iob index 3882609a..bbe7960a 100644 Binary files a/objects/trees/mangrove/tree5.iob and b/objects/trees/mangrove/tree5.iob differ diff --git a/objects/trees/mangrove/tree6.iob b/objects/trees/mangrove/tree6.iob index f50a2518..9daac740 100644 Binary files a/objects/trees/mangrove/tree6.iob and b/objects/trees/mangrove/tree6.iob differ diff --git a/objects/trees/mangrove/tree7.iob b/objects/trees/mangrove/tree7.iob index e00a891a..fdfa3893 100644 Binary files a/objects/trees/mangrove/tree7.iob and b/objects/trees/mangrove/tree7.iob differ diff --git a/objects/trees/mangrove/tree8.iob b/objects/trees/mangrove/tree8.iob index 03199f5a..e2d84944 100644 Binary files a/objects/trees/mangrove/tree8.iob and b/objects/trees/mangrove/tree8.iob differ diff --git a/objects/trees/mangrove/tree9.iob b/objects/trees/mangrove/tree9.iob index 4887d969..326eef52 100644 Binary files a/objects/trees/mangrove/tree9.iob and b/objects/trees/mangrove/tree9.iob differ