From 42bbd514dfe28527db563ab713040382919c74bf Mon Sep 17 00:00:00 2001 From: Julian Krings Date: Wed, 9 Apr 2025 21:50:17 +0200 Subject: [PATCH 01/11] fix villagers being unable to pickup items --- entities/standard/passive/villager.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/entities/standard/passive/villager.json b/entities/standard/passive/villager.json index 5a9e5dc3..f0392af4 100644 --- a/entities/standard/passive/villager.json +++ b/entities/standard/passive/villager.json @@ -1 +1,4 @@ -{"type": "VILLAGER"} \ No newline at end of file +{ + "type": "VILLAGER", + "pickupItems": true +} \ No newline at end of file From 7e6ab31a476267e0784f1cdd539ca45684154a24 Mon Sep 17 00:00:00 2001 From: Julian Krings Date: Thu, 26 Jun 2025 21:53:31 +0200 Subject: [PATCH 02/11] update enum values for 1.21.5 --- biomes/mountain/calcite-base.json | 2 +- biomes/swamp/handy-willow-forest.json | 4 ++-- biomes/swamp/willow-forest-extended.json | 4 ++-- biomes/swamp/willow-forest.json | 4 ++-- biomes/tropical/beach-charred.json | 2 +- entities/standard/hostile/pillager.json | 2 +- entities/standard/passive/snowman.json | 2 +- entities/unique/amenhotep.json | 4 ++-- entities/unique/brian.json | 4 ++-- entities/unique/lightning.json | 2 +- loot/ocean/clutter.json | 4 ++-- loot/structures/amenhotep.json | 8 ++++---- loot/structures/ruined-portal.json | 2 +- loot/structures/village/savanna.json | 2 +- regions/mushroom.json | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/biomes/mountain/calcite-base.json b/biomes/mountain/calcite-base.json index 2d96104e..d8acbadd 100644 --- a/biomes/mountain/calcite-base.json +++ b/biomes/mountain/calcite-base.json @@ -24,7 +24,7 @@ }}, { "breakSurface": true, - "cave": "cavesv4/crystalized/main", + "cave": "cavesv4/crystalized/tubes", "rarity": 90, "caveStartHeight": { "max": 200, diff --git a/biomes/swamp/handy-willow-forest.json b/biomes/swamp/handy-willow-forest.json index c47112c0..71251275 100644 --- a/biomes/swamp/handy-willow-forest.json +++ b/biomes/swamp/handy-willow-forest.json @@ -311,7 +311,7 @@ "effects": [ { "interval": 55656, - "sound": "AMBIENT_SOUL_SAND_VALLEY_MOOD", + "sound": "AMBIENT.SOUL_SAND_VALLEY.MOOD", "soundDistance": 3, "volume": 6.2, "minPitch": 1.6, @@ -320,7 +320,7 @@ }, { "interval": 56565, - "sound": "AMBIENT_SOUL_SAND_VALLEY_MOOD", + "sound": "AMBIENT.SOUL_SAND_VALLEY.MOOD", "soundDistance": 3, "volume": 6.2, "minPitch": 0.4, diff --git a/biomes/swamp/willow-forest-extended.json b/biomes/swamp/willow-forest-extended.json index 5f430bab..78eda905 100644 --- a/biomes/swamp/willow-forest-extended.json +++ b/biomes/swamp/willow-forest-extended.json @@ -281,7 +281,7 @@ "effects": [ { "interval": 55656, - "sound": "AMBIENT_SOUL_SAND_VALLEY_MOOD", + "sound": "AMBIENT.SOUL_SAND_VALLEY.MOOD", "soundDistance": 3, "volume": 6.2, "minPitch": 1.6, @@ -290,7 +290,7 @@ }, { "interval": 56565, - "sound": "AMBIENT_SOUL_SAND_VALLEY_MOOD", + "sound": "AMBIENT.SOUL_SAND_VALLEY.MOOD", "soundDistance": 3, "volume": 6.2, "minPitch": 0.4, diff --git a/biomes/swamp/willow-forest.json b/biomes/swamp/willow-forest.json index e0ba5565..90cbb6d6 100644 --- a/biomes/swamp/willow-forest.json +++ b/biomes/swamp/willow-forest.json @@ -288,7 +288,7 @@ "effects": [ { "interval": 55656, - "sound": "AMBIENT_SOUL_SAND_VALLEY_MOOD", + "sound": "AMBIENT.SOUL_SAND_VALLEY.MOOD", "soundDistance": 3, "volume": 6.2, "minPitch": 1.6, @@ -297,7 +297,7 @@ }, { "interval": 56565, - "sound": "AMBIENT_SOUL_SAND_VALLEY_MOOD", + "sound": "AMBIENT.SOUL_SAND_VALLEY.MOOD", "soundDistance": 3, "volume": 6.2, "minPitch": 0.4, diff --git a/biomes/tropical/beach-charred.json b/biomes/tropical/beach-charred.json index cf48132b..0dedc2b8 100644 --- a/biomes/tropical/beach-charred.json +++ b/biomes/tropical/beach-charred.json @@ -79,7 +79,7 @@ "particleAltY": -0.33885, "particleAltZ": 0.301, "chance": 1, - "particleEffect": "SMOKE_LARGE", + "particleEffect": "LARGE_SMOKE", "particleOffset": 0, "interval": 550, "particleCount": 0 diff --git a/entities/standard/hostile/pillager.json b/entities/standard/hostile/pillager.json index cb05d249..56a412fe 100644 --- a/entities/standard/hostile/pillager.json +++ b/entities/standard/hostile/pillager.json @@ -13,6 +13,6 @@ "maxPitch": 1.7, "minPitch": 1.5, "volume": 2, - "sound": "BLOCK_RESPAWN_ANCHOR_DEPLETE" + "sound": "BLOCK.RESPAWN_ANCHOR.DEPLETE" } } \ No newline at end of file diff --git a/entities/standard/passive/snowman.json b/entities/standard/passive/snowman.json index f1517a62..e6907b40 100644 --- a/entities/standard/passive/snowman.json +++ b/entities/standard/passive/snowman.json @@ -1 +1 @@ -{"type": "SNOWMAN"} \ No newline at end of file +{"type": "SNOW_GOLEM"} \ No newline at end of file diff --git a/entities/unique/amenhotep.json b/entities/unique/amenhotep.json index d7710c44..9f046e4d 100644 --- a/entities/unique/amenhotep.json +++ b/entities/unique/amenhotep.json @@ -6,8 +6,8 @@ "chance": 1, "maxPitch": 0.7, "minPitch": 0.2, - "sound": "ENTITY_SKELETON_HORSE_DEATH", - "particleEffect": "ENCHANTMENT_TABLE", + "sound": "ENTITY.SKELETON_HORSE.DEATH", + "particleEffect": "ENCHANT", "particleCount": 100 }, "attributes": [{ diff --git a/entities/unique/brian.json b/entities/unique/brian.json index ca2311f2..98aa9ac1 100644 --- a/entities/unique/brian.json +++ b/entities/unique/brian.json @@ -1,11 +1,11 @@ { "type": "EVOKER", "spawnEffect": { - "particleEffect": "SPELL_MOB_AMBIENT", + "particleEffect": "ENTITY_EFFECT", "particleCount": 9, "chance": 1, "interval": 1, - "sound": "ENTITY_EVOKER_PREPARE_WOLOLO", + "sound": "ENTITY.EVOKER.PREPARE_WOLOLO", "volume": 10 }, "attributes": [ diff --git a/entities/unique/lightning.json b/entities/unique/lightning.json index 7cca5079..838e0071 100644 --- a/entities/unique/lightning.json +++ b/entities/unique/lightning.json @@ -1,3 +1,3 @@ { - "type": "LIGHTNING" + "type": "LIGHTNING_BOLT" } \ No newline at end of file diff --git a/loot/ocean/clutter.json b/loot/ocean/clutter.json index e79bc572..41a2afb6 100644 --- a/loot/ocean/clutter.json +++ b/loot/ocean/clutter.json @@ -74,7 +74,7 @@ "minAmount": 3 }, { - "attribute": "GENERIC_ARMOR", + "attribute": "ARMOR", "name": "AMR", "maxAmount": 7, "minAmount": 5, @@ -93,7 +93,7 @@ "HIDE_PLACED_ON", "HIDE_DESTROYS", "HIDE_ENCHANTS", - "HIDE_POTION_EFFECTS", + "HIDE_ADDITIONAL_TOOLTIP", "HIDE_ATTRIBUTES" ], "maxDurability": 0.95, diff --git a/loot/structures/amenhotep.json b/loot/structures/amenhotep.json index 7f3ff263..c15a2dce 100644 --- a/loot/structures/amenhotep.json +++ b/loot/structures/amenhotep.json @@ -11,7 +11,7 @@ "maxLevel": 1 }], "attributes": [{ - "attribute": "GENERIC_MOVEMENT_SPEED", + "attribute": "MOVEMENT_SPEED", "maxAmount": 5, "minAmount": 3, "name": "AmenhotepSpeed", @@ -27,7 +27,7 @@ "maxLevel": 1 }], "attributes": [{ - "attribute": "GENERIC_KNOCKBACK_RESISTANCE", + "attribute": "KNOCKBACK_RESISTANCE", "maxAmount": 5, "minAmount": 3, "name": "AmenhotepLeggs", @@ -43,7 +43,7 @@ "maxLevel": 1 }], "attributes": [{ - "attribute": "GENERIC_MAX_HEALTH", + "attribute": "MAX_HEALTH", "maxAmount": 5, "minAmount": 3, "name": "AmenhotepHeart", @@ -59,7 +59,7 @@ "maxLevel": 1 }], "attributes": [{ - "attribute": "GENERIC_LUCK", + "attribute": "LUCK", "maxAmount": 5, "minAmount": 3, "name": "AmenhotepLuck", diff --git a/loot/structures/ruined-portal.json b/loot/structures/ruined-portal.json index a33827c3..f764eda0 100644 --- a/loot/structures/ruined-portal.json +++ b/loot/structures/ruined-portal.json @@ -291,7 +291,7 @@ "minLevel": 1 }, { - "enchantment": "sweeping", + "enchantment": "sweeping_edge", "chance": 0.1, "maxLevel": 3, "minLevel": 1 diff --git a/loot/structures/village/savanna.json b/loot/structures/village/savanna.json index 204808e9..8307e49a 100644 --- a/loot/structures/village/savanna.json +++ b/loot/structures/village/savanna.json @@ -24,7 +24,7 @@ "slottypes": "STORAGE" }, { - "type": "grass", + "type": "short_grass", "maxamount": 1, "rarity": 2, "slottypes": "STORAGE" diff --git a/regions/mushroom.json b/regions/mushroom.json index db28e312..df790af3 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -119,7 +119,7 @@ "minPitch": 0.2, "chance": 8, "maxPitch": 0.3, - "sound": "AMBIENT_WARPED_FOREST_ADDITIONS", + "sound": "AMBIENT.WARPED_FOREST.ADDITIONS", "interval": 60000, "soundDistance": 3 } From 15116b76af2c395a744a8978f22f92a8fd9c61e3 Mon Sep 17 00:00:00 2001 From: RePixelatedMC <107539181+RePixelatedMC@users.noreply.github.com> Date: Tue, 1 Jul 2025 18:01:25 +0200 Subject: [PATCH 03/11] leaf litter! --- .idea/misc.xml | 5 + .idea/vcs.xml | 6 + .idea/workspace.xml | 88 ++++++++++++ biomes/dev.json | 25 ++++ biomes/mountain/forest.json | 3 +- biomes/mountain/mountain.json | 3 +- biomes/mountain/mplain-extended.json | 3 +- biomes/temperate/calmplains.json | 3 +- biomes/temperate/combo-forest-extended.json | 3 +- biomes/temperate/combo-forest.json | 3 +- biomes/temperate/croak.json | 3 +- biomes/temperate/flower-forest.json | 3 +- .../temperate/longtree-forest-extended.json | 3 +- biomes/temperate/longtree-forest.json | 3 +- biomes/temperate/meadows.json | 3 +- biomes/temperate/oak-denmyre.json | 3 +- biomes/temperate/oak-forest-extended.json | 3 +- biomes/temperate/oak-forest-flat.json | 3 +- biomes/temperate/oak-forest.json | 3 +- biomes/temperate/osaka-red-forest.json | 6 +- biomes/temperate/osaka-violet-forest.json | 3 +- biomes/temperate/plains.json | 23 +--- biomes/tundra/autumn-extended.json | 3 +- biomes/tundra/autumn.json | 3 +- biomes/tundra/forest.json | 3 +- biomes/tundra/redwood-extended-cliffs.json | 3 +- biomes/tundra/redwood-forest.json | 3 +- dimensions/overworld.json | 1 + snippet/decorator/bush.json | 11 ++ snippet/decorator/leaf.json | 126 ++++++++++++++++++ snippet/decorator/windflower.json | 11 ++ 31 files changed, 322 insertions(+), 43 deletions(-) create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml create mode 100644 biomes/dev.json create mode 100644 snippet/decorator/bush.json create mode 100644 snippet/decorator/leaf.json create mode 100644 snippet/decorator/windflower.json diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..86f49135 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 00000000..c83fc086 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + { + "lastFilter": { + "state": "OPEN", + "assignee": "RePixelatedMC" + } +} + { + "selectedUrlAndAccountId": { + "url": "https://github.com/IrisDimensions/overworld.git", + "accountId": "a0bb647b-b73e-4c51-add7-e7243364570b" + } +} + { + "associatedIndex": 3 +} + + + + + + + + + + + + + + 1751004933703 + + + + + + \ No newline at end of file diff --git a/biomes/dev.json b/biomes/dev.json new file mode 100644 index 00000000..57516f2b --- /dev/null +++ b/biomes/dev.json @@ -0,0 +1,25 @@ +{ + "name": "test-dev", + + "layers": [ + { + "palette": [ + { + "block": "minecraft:grass_block" + } + ] + + } + ], + "decorators": [ + "snippet/decorator/leaf" + ], + + "generators": [ + { + "generator": "flat", + "max": 1, + "min": 1 + } + ] +} \ No newline at end of file diff --git a/biomes/mountain/forest.json b/biomes/mountain/forest.json index 0e008014..9eadb1ce 100644 --- a/biomes/mountain/forest.json +++ b/biomes/mountain/forest.json @@ -206,6 +206,7 @@ "data": {"age": 0} } ] - } + }, + "snippet/decorator/leaf" ] } diff --git a/biomes/mountain/mountain.json b/biomes/mountain/mountain.json index f3d530a5..ef48ef18 100644 --- a/biomes/mountain/mountain.json +++ b/biomes/mountain/mountain.json @@ -100,7 +100,8 @@ { "chance": 0.5, "palette": [{"block": "minecraft:short_grass"}] - } + }, + "snippet/decorator/leaf" ], "slab": { "style": {"style": "STATIC"}, diff --git a/biomes/mountain/mplain-extended.json b/biomes/mountain/mplain-extended.json index 9a4d1149..32b025cd 100644 --- a/biomes/mountain/mplain-extended.json +++ b/biomes/mountain/mplain-extended.json @@ -173,6 +173,7 @@ { "chance": 0.5, "palette": [{"block": "minecraft:short_grass"}] - } + }, + "snippet/decorator/leaf" ] } diff --git a/biomes/temperate/calmplains.json b/biomes/temperate/calmplains.json index 108ed135..8cec0bc0 100644 --- a/biomes/temperate/calmplains.json +++ b/biomes/temperate/calmplains.json @@ -207,7 +207,8 @@ } ], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/leaf" ], "generators": [{ "generator": "mountain", diff --git a/biomes/temperate/combo-forest-extended.json b/biomes/temperate/combo-forest-extended.json index 581b7df6..98c27f38 100644 --- a/biomes/temperate/combo-forest-extended.json +++ b/biomes/temperate/combo-forest-extended.json @@ -293,6 +293,7 @@ "variance": {"style": "STATIC"}, "zoom": 0.2, "palette": [{"block": "minecraft:cobblestone_slab"}] - } + }, + "snippet/decorator/leaf" ] } diff --git a/biomes/temperate/combo-forest.json b/biomes/temperate/combo-forest.json index 51ebb466..1adee98e 100644 --- a/biomes/temperate/combo-forest.json +++ b/biomes/temperate/combo-forest.json @@ -306,6 +306,7 @@ "variance": {"style": "STATIC"}, "zoom": 0.2, "palette": [{"block": "minecraft:cobblestone_slab"}] - } + }, + "snippet/decorator/leaf" ] } diff --git a/biomes/temperate/croak.json b/biomes/temperate/croak.json index 66bb1161..b3b4282f 100644 --- a/biomes/temperate/croak.json +++ b/biomes/temperate/croak.json @@ -166,7 +166,8 @@ }, "chance": 0.2 - } + }, + "snippet/decorator/leaf" ], "objects": [ { diff --git a/biomes/temperate/flower-forest.json b/biomes/temperate/flower-forest.json index 09f3c279..0b2dfa27 100644 --- a/biomes/temperate/flower-forest.json +++ b/biomes/temperate/flower-forest.json @@ -483,6 +483,7 @@ "variance": {"style": "STATIC"}, "zoom": 0.2, "palette": [{"block": "minecraft:cobblestone_slab"}] - } + }, + "snippet/decorator/leaf" ] } diff --git a/biomes/temperate/longtree-forest-extended.json b/biomes/temperate/longtree-forest-extended.json index a76b33d3..3b4fc270 100644 --- a/biomes/temperate/longtree-forest-extended.json +++ b/biomes/temperate/longtree-forest-extended.json @@ -376,7 +376,8 @@ {"block": "minecraft:dandelion"}, {"block": "minecraft:oxeye_daisy"} ] - } + }, + "snippet/decorator/leaf" ], "effects": [{ "particleAltX": 0.301, diff --git a/biomes/temperate/longtree-forest.json b/biomes/temperate/longtree-forest.json index c4ff477c..53271936 100644 --- a/biomes/temperate/longtree-forest.json +++ b/biomes/temperate/longtree-forest.json @@ -377,7 +377,8 @@ {"block": "minecraft:dandelion"}, {"block": "minecraft:oxeye_daisy"} ] - } + }, + "snippet/decorator/leaf" ], "effects": [{ "particleAltX": 0.301, diff --git a/biomes/temperate/meadows.json b/biomes/temperate/meadows.json index b11c3911..96bbc5bb 100644 --- a/biomes/temperate/meadows.json +++ b/biomes/temperate/meadows.json @@ -194,6 +194,7 @@ { "chance": 0.1, "palette": [{"block": "minecraft:short_grass"}] - } + }, + "snippet/decorator/leaf" ] } diff --git a/biomes/temperate/oak-denmyre.json b/biomes/temperate/oak-denmyre.json index 8b797523..d3ff6eb3 100644 --- a/biomes/temperate/oak-denmyre.json +++ b/biomes/temperate/oak-denmyre.json @@ -221,6 +221,7 @@ "variance": {"style": "STATIC"}, "zoom": 0.2, "palette": [{"block": "minecraft:cobblestone_slab"}] - } + }, + "snippet/decorator/leaf" ] } diff --git a/biomes/temperate/oak-forest-extended.json b/biomes/temperate/oak-forest-extended.json index 54a8130d..59370f53 100644 --- a/biomes/temperate/oak-forest-extended.json +++ b/biomes/temperate/oak-forest-extended.json @@ -225,6 +225,7 @@ { "chance": 0.05, "palette": [{"block": "minecraft:cobblestone_slab"}] - } + }, + "snippet/decorator/leaf" ] } diff --git a/biomes/temperate/oak-forest-flat.json b/biomes/temperate/oak-forest-flat.json index 1fedd11f..857432e8 100644 --- a/biomes/temperate/oak-forest-flat.json +++ b/biomes/temperate/oak-forest-flat.json @@ -243,6 +243,7 @@ { "chance": 0.05, "palette": [{"block": "minecraft:cobblestone_slab"}] - } + }, + "snippet/decorator/leaf" ] } diff --git a/biomes/temperate/oak-forest.json b/biomes/temperate/oak-forest.json index 3156c7ce..1862ce7b 100644 --- a/biomes/temperate/oak-forest.json +++ b/biomes/temperate/oak-forest.json @@ -227,6 +227,7 @@ { "chance": 0.05, "palette": [{"block": "minecraft:cobblestone_slab"}] - } + }, + "snippet/decorator/leaf" ] } diff --git a/biomes/temperate/osaka-red-forest.json b/biomes/temperate/osaka-red-forest.json index e188819c..2f69142c 100644 --- a/biomes/temperate/osaka-red-forest.json +++ b/biomes/temperate/osaka-red-forest.json @@ -257,7 +257,8 @@ "variance": {"style": "STATIC"}, "zoom": 0.2, "palette": [{"block": "minecraft:blackstone_slab"}] - } + }, + "snippet/decorator/leaf" ], "effects": [{ "particleAltX": 0.301, @@ -268,5 +269,6 @@ "particleOffset": 12, "interval": 550, "particleCount": 0 - }] + } + ] } diff --git a/biomes/temperate/osaka-violet-forest.json b/biomes/temperate/osaka-violet-forest.json index ef7ec250..1cb5c58e 100644 --- a/biomes/temperate/osaka-violet-forest.json +++ b/biomes/temperate/osaka-violet-forest.json @@ -279,6 +279,7 @@ "variance": {"style": "STATIC"}, "zoom": 0.2, "palette": [{"block": "minecraft:cobblestone_slab"}] - } + }, + "snippet/decorator/leaf" ] } diff --git a/biomes/temperate/plains.json b/biomes/temperate/plains.json index 9e0365ec..cab99b85 100644 --- a/biomes/temperate/plains.json +++ b/biomes/temperate/plains.json @@ -287,24 +287,7 @@ { "chance": 0.5, "palette": [{"block": "minecraft:short_grass"}] - } - ], - "features": [{ - "rarity": 252, - "zone": { - "convergeToHeight": 64, - "interpolationRadius": 3, - "interpolator": "BILINEAR_STARCAST_6", - "blockRadius": 14, - "objectChance": 1, - "strength": 1, - "biomeStrengthThreshold": 0.18, - "customBiome": "temperate/flower-forest", - "fractureRadius": { - "style": "NOWHERE", - "zoom": 0.12, - "multiplier": 52 - } - } - }] + }, + "snippet/decorator/leaf" + ] } \ No newline at end of file diff --git a/biomes/tundra/autumn-extended.json b/biomes/tundra/autumn-extended.json index dae32dca..df4e6baf 100644 --- a/biomes/tundra/autumn-extended.json +++ b/biomes/tundra/autumn-extended.json @@ -480,6 +480,7 @@ { "chance": 0.05, "palette": [{"block": "minecraft:cobblestone_slab"}] - } + }, + "snippet/decorator/leaf" ] } diff --git a/biomes/tundra/autumn.json b/biomes/tundra/autumn.json index f2c3a549..e7ff2196 100644 --- a/biomes/tundra/autumn.json +++ b/biomes/tundra/autumn.json @@ -483,7 +483,8 @@ { "chance": 0.05, "palette": [{"block": "minecraft:cobblestone_slab"}] - } + }, + "snippet/decorator/leaf" ], "childShrinkFactor": 2.4 } diff --git a/biomes/tundra/forest.json b/biomes/tundra/forest.json index 885453ba..12b20f63 100644 --- a/biomes/tundra/forest.json +++ b/biomes/tundra/forest.json @@ -213,7 +213,8 @@ "zoom": 0.3, "palette": [{"block": "minecraft:short_grass"}], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/leaf" ], "childShrinkFactor": 2.4 } diff --git a/biomes/tundra/redwood-extended-cliffs.json b/biomes/tundra/redwood-extended-cliffs.json index 7f828e24..e8155d68 100644 --- a/biomes/tundra/redwood-extended-cliffs.json +++ b/biomes/tundra/redwood-extended-cliffs.json @@ -408,6 +408,7 @@ { "chance": 0.05, "palette": [{"block": "minecraft:cobblestone_slab"}] - } + }, + "snippet/decorator/leaf" ] } diff --git a/biomes/tundra/redwood-forest.json b/biomes/tundra/redwood-forest.json index 2cc56e82..94a7e60b 100644 --- a/biomes/tundra/redwood-forest.json +++ b/biomes/tundra/redwood-forest.json @@ -370,7 +370,8 @@ { "chance": 0.05, "palette": [{"block": "minecraft:cobblestone_slab"}] - } + }, + "snippet/decorator/leaf" ], "childShrinkFactor": 2.4 } diff --git a/dimensions/overworld.json b/dimensions/overworld.json index 6b9139b5..8ab8dca6 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -6,6 +6,7 @@ "fluidHeight": 75, "jigsawStructureDivisor": 20, "continentZoom": 1, + "focusRegion": "tundra", "continentalStyle": { "style": "NOWHERE_CELLULAR", "fracture": { diff --git a/snippet/decorator/bush.json b/snippet/decorator/bush.json new file mode 100644 index 00000000..e70fac29 --- /dev/null +++ b/snippet/decorator/bush.json @@ -0,0 +1,11 @@ +{ + "chance": 0.1, + "style":{ + "style": "STATIC" + }, + "palette": [ + { + "block": "minecraft:bush" + } + ] +} \ No newline at end of file diff --git a/snippet/decorator/leaf.json b/snippet/decorator/leaf.json new file mode 100644 index 00000000..63e47b85 --- /dev/null +++ b/snippet/decorator/leaf.json @@ -0,0 +1,126 @@ +{ + "style": { + "style": "VASCULAR", + "zoom": 0.3, + "fracture": { + "axialFracturing": true, + "style": "STATIC", + "multiplier": 16 + } + }, + "chance": 0.1, + "palette": [ + { + "block": "minecraft:leaf_litter", + "data": { + "segment_amount": 1, + "facing": "north" + } + }, + { + "block": "minecraft:leaf_litter", + "data": { + "segment_amount": 1, + "facing": "south" + } + }, + { + "block": "minecraft:leaf_litter", + "data": { + "segment_amount": 1, + "facing": "east" + } + }, + { + "block": "minecraft:leaf_litter", + "data": { + "segment_amount": 1, + "facing": "west" + } + }, + { + "block": "minecraft:leaf_litter", + "data": { + "segment_amount": 2, + "facing": "north" + } + }, + { + "block": "minecraft:leaf_litter", + "data": { + "segment_amount": 2, + "facing": "south" + } + }, + { + "block": "minecraft:leaf_litter", + "data": { + "segment_amount": 2, + "facing": "east" + } + }, + { + "block": "minecraft:leaf_litter", + "data": { + "segment_amount": 2, + "facing": "west" + } + }, + { + "block": "minecraft:leaf_litter", + "data": { + "segment_amount": 3, + "facing": "north" + } + }, + { + "block": "minecraft:leaf_litter", + "data": { + "segment_amount": 3, + "facing": "south" + } + }, + { + "block": "minecraft:leaf_litter", + "data": { + "segment_amount": 3, + "facing": "east" + } + }, + { + "block": "minecraft:leaf_litter", + "data": { + "segment_amount": 3, + "facing": "west" + } + }, + { + "block": "minecraft:leaf_litter", + "data": { + "segment_amount": 4, + "facing": "north" + } + }, + { + "block": "minecraft:leaf_litter", + "data": { + "segment_amount": 4, + "facing": "south" + } + }, + { + "block": "minecraft:leaf_litter", + "data": { + "segment_amount": 4, + "facing": "east" + } + }, + { + "block": "minecraft:leaf_litter", + "data": { + "segment_amount": 4, + "facing": "west" + } + } + ] +} \ No newline at end of file diff --git a/snippet/decorator/windflower.json b/snippet/decorator/windflower.json new file mode 100644 index 00000000..b1d1c6a2 --- /dev/null +++ b/snippet/decorator/windflower.json @@ -0,0 +1,11 @@ +{ + "chance": 0.1, + "style":{ + "style": "STATIC" + }, + "palette": [ + { + "block": "minecraft:wildflowers" + } + ] +} \ No newline at end of file From d84d9ec36bd53e25990a66915ee30124b3f66f92 Mon Sep 17 00:00:00 2001 From: RePixelatedMC <107539181+RePixelatedMC@users.noreply.github.com> Date: Fri, 4 Jul 2025 12:20:31 +0200 Subject: [PATCH 04/11] Wildflowers! --- biomes/temperate/birch-denmyre.json | 3 +- biomes/temperate/birch-forest-extended.json | 3 +- biomes/temperate/birch-forest.json | 3 +- biomes/temperate/birch-tall.json | 3 +- biomes/temperate/birch-thin.json | 3 +- biomes/temperate/combo-forest-extended.json | 3 +- biomes/temperate/combo-forest.json | 3 +- biomes/temperate/flower-forest-extended.json | 3 +- biomes/temperate/flower-forest.json | 3 +- biomes/temperate/lush-plains-yellow.json | 3 +- biomes/temperate/lush-plains.json | 3 +- biomes/temperate/meadows.json | 3 +- dimensions/overworld.json | 3 +- snippet/decorator/wildflowers.json | 120 +++++++++++++++++++ snippet/decorator/windflower.json | 11 -- 15 files changed, 146 insertions(+), 24 deletions(-) create mode 100644 snippet/decorator/wildflowers.json delete mode 100644 snippet/decorator/windflower.json diff --git a/biomes/temperate/birch-denmyre.json b/biomes/temperate/birch-denmyre.json index 98400563..b79d84e9 100644 --- a/biomes/temperate/birch-denmyre.json +++ b/biomes/temperate/birch-denmyre.json @@ -207,6 +207,7 @@ "variance": {"style": "STATIC"}, "palette": [{"block": "minecraft:tall_grass"}], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/wildflowers" ] } diff --git a/biomes/temperate/birch-forest-extended.json b/biomes/temperate/birch-forest-extended.json index fdb26d79..a8c4025d 100644 --- a/biomes/temperate/birch-forest-extended.json +++ b/biomes/temperate/birch-forest-extended.json @@ -216,7 +216,8 @@ "zoom": 0.3, "palette": [{"block": "minecraft:tall_grass"}], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/wildflowers" ], "childStyle": { "style": "NOWHERE_SIMPLEX", diff --git a/biomes/temperate/birch-forest.json b/biomes/temperate/birch-forest.json index 064fc41c..e515e90f 100644 --- a/biomes/temperate/birch-forest.json +++ b/biomes/temperate/birch-forest.json @@ -229,7 +229,8 @@ "zoom": 0.3, "palette": [{"block": "minecraft:tall_grass"}], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/wildflowers" ], "childStyle": { "style": "NOWHERE_SIMPLEX", diff --git a/biomes/temperate/birch-tall.json b/biomes/temperate/birch-tall.json index d54b0433..7de9b829 100644 --- a/biomes/temperate/birch-tall.json +++ b/biomes/temperate/birch-tall.json @@ -235,7 +235,8 @@ { "chance": 0.025, "palette": [{"block": "minecraft:birch_leaves"}] - } + }, + "snippet/decorator/wildflowers" ], "childStyle": { "style": "NOWHERE_SIMPLEX", diff --git a/biomes/temperate/birch-thin.json b/biomes/temperate/birch-thin.json index 65b09bb7..a653c387 100644 --- a/biomes/temperate/birch-thin.json +++ b/biomes/temperate/birch-thin.json @@ -197,6 +197,7 @@ "zoom": 0.3, "palette": [{"block": "minecraft:tall_grass"}], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/wildflowers" ] } diff --git a/biomes/temperate/combo-forest-extended.json b/biomes/temperate/combo-forest-extended.json index 98c27f38..45b8d17a 100644 --- a/biomes/temperate/combo-forest-extended.json +++ b/biomes/temperate/combo-forest-extended.json @@ -294,6 +294,7 @@ "zoom": 0.2, "palette": [{"block": "minecraft:cobblestone_slab"}] }, - "snippet/decorator/leaf" + "snippet/decorator/leaf", + "snippet/decorator/wildflowers" ] } diff --git a/biomes/temperate/combo-forest.json b/biomes/temperate/combo-forest.json index 1adee98e..ddcf2750 100644 --- a/biomes/temperate/combo-forest.json +++ b/biomes/temperate/combo-forest.json @@ -307,6 +307,7 @@ "zoom": 0.2, "palette": [{"block": "minecraft:cobblestone_slab"}] }, - "snippet/decorator/leaf" + "snippet/decorator/leaf", + "snippet/decorator/wildflowers" ] } diff --git a/biomes/temperate/flower-forest-extended.json b/biomes/temperate/flower-forest-extended.json index 1fb98fe0..de6b9be2 100644 --- a/biomes/temperate/flower-forest-extended.json +++ b/biomes/temperate/flower-forest-extended.json @@ -472,6 +472,7 @@ "variance": {"style": "STATIC"}, "zoom": 0.2, "palette": [{"block": "minecraft:cobblestone_slab"}] - } + }, + "snippet/decorator/wildflowers" ] } diff --git a/biomes/temperate/flower-forest.json b/biomes/temperate/flower-forest.json index 0b2dfa27..0f34a4fd 100644 --- a/biomes/temperate/flower-forest.json +++ b/biomes/temperate/flower-forest.json @@ -484,6 +484,7 @@ "zoom": 0.2, "palette": [{"block": "minecraft:cobblestone_slab"}] }, - "snippet/decorator/leaf" + "snippet/decorator/leaf", + "snippet/decorator/wildflowers" ] } diff --git a/biomes/temperate/lush-plains-yellow.json b/biomes/temperate/lush-plains-yellow.json index 5d086674..ec2121d7 100644 --- a/biomes/temperate/lush-plains-yellow.json +++ b/biomes/temperate/lush-plains-yellow.json @@ -208,6 +208,7 @@ "block": "minecraft:oak_leaves", "data": {"persistent": true} }] - } + }, + "snippet/decorator/wildflowers" ] } diff --git a/biomes/temperate/lush-plains.json b/biomes/temperate/lush-plains.json index b799f8f3..4f2c59c6 100644 --- a/biomes/temperate/lush-plains.json +++ b/biomes/temperate/lush-plains.json @@ -216,7 +216,8 @@ "style": "STATIC", "zoom": 0.8 } - } + }, + "snippet/decorator/wildflowers" ], "childStyle": { "style": "CELLULAR_IRIS_THICK", diff --git a/biomes/temperate/meadows.json b/biomes/temperate/meadows.json index 96bbc5bb..0a24a15f 100644 --- a/biomes/temperate/meadows.json +++ b/biomes/temperate/meadows.json @@ -195,6 +195,7 @@ "chance": 0.1, "palette": [{"block": "minecraft:short_grass"}] }, - "snippet/decorator/leaf" + "snippet/decorator/leaf", + "snippet/decorator/wildflowers" ] } diff --git a/dimensions/overworld.json b/dimensions/overworld.json index 8ab8dca6..4579aaf6 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -2,11 +2,12 @@ "version": 31020, "name": "Overworld", "environment": "NORMAL", + "focus": "temperate/lush-plains-red", "dimensionAngleDeg": 69, "fluidHeight": 75, "jigsawStructureDivisor": 20, "continentZoom": 1, - "focusRegion": "tundra", + "focusRegion": "temperate", "continentalStyle": { "style": "NOWHERE_CELLULAR", "fracture": { diff --git a/snippet/decorator/wildflowers.json b/snippet/decorator/wildflowers.json new file mode 100644 index 00000000..7d61ba76 --- /dev/null +++ b/snippet/decorator/wildflowers.json @@ -0,0 +1,120 @@ +{ + "chance": 0.025, + "style":{ + "style": "STATIC" + }, + "palette": [ + { + "block": "minecraft:wildflowers", + "data": { + "flower_amount": 1, + "facing": "north" + } + }, + { + "block": "minecraft:wildflowers", + "data": { + "flower_amount": 1, + "facing": "south" + } + }, + { + "block": "minecraft:wildflowers", + "data": { + "flower_amount": 1, + "facing": "east" + } + }, + { + "block": "minecraft:wildflowers", + "data": { + "flower_amount": 1, + "facing": "west" + } + }, + { + "block": "minecraft:wildflowers", + "data": { + "flower_amount": 2, + "facing": "north" + } + }, + { + "block": "minecraft:wildflowers", + "data": { + "flower_amount": 2, + "facing": "south" + } + }, + { + "block": "minecraft:wildflowers", + "data": { + "flower_amount": 2, + "facing": "east" + } + }, + { + "block": "minecraft:wildflowers", + "data": { + "flower_amount": 2, + "facing": "west" + } + }, + { + "block": "minecraft:wildflowers", + "data": { + "flower_amount": 3, + "facing": "north" + } + }, + { + "block": "minecraft:wildflowers", + "data": { + "flower_amount": 3, + "facing": "south" + } + }, + { + "block": "minecraft:wildflowers", + "data": { + "flower_amount": 3, + "facing": "east" + } + }, + { + "block": "minecraft:wildflowers", + "data": { + "flower_amount": 3, + "facing": "west" + } + }, + { + "block": "minecraft:wildflowers", + "data": { + "flower_amount": 4, + "facing": "north" + } + }, + { + "block": "minecraft:wildflowers", + "data": { + "flower_amount": 4, + "facing": "south" + } + }, + { + "block": "minecraft:wildflowers", + "data": { + "flower_amount": 4, + "facing": "east" + } + }, + { + "block": "minecraft:wildflowers", + "data": { + "flower_amount": 4, + "facing": "west" + } + } + ] +} \ No newline at end of file diff --git a/snippet/decorator/windflower.json b/snippet/decorator/windflower.json deleted file mode 100644 index b1d1c6a2..00000000 --- a/snippet/decorator/windflower.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "chance": 0.1, - "style":{ - "style": "STATIC" - }, - "palette": [ - { - "block": "minecraft:wildflowers" - } - ] -} \ No newline at end of file From a9d25b5a9a9f27e248bfe9f47822a33b0a41b2f5 Mon Sep 17 00:00:00 2001 From: RePixelatedMC <107539181+RePixelatedMC@users.noreply.github.com> Date: Fri, 4 Jul 2025 13:07:57 +0200 Subject: [PATCH 05/11] Proper Bedrock layer + deepslate layer --- dimensions/overworld.json | 82 ++++++++++++++++++++++++++++++------ snippet/style/bedrock.json | 3 ++ snippet/style/deepslate.json | 3 ++ 3 files changed, 74 insertions(+), 14 deletions(-) create mode 100644 snippet/style/bedrock.json create mode 100644 snippet/style/deepslate.json diff --git a/dimensions/overworld.json b/dimensions/overworld.json index 4579aaf6..2b676d26 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -91,6 +91,74 @@ } } }, + "ores": [ + { + "threshold": 1, + "range": {"min": 0, "max": 0}, + "palette": {"palette": [{"block": "minecraft:bedrock"}]}, + "chanceStyle": {"style": "FLAT"} + }, + { + "threshold": 0.625, + "range": {"min": 1, "max": 1}, + "palette": {"palette": [{"block": "minecraft:bedrock"}]}, + "chanceStyle": "snippet/style/bedrock" + }, + { + "threshold": 0.35, + "range": {"min": 2, "max": 4}, + "palette": {"palette": [{"block": "minecraft:bedrock"}]}, + "chanceStyle": "snippet/style/bedrock" + }, + { + "threshold": 1, + "range": {"min": 1, "max": 57}, + "palette": {"palette": [{"block": "minecraft:deepslate"}]}, + "chanceStyle": {"style": "FLAT"} + }, + { + "threshold": 0.874, + "range": {"min": 58, "max": 58}, + "palette": {"palette": [{"block": "minecraft:deepslate"}]}, + "chanceStyle": "snippet/style/deepslate" + }, + { + "threshold": 0.75, + "range": {"min": 59, "max": 59}, + "palette": {"palette": [{"block": "minecraft:deepslate"}]}, + "chanceStyle": "snippet/style/deepslate" + }, + { + "threshold": 0.625, + "range": {"min": 60, "max": 60}, + "palette": {"palette": [{"block": "minecraft:deepslate"}]}, + "chanceStyle": "snippet/style/deepslate" + }, + { + "threshold": 0.5, + "range": {"min": 61, "max": 61}, + "palette": {"palette": [{"block": "minecraft:deepslate"}]}, + "chanceStyle": "snippet/style/deepslate" + }, + { + "threshold": 0.375, + "range": {"min": 62, "max": 62}, + "palette": {"palette": [{"block": "minecraft:deepslate"}]}, + "chanceStyle": "snippet/style/deepslate" + }, + { + "threshold": 0.25, + "range": {"min": 63, "max": 63}, + "palette": {"palette": [{"block": "minecraft:deepslate"}]}, + "chanceStyle": "snippet/style/deepslate" + }, + { + "threshold": 0.125, + "range": {"min": 64, "max": 64}, + "palette": {"palette": [{"block": "minecraft:deepslate"}]}, + "chanceStyle": "snippet/style/deepslate" + } + ], "carving": { "caves": [ { @@ -287,20 +355,6 @@ ], "varience": 2 }, - { - "minHeight": 1, - "maxPerChunk": 128, - "maxHeight": 64, - "minPerChunk": 128, - "minSize": 8, - "maxSize": 4, - "palette": [ - { - "block": "minecraft:deepslate" - } - ], - "varience": 4 - }, { "minHeight": 5, "maxPerChunk": 9, diff --git a/snippet/style/bedrock.json b/snippet/style/bedrock.json new file mode 100644 index 00000000..b883eb62 --- /dev/null +++ b/snippet/style/bedrock.json @@ -0,0 +1,3 @@ +{ + "style": "STATIC" +} \ No newline at end of file diff --git a/snippet/style/deepslate.json b/snippet/style/deepslate.json new file mode 100644 index 00000000..b883eb62 --- /dev/null +++ b/snippet/style/deepslate.json @@ -0,0 +1,3 @@ +{ + "style": "STATIC" +} \ No newline at end of file From 4358a5916b841db061366ee95a5854548576bc4a Mon Sep 17 00:00:00 2001 From: RePixelatedMC <107539181+RePixelatedMC@users.noreply.github.com> Date: Fri, 4 Jul 2025 13:27:01 +0200 Subject: [PATCH 06/11] fireflies --- biomes/swamp/shore/beach.json | 3 ++- dimensions/overworld.json | 3 +-- snippet/decorator/firefly-bush.json | 11 +++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 snippet/decorator/firefly-bush.json diff --git a/biomes/swamp/shore/beach.json b/biomes/swamp/shore/beach.json index 3f5eb12b..f6b6c630 100644 --- a/biomes/swamp/shore/beach.json +++ b/biomes/swamp/shore/beach.json @@ -104,6 +104,7 @@ "palette": [{"block": "minecraft:sugar_cane"}], "style": {"style": "STATIC"}, "heightVariance": {"style": "STATIC"} - } + }, + "snippet/decorator/firefly-bush" ] } diff --git a/dimensions/overworld.json b/dimensions/overworld.json index 2b676d26..7342e143 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -2,12 +2,11 @@ "version": 31020, "name": "Overworld", "environment": "NORMAL", - "focus": "temperate/lush-plains-red", "dimensionAngleDeg": 69, "fluidHeight": 75, "jigsawStructureDivisor": 20, "continentZoom": 1, - "focusRegion": "temperate", + "focusRegion": "swamp", "continentalStyle": { "style": "NOWHERE_CELLULAR", "fracture": { diff --git a/snippet/decorator/firefly-bush.json b/snippet/decorator/firefly-bush.json new file mode 100644 index 00000000..83986161 --- /dev/null +++ b/snippet/decorator/firefly-bush.json @@ -0,0 +1,11 @@ +{ + "style": { + "style": "STATIC" + }, + "chance": 0.01, + "palette": [ + { + "block": "minecraft:firefly_bush" + } + ] +} \ No newline at end of file From 2e8ac0eeeadd90a1123f4fbd93d73d2a4a5d5c31 Mon Sep 17 00:00:00 2001 From: RePixelatedMC <107539181+RePixelatedMC@users.noreply.github.com> Date: Mon, 7 Jul 2025 19:57:20 +0200 Subject: [PATCH 07/11] cactus flower --- biomes/hot/desert-dunes-red.json | 17 +++++++++++++--- biomes/hot/desert-dunes.json | 17 +++++++++++++--- biomes/hot/mountain-plains.json | 30 ++++++++++++++++++++--------- biomes/savanna/acacia-denmyre.json | 15 ++++++++++++++- biomes/savanna/cliff-extended.json | 15 ++++++++++++++- biomes/savanna/cliff.json | 15 ++++++++++++++- biomes/savanna/plateau.json | 15 ++++++++++++++- biomes/savanna/savanna.json | 15 ++++++++++++++- biomes/terralost/ancient-sands.json | 18 +++++++++++++++-- dimensions/overworld.json | 1 - 10 files changed, 135 insertions(+), 23 deletions(-) diff --git a/biomes/hot/desert-dunes-red.json b/biomes/hot/desert-dunes-red.json index 5297b490..f1ac8fc3 100644 --- a/biomes/hot/desert-dunes-red.json +++ b/biomes/hot/desert-dunes-red.json @@ -133,13 +133,24 @@ ], "decorators": [ { - "verticalZoom": 5, - "chance": 0.004, + "chance": 0.0005, "variance": {"style": "STATIC"}, "stackMax": 5, "style": {"style": "STATIC"}, "palette": [{"block": "minecraft:cactus"}], - "heightVariance": {"style": "NOWHERE"}, + "stackMin": 1 + }, + { + "chance": 0.0005, + "variance": {"style": "STATIC"}, + "stackMax": 5, + "style": {"style": "STATIC"}, + "palette": [{"block": "minecraft:cactus"}], + "topPalette": [ + { + "block": "minecraft:cactus_flower" + } + ], "stackMin": 1 }, { diff --git a/biomes/hot/desert-dunes.json b/biomes/hot/desert-dunes.json index 4773f8f7..1b371534 100644 --- a/biomes/hot/desert-dunes.json +++ b/biomes/hot/desert-dunes.json @@ -132,13 +132,24 @@ ], "decorators": [ { - "verticalZoom": 5, - "chance": 0.004, + "chance": 0.0005, "variance": {"style": "STATIC"}, "stackMax": 5, "style": {"style": "STATIC"}, "palette": [{"block": "minecraft:cactus"}], - "heightVariance": {"style": "NOWHERE"}, + "stackMin": 1 + }, + { + "chance": 0.0005, + "variance": {"style": "STATIC"}, + "stackMax": 5, + "style": {"style": "STATIC"}, + "palette": [{"block": "minecraft:cactus"}], + "topPalette": [ + { + "block": "minecraft:cactus_flower" + } + ], "stackMin": 1 }, { diff --git a/biomes/hot/mountain-plains.json b/biomes/hot/mountain-plains.json index 94a3186d..cc538b89 100644 --- a/biomes/hot/mountain-plains.json +++ b/biomes/hot/mountain-plains.json @@ -22,13 +22,25 @@ "palette": [{"block": "minecraft:red_sandstone"}] } ], - "decorators": [{ - "chance": 0.001, - "variance": {"style": "STATIC"}, - "stackMax": 5, - "style": {"style": "STATIC"}, - "palette": [{"block": "minecraft:cactus"}], - "heightVariance": {"style": "STATIC"}, - "stackMin": 1 - }] + "decorators": [ { + "chance": 0.0005, + "variance": {"style": "STATIC"}, + "stackMax": 5, + "style": {"style": "STATIC"}, + "palette": [{"block": "minecraft:cactus"}], + "stackMin": 1 + }, + { + "chance": 0.0005, + "variance": {"style": "STATIC"}, + "stackMax": 5, + "style": {"style": "STATIC"}, + "palette": [{"block": "minecraft:cactus"}], + "topPalette": [ + { + "block": "minecraft:cactus_flower" + } + ], + "stackMin": 1 + }] } diff --git a/biomes/savanna/acacia-denmyre.json b/biomes/savanna/acacia-denmyre.json index 1f191302..c5f8d221 100644 --- a/biomes/savanna/acacia-denmyre.json +++ b/biomes/savanna/acacia-denmyre.json @@ -100,12 +100,25 @@ "style": {"style": "STATIC"} }, { - "chance": 0.001, + "chance": 0.0005, "variance": {"style": "STATIC"}, "stackMax": 2, "style": {"style": "STATIC"}, "palette": [{"block": "minecraft:cactus"}], "stackMin": 1 + }, + { + "chance": 0.0005, + "variance": {"style": "STATIC"}, + "stackMax": 2, + "style": {"style": "STATIC"}, + "palette": [{"block": "minecraft:cactus"}], + "topPalette": [ + { + "block": "minecraft:cactus_flower" + } + ], + "stackMin": 1 }, { "chance": 0.4, diff --git a/biomes/savanna/cliff-extended.json b/biomes/savanna/cliff-extended.json index 0b79590f..ec3952bf 100644 --- a/biomes/savanna/cliff-extended.json +++ b/biomes/savanna/cliff-extended.json @@ -182,12 +182,25 @@ "style": {"style": "STATIC"} }, { - "chance": 0.001, + "chance": 0.0005, "variance": {"style": "STATIC"}, "stackMax": 2, "style": {"style": "STATIC"}, "palette": [{"block": "minecraft:cactus"}], "stackMin": 1 + }, + { + "chance": 0.0005, + "variance": {"style": "STATIC"}, + "stackMax": 2, + "style": {"style": "STATIC"}, + "palette": [{"block": "minecraft:cactus"}], + "topPalette": [ + { + "block": "minecraft:cactus_flower" + } + ], + "stackMin": 1 }, { "chance": 0.3, diff --git a/biomes/savanna/cliff.json b/biomes/savanna/cliff.json index c3d30c73..b04ac506 100644 --- a/biomes/savanna/cliff.json +++ b/biomes/savanna/cliff.json @@ -185,12 +185,25 @@ "style": {"style": "STATIC"} }, { - "chance": 0.001, + "chance": 0.0005, "variance": {"style": "STATIC"}, "stackMax": 2, "style": {"style": "STATIC"}, "palette": [{"block": "minecraft:cactus"}], "stackMin": 1 + }, + { + "chance": 0.0005, + "variance": {"style": "STATIC"}, + "stackMax": 2, + "style": {"style": "STATIC"}, + "palette": [{"block": "minecraft:cactus"}], + "topPalette": [ + { + "block": "minecraft:cactus_flower" + } + ], + "stackMin": 1 }, { "chance": 0.3, diff --git a/biomes/savanna/plateau.json b/biomes/savanna/plateau.json index 59a20e05..eefe0470 100644 --- a/biomes/savanna/plateau.json +++ b/biomes/savanna/plateau.json @@ -210,12 +210,25 @@ "style": {"style": "STATIC"} }, { - "chance": 0.001, + "chance": 0.0005, "variance": {"style": "STATIC"}, "stackMax": 2, "style": {"style": "STATIC"}, "palette": [{"block": "minecraft:cactus"}], "stackMin": 1 + }, + { + "chance": 0.0005, + "variance": {"style": "STATIC"}, + "stackMax": 2, + "style": {"style": "STATIC"}, + "palette": [{"block": "minecraft:cactus"}], + "topPalette": [ + { + "block": "minecraft:cactus_flower" + } + ], + "stackMin": 1 }, { "chance": 0.3, diff --git a/biomes/savanna/savanna.json b/biomes/savanna/savanna.json index a0729e5c..6dc9dee0 100644 --- a/biomes/savanna/savanna.json +++ b/biomes/savanna/savanna.json @@ -205,12 +205,25 @@ "style": {"style": "STATIC"} }, { - "chance": 0.001, + "chance": 0.0005, "variance": {"style": "STATIC"}, "stackMax": 2, "style": {"style": "STATIC"}, "palette": [{"block": "minecraft:cactus"}], "stackMin": 1 + }, + { + "chance": 0.0005, + "variance": {"style": "STATIC"}, + "stackMax": 2, + "style": {"style": "STATIC"}, + "palette": [{"block": "minecraft:cactus"}], + "topPalette": [ + { + "block": "minecraft:cactus_flower" + } + ], + "stackMin": 1 }, { "chance": 0.3, diff --git a/biomes/terralost/ancient-sands.json b/biomes/terralost/ancient-sands.json index 2d26b636..d372bf58 100644 --- a/biomes/terralost/ancient-sands.json +++ b/biomes/terralost/ancient-sands.json @@ -168,14 +168,28 @@ ], "decorators": [ { - "verticalZoom": 5, - "chance": 0.004, + "chance": 0.002, "variance": {"style": "STATIC"}, "stackMax": 5, "style": {"style": "STATIC"}, "palette": [{"block": "minecraft:cactus"}], "heightVariance": {"style": "STATIC"}, "stackMin": 1 + }, + { + "chance": 0.002, + "variance": {"style": "STATIC"}, + "stackMax": 5, + "style": {"style": "STATIC"}, + "palette": [{"block": "minecraft:cactus"}], + "topPalette": [ + { + "block": "minecraft:cactus_flower", + "weight": 1 + } + ], + "heightVariance": {"style": "STATIC"}, + "stackMin": 1 }, { "chance": 0.005, diff --git a/dimensions/overworld.json b/dimensions/overworld.json index 7342e143..ab75e971 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -6,7 +6,6 @@ "fluidHeight": 75, "jigsawStructureDivisor": 20, "continentZoom": 1, - "focusRegion": "swamp", "continentalStyle": { "style": "NOWHERE_CELLULAR", "fracture": { From 06e48c0fa9d5959b9b913d0255fd5cd73cd32d2c Mon Sep 17 00:00:00 2001 From: RePixelatedMC <107539181+RePixelatedMC@users.noreply.github.com> Date: Fri, 11 Jul 2025 10:23:30 +0200 Subject: [PATCH 08/11] Dry Bush --- biomes/dev.json | 4 ++-- biomes/hot/desert-dunes-red.json | 3 ++- biomes/hot/desert-dunes.json | 3 ++- biomes/hot/oasis.json | 3 ++- biomes/hot/small-valley.json | 3 ++- biomes/mesa/blue.json | 3 ++- biomes/mesa/cliffs.json | 3 ++- biomes/mesa/dark.json | 3 ++- biomes/mesa/green.json | 3 ++- biomes/mesa/mesa.json | 3 ++- biomes/mesa/red.json | 3 ++- biomes/mesa/valleys.json | 3 ++- biomes/mesa/yellow.json | 3 ++- biomes/savanna/acacia-denmyre.json | 3 ++- biomes/savanna/cliff-extended.json | 3 ++- biomes/savanna/cliff.json | 3 ++- biomes/savanna/forest.json | 3 ++- biomes/savanna/plateau.json | 3 ++- biomes/savanna/savanna.json | 3 ++- biomes/savanna/shore/beach.json | 3 ++- dimensions/overworld.json | 1 + snippet/decorator/dry_grass.json | 37 ++++++++++++++++++++++++++++++ 22 files changed, 78 insertions(+), 21 deletions(-) create mode 100644 snippet/decorator/dry_grass.json diff --git a/biomes/dev.json b/biomes/dev.json index 57516f2b..9f1aac7b 100644 --- a/biomes/dev.json +++ b/biomes/dev.json @@ -5,14 +5,14 @@ { "palette": [ { - "block": "minecraft:grass_block" + "block": "minecraft:sand" } ] } ], "decorators": [ - "snippet/decorator/leaf" + "snippet/decorator/bush" ], "generators": [ diff --git a/biomes/hot/desert-dunes-red.json b/biomes/hot/desert-dunes-red.json index f1ac8fc3..8bf698ea 100644 --- a/biomes/hot/desert-dunes-red.json +++ b/biomes/hot/desert-dunes-red.json @@ -156,6 +156,7 @@ { "chance": 0.005, "palette": [{"block": "minecraft:dead_bush"}] - } + }, + "snippet/decorator/dry_grass" ] } diff --git a/biomes/hot/desert-dunes.json b/biomes/hot/desert-dunes.json index 1b371534..d1fa9ef6 100644 --- a/biomes/hot/desert-dunes.json +++ b/biomes/hot/desert-dunes.json @@ -155,6 +155,7 @@ { "chance": 0.005, "palette": [{"block": "minecraft:dead_bush"}] - } + }, + "snippet/decorator/dry_grass" ] } diff --git a/biomes/hot/oasis.json b/biomes/hot/oasis.json index ca12643e..f433404e 100644 --- a/biomes/hot/oasis.json +++ b/biomes/hot/oasis.json @@ -39,6 +39,7 @@ { "chance": 0.005, "palette": [{"block": "minecraft:dead_bush"}] - } + }, + "snippet/decorator/dry_grass" ] } diff --git a/biomes/hot/small-valley.json b/biomes/hot/small-valley.json index bebfc801..59451455 100644 --- a/biomes/hot/small-valley.json +++ b/biomes/hot/small-valley.json @@ -266,6 +266,7 @@ { "chance": 0.5, "palette": [{"block": "minecraft:short_grass"}] - } + }, + "snippet/decorator/dry_grass" ] } diff --git a/biomes/mesa/blue.json b/biomes/mesa/blue.json index 07bd3ddc..a05178cd 100644 --- a/biomes/mesa/blue.json +++ b/biomes/mesa/blue.json @@ -83,7 +83,8 @@ "zoom": 0.3, "palette": [{"block": "minecraft:dead_bush"}], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/dry_grass" ], "lockLayers": true } diff --git a/biomes/mesa/cliffs.json b/biomes/mesa/cliffs.json index c2281755..08c598f7 100644 --- a/biomes/mesa/cliffs.json +++ b/biomes/mesa/cliffs.json @@ -94,7 +94,8 @@ "zoom": 0.3, "palette": [{"block": "minecraft:dead_bush"}], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/dry_grass" ], "lockLayers": true } diff --git a/biomes/mesa/dark.json b/biomes/mesa/dark.json index ec1f7eae..b0b1ddbc 100644 --- a/biomes/mesa/dark.json +++ b/biomes/mesa/dark.json @@ -100,7 +100,8 @@ "zoom": 0.3, "palette": [{"block": "minecraft:dead_bush"}], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/dry_grass" ], "childShrinkFactor": 0.35, "lockLayers": true diff --git a/biomes/mesa/green.json b/biomes/mesa/green.json index e6954ecd..7411f32c 100644 --- a/biomes/mesa/green.json +++ b/biomes/mesa/green.json @@ -83,7 +83,8 @@ "zoom": 0.3, "palette": [{"block": "minecraft:dead_bush"}], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/dry_grass" ], "lockLayers": true } diff --git a/biomes/mesa/mesa.json b/biomes/mesa/mesa.json index 2fba56a4..372000bf 100644 --- a/biomes/mesa/mesa.json +++ b/biomes/mesa/mesa.json @@ -165,7 +165,8 @@ } ], "style": {"style": "STATIC"} - }], + }, + "snippet/decorator/dry_grass"], "childStyle": { "style": "NOWHERE_CELLULAR", "zoom": 1.2, diff --git a/biomes/mesa/red.json b/biomes/mesa/red.json index 7132c794..437113aa 100644 --- a/biomes/mesa/red.json +++ b/biomes/mesa/red.json @@ -90,7 +90,8 @@ "zoom": 0.3, "palette": [{"block": "minecraft:dead_bush"}], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/dry_grass" ], "lockLayers": true, "deposits": [{ diff --git a/biomes/mesa/valleys.json b/biomes/mesa/valleys.json index 2e40e164..8b424e7b 100644 --- a/biomes/mesa/valleys.json +++ b/biomes/mesa/valleys.json @@ -266,6 +266,7 @@ { "chance": 0.5, "palette": [{"block": "minecraft:short_grass"}] - } + }, + "snippet/decorator/dry_grass" ] } diff --git a/biomes/mesa/yellow.json b/biomes/mesa/yellow.json index 4f57640a..fe17595d 100644 --- a/biomes/mesa/yellow.json +++ b/biomes/mesa/yellow.json @@ -106,7 +106,8 @@ "zoom": 0.3, "palette": [{"block": "minecraft:dead_bush"}], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/dry_grass" ], "lockLayers": true } diff --git a/biomes/savanna/acacia-denmyre.json b/biomes/savanna/acacia-denmyre.json index c5f8d221..cf3e9ab8 100644 --- a/biomes/savanna/acacia-denmyre.json +++ b/biomes/savanna/acacia-denmyre.json @@ -157,6 +157,7 @@ "zoom": 0.3, "palette": [{"block": "minecraft:tall_grass"}], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/dry_grass" ] } diff --git a/biomes/savanna/cliff-extended.json b/biomes/savanna/cliff-extended.json index ec3952bf..c1293308 100644 --- a/biomes/savanna/cliff-extended.json +++ b/biomes/savanna/cliff-extended.json @@ -215,7 +215,8 @@ "zoom": 0.3, "palette": [{"block": "minecraft:tall_grass"}], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/dry_grass" ], "biomeSkyScatter": [ "DESERT", diff --git a/biomes/savanna/cliff.json b/biomes/savanna/cliff.json index b04ac506..0d047d70 100644 --- a/biomes/savanna/cliff.json +++ b/biomes/savanna/cliff.json @@ -218,7 +218,8 @@ "zoom": 0.3, "palette": [{"block": "minecraft:tall_grass"}], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/dry_grass" ], "biomeSkyScatter": [ "DESERT", diff --git a/biomes/savanna/forest.json b/biomes/savanna/forest.json index 73a215b7..848918c6 100644 --- a/biomes/savanna/forest.json +++ b/biomes/savanna/forest.json @@ -246,7 +246,8 @@ } ], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/dry_grass" ], "biomeSkyScatter": ["DESERT"] } diff --git a/biomes/savanna/plateau.json b/biomes/savanna/plateau.json index eefe0470..bac1b570 100644 --- a/biomes/savanna/plateau.json +++ b/biomes/savanna/plateau.json @@ -243,7 +243,8 @@ "zoom": 0.3, "palette": [{"block": "minecraft:tall_grass"}], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/dry_grass" ], "biomeSkyScatter": [ "DESERT", diff --git a/biomes/savanna/savanna.json b/biomes/savanna/savanna.json index 6dc9dee0..af603a01 100644 --- a/biomes/savanna/savanna.json +++ b/biomes/savanna/savanna.json @@ -238,7 +238,8 @@ "zoom": 0.3, "palette": [{"block": "minecraft:tall_grass"}], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/dry_grass" ], "biomeSkyScatter": [ "DESERT", diff --git a/biomes/savanna/shore/beach.json b/biomes/savanna/shore/beach.json index 0269983a..7bcc2eab 100644 --- a/biomes/savanna/shore/beach.json +++ b/biomes/savanna/shore/beach.json @@ -91,5 +91,6 @@ "zoom": 0.3, "palette": [{"block": "minecraft:short_grass"}], "style": {"style": "STATIC"} - }] + }, + "snippet/decorator/dry_grass"] } diff --git a/dimensions/overworld.json b/dimensions/overworld.json index ab75e971..d19cedba 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -6,6 +6,7 @@ "fluidHeight": 75, "jigsawStructureDivisor": 20, "continentZoom": 1, + "focusRegion": "temperate", "continentalStyle": { "style": "NOWHERE_CELLULAR", "fracture": { diff --git a/snippet/decorator/dry_grass.json b/snippet/decorator/dry_grass.json new file mode 100644 index 00000000..78b60d7e --- /dev/null +++ b/snippet/decorator/dry_grass.json @@ -0,0 +1,37 @@ +{ + "chance": 0.01, + "style": { + "style": "CELLULAR", + "zoom": 0.3, + "exponent": 1.5, + "axialFracturing": true, + "fracture": { + "multiplier": 55, + "axialFracturing": true, + "style": "NOWHERE", + "zoom": 0.15, + "fracture": { + "axialFracturing": true, + "style": "STATIC", + "multiplier": 18 + } + } + }, + "slopeCondition":{ + "maximumSlope": 5 + }, + "palette": [ + { + "block": "minecraft:tall_dry_grass", + "weight": 1 + }, + { + "block": "minecraft:short_dry_grass", + "weight": 1 + }, + { + "block": "minecraft:air", + "weight": 3 + } + ] +} \ No newline at end of file From 9590c32b364725d9b1a16dc38a5ad29e63a6e6da Mon Sep 17 00:00:00 2001 From: RePixelatedMC <107539181+RePixelatedMC@users.noreply.github.com> Date: Fri, 11 Jul 2025 12:06:47 +0200 Subject: [PATCH 09/11] Bush --- biomes/dev.json | 2 +- biomes/mountain/forest-extended.json | 3 ++- biomes/mountain/forest.json | 3 ++- biomes/mountain/mplain-extended.json | 3 ++- biomes/mountain/plain-extended.json | 3 ++- biomes/mountain/plains.json | 3 ++- biomes/temperate/birch-denmyre.json | 3 ++- biomes/temperate/birch-forest-extended.json | 3 ++- biomes/temperate/birch-forest.json | 3 ++- biomes/temperate/birch-tall.json | 3 ++- biomes/temperate/birch-thin.json | 3 ++- biomes/temperate/calmplains.json | 3 ++- biomes/temperate/cherry-blossom-forest.json | 3 ++- biomes/temperate/combo-forest-extended.json | 3 ++- biomes/temperate/combo-forest.json | 3 ++- biomes/temperate/croak.json | 3 ++- biomes/temperate/fancyplains.json | 3 ++- biomes/temperate/flower-forest-extended.json | 3 ++- biomes/temperate/flower-forest.json | 3 ++- biomes/temperate/highlands.json | 3 ++- biomes/temperate/island.json | 3 ++- .../temperate/longtree-forest-extended.json | 3 ++- biomes/temperate/longtree-forest.json | 3 ++- biomes/temperate/lush-plains-red.json | 3 ++- biomes/temperate/lush-plains-yellow.json | 3 ++- biomes/temperate/lush-plains.json | 3 ++- biomes/temperate/meadows.json | 3 ++- biomes/temperate/oak-denmyre.json | 3 ++- biomes/temperate/oak-forest-extended.json | 3 ++- biomes/temperate/oak-forest-flat.json | 3 ++- biomes/temperate/oak-forest.json | 3 ++- biomes/temperate/osaka-red-forest.json | 3 ++- biomes/temperate/osaka-violet-forest.json | 3 ++- biomes/temperate/overflowed.json | 3 ++- biomes/temperate/plains.json | 3 ++- biomes/temperate/plateau-extended.json | 3 ++- biomes/temperate/plateau.json | 3 ++- biomes/temperate/reaching-forest-violet.json | 3 ++- biomes/temperate/reaching-forest.json | 3 ++- biomes/temperate/roughplains.json | 3 ++- biomes/temperate/sakura-forest.json | 3 ++- biomes/temperate/shattered-plains.json | 3 ++- biomes/temperate/stranged-plains.json | 3 ++- biomes/temperate/wilds-extended.json | 3 ++- biomes/temperate/wilds.json | 3 ++- biomes/tundra/bonsai-extended.json | 3 ++- biomes/tundra/bonsai-forest.json | 3 ++- biomes/tundra/forest-extended-cliffs.json | 3 ++- biomes/tundra/forest.json | 3 ++- biomes/tundra/spruce-denmyre.json | 3 ++- biomes/tundra/taiga-extended.json | 3 ++- dimensions/overworld.json | 3 +-- snippet/decorator/bush.json | 19 +++++++++++++++---- 53 files changed, 117 insertions(+), 57 deletions(-) diff --git a/biomes/dev.json b/biomes/dev.json index 9f1aac7b..4567f513 100644 --- a/biomes/dev.json +++ b/biomes/dev.json @@ -5,7 +5,7 @@ { "palette": [ { - "block": "minecraft:sand" + "block": "minecraft:grass_block" } ] diff --git a/biomes/mountain/forest-extended.json b/biomes/mountain/forest-extended.json index 48297c75..607d7daa 100644 --- a/biomes/mountain/forest-extended.json +++ b/biomes/mountain/forest-extended.json @@ -207,6 +207,7 @@ "data": {"age": 0} } ] - } + }, + "snippet/decorator/bush" ] } diff --git a/biomes/mountain/forest.json b/biomes/mountain/forest.json index 9eadb1ce..bdcf194c 100644 --- a/biomes/mountain/forest.json +++ b/biomes/mountain/forest.json @@ -207,6 +207,7 @@ } ] }, - "snippet/decorator/leaf" + "snippet/decorator/leaf", + "snippet/decorator/bush" ] } diff --git a/biomes/mountain/mplain-extended.json b/biomes/mountain/mplain-extended.json index 32b025cd..73441ec5 100644 --- a/biomes/mountain/mplain-extended.json +++ b/biomes/mountain/mplain-extended.json @@ -174,6 +174,7 @@ "chance": 0.5, "palette": [{"block": "minecraft:short_grass"}] }, - "snippet/decorator/leaf" + "snippet/decorator/leaf", + "snippet/decorator/bush" ] } diff --git a/biomes/mountain/plain-extended.json b/biomes/mountain/plain-extended.json index f797325a..9d1b9192 100644 --- a/biomes/mountain/plain-extended.json +++ b/biomes/mountain/plain-extended.json @@ -121,6 +121,7 @@ { "chance": 0.5, "palette": [{"block": "minecraft:short_grass"}] - } + }, + "snippet/decorator/bush" ] } diff --git a/biomes/mountain/plains.json b/biomes/mountain/plains.json index 9c0ad58f..dd9572aa 100644 --- a/biomes/mountain/plains.json +++ b/biomes/mountain/plains.json @@ -291,7 +291,8 @@ } } ] - } + }, + "snippet/decorator/bush" ], "childStyle": { "style": "IRIS_DOUBLE", diff --git a/biomes/temperate/birch-denmyre.json b/biomes/temperate/birch-denmyre.json index b79d84e9..1f700e82 100644 --- a/biomes/temperate/birch-denmyre.json +++ b/biomes/temperate/birch-denmyre.json @@ -208,6 +208,7 @@ "palette": [{"block": "minecraft:tall_grass"}], "style": {"style": "STATIC"} }, - "snippet/decorator/wildflowers" + "snippet/decorator/wildflowers", + "snippet/decorator/bush" ] } diff --git a/biomes/temperate/birch-forest-extended.json b/biomes/temperate/birch-forest-extended.json index a8c4025d..caaf70c5 100644 --- a/biomes/temperate/birch-forest-extended.json +++ b/biomes/temperate/birch-forest-extended.json @@ -217,7 +217,8 @@ "palette": [{"block": "minecraft:tall_grass"}], "style": {"style": "STATIC"} }, - "snippet/decorator/wildflowers" + "snippet/decorator/wildflowers", + "snippet/decorator/bush" ], "childStyle": { "style": "NOWHERE_SIMPLEX", diff --git a/biomes/temperate/birch-forest.json b/biomes/temperate/birch-forest.json index e515e90f..8885f67e 100644 --- a/biomes/temperate/birch-forest.json +++ b/biomes/temperate/birch-forest.json @@ -230,7 +230,8 @@ "palette": [{"block": "minecraft:tall_grass"}], "style": {"style": "STATIC"} }, - "snippet/decorator/wildflowers" + "snippet/decorator/wildflowers", + "snippet/decorator/bush" ], "childStyle": { "style": "NOWHERE_SIMPLEX", diff --git a/biomes/temperate/birch-tall.json b/biomes/temperate/birch-tall.json index 7de9b829..e9a43629 100644 --- a/biomes/temperate/birch-tall.json +++ b/biomes/temperate/birch-tall.json @@ -236,7 +236,8 @@ "chance": 0.025, "palette": [{"block": "minecraft:birch_leaves"}] }, - "snippet/decorator/wildflowers" + "snippet/decorator/wildflowers", + "snippet/decorator/bush" ], "childStyle": { "style": "NOWHERE_SIMPLEX", diff --git a/biomes/temperate/birch-thin.json b/biomes/temperate/birch-thin.json index a653c387..486e351f 100644 --- a/biomes/temperate/birch-thin.json +++ b/biomes/temperate/birch-thin.json @@ -198,6 +198,7 @@ "palette": [{"block": "minecraft:tall_grass"}], "style": {"style": "STATIC"} }, - "snippet/decorator/wildflowers" + "snippet/decorator/wildflowers", + "snippet/decorator/bush" ] } diff --git a/biomes/temperate/calmplains.json b/biomes/temperate/calmplains.json index 8cec0bc0..c76390fb 100644 --- a/biomes/temperate/calmplains.json +++ b/biomes/temperate/calmplains.json @@ -208,7 +208,8 @@ ], "style": {"style": "STATIC"} }, - "snippet/decorator/leaf" + "snippet/decorator/leaf", + "snippet/decorator/bush" ], "generators": [{ "generator": "mountain", diff --git a/biomes/temperate/cherry-blossom-forest.json b/biomes/temperate/cherry-blossom-forest.json index b73d8d03..7caff49b 100644 --- a/biomes/temperate/cherry-blossom-forest.json +++ b/biomes/temperate/cherry-blossom-forest.json @@ -403,6 +403,7 @@ "block": "minecraft:cobblestone_slab" } ] - } + }, + "snippet/decorator/bush" ] } \ No newline at end of file diff --git a/biomes/temperate/combo-forest-extended.json b/biomes/temperate/combo-forest-extended.json index 45b8d17a..db8ea45e 100644 --- a/biomes/temperate/combo-forest-extended.json +++ b/biomes/temperate/combo-forest-extended.json @@ -295,6 +295,7 @@ "palette": [{"block": "minecraft:cobblestone_slab"}] }, "snippet/decorator/leaf", - "snippet/decorator/wildflowers" + "snippet/decorator/wildflowers", + "snippet/decorator/bush" ] } diff --git a/biomes/temperate/combo-forest.json b/biomes/temperate/combo-forest.json index ddcf2750..08f4ec2a 100644 --- a/biomes/temperate/combo-forest.json +++ b/biomes/temperate/combo-forest.json @@ -308,6 +308,7 @@ "palette": [{"block": "minecraft:cobblestone_slab"}] }, "snippet/decorator/leaf", - "snippet/decorator/wildflowers" + "snippet/decorator/wildflowers", + "snippet/decorator/bush" ] } diff --git a/biomes/temperate/croak.json b/biomes/temperate/croak.json index b3b4282f..303335be 100644 --- a/biomes/temperate/croak.json +++ b/biomes/temperate/croak.json @@ -167,7 +167,8 @@ "chance": 0.2 }, - "snippet/decorator/leaf" + "snippet/decorator/leaf", + "snippet/decorator/bush" ], "objects": [ { diff --git a/biomes/temperate/fancyplains.json b/biomes/temperate/fancyplains.json index 198ac745..1dd13932 100644 --- a/biomes/temperate/fancyplains.json +++ b/biomes/temperate/fancyplains.json @@ -124,7 +124,8 @@ } ], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/bush" ], "generators": [{ "generator": "mountain", diff --git a/biomes/temperate/flower-forest-extended.json b/biomes/temperate/flower-forest-extended.json index de6b9be2..09ec6491 100644 --- a/biomes/temperate/flower-forest-extended.json +++ b/biomes/temperate/flower-forest-extended.json @@ -473,6 +473,7 @@ "zoom": 0.2, "palette": [{"block": "minecraft:cobblestone_slab"}] }, - "snippet/decorator/wildflowers" + "snippet/decorator/wildflowers", + "snippet/decorator/bush" ] } diff --git a/biomes/temperate/flower-forest.json b/biomes/temperate/flower-forest.json index 0f34a4fd..994378d4 100644 --- a/biomes/temperate/flower-forest.json +++ b/biomes/temperate/flower-forest.json @@ -485,6 +485,7 @@ "palette": [{"block": "minecraft:cobblestone_slab"}] }, "snippet/decorator/leaf", - "snippet/decorator/wildflowers" + "snippet/decorator/wildflowers", + "snippet/decorator/bush" ] } diff --git a/biomes/temperate/highlands.json b/biomes/temperate/highlands.json index 009589bd..d8fe6da7 100644 --- a/biomes/temperate/highlands.json +++ b/biomes/temperate/highlands.json @@ -125,6 +125,7 @@ {"block": "minecraft:fern"} ], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/bush" ] } diff --git a/biomes/temperate/island.json b/biomes/temperate/island.json index f485d9e2..a8b24701 100644 --- a/biomes/temperate/island.json +++ b/biomes/temperate/island.json @@ -126,6 +126,7 @@ "style": "NOWHERE", "zoom": 0.28 } - } + }, + "snippet/decorator/bush" ] } diff --git a/biomes/temperate/longtree-forest-extended.json b/biomes/temperate/longtree-forest-extended.json index 3b4fc270..5a27bc99 100644 --- a/biomes/temperate/longtree-forest-extended.json +++ b/biomes/temperate/longtree-forest-extended.json @@ -377,7 +377,8 @@ {"block": "minecraft:oxeye_daisy"} ] }, - "snippet/decorator/leaf" + "snippet/decorator/leaf", + "snippet/decorator/bush" ], "effects": [{ "particleAltX": 0.301, diff --git a/biomes/temperate/longtree-forest.json b/biomes/temperate/longtree-forest.json index 53271936..5b9e4da4 100644 --- a/biomes/temperate/longtree-forest.json +++ b/biomes/temperate/longtree-forest.json @@ -378,7 +378,8 @@ {"block": "minecraft:oxeye_daisy"} ] }, - "snippet/decorator/leaf" + "snippet/decorator/leaf", + "snippet/decorator/bush" ], "effects": [{ "particleAltX": 0.301, diff --git a/biomes/temperate/lush-plains-red.json b/biomes/temperate/lush-plains-red.json index de27a916..96799ef8 100644 --- a/biomes/temperate/lush-plains-red.json +++ b/biomes/temperate/lush-plains-red.json @@ -198,6 +198,7 @@ "block": "minecraft:oak_leaves", "data": {"persistent": true} }] - } + }, + "snippet/decorator/bush" ] } diff --git a/biomes/temperate/lush-plains-yellow.json b/biomes/temperate/lush-plains-yellow.json index ec2121d7..0d201dcd 100644 --- a/biomes/temperate/lush-plains-yellow.json +++ b/biomes/temperate/lush-plains-yellow.json @@ -209,6 +209,7 @@ "data": {"persistent": true} }] }, - "snippet/decorator/wildflowers" + "snippet/decorator/wildflowers", + "snippet/decorator/bush" ] } diff --git a/biomes/temperate/lush-plains.json b/biomes/temperate/lush-plains.json index 4f2c59c6..9b7d8c64 100644 --- a/biomes/temperate/lush-plains.json +++ b/biomes/temperate/lush-plains.json @@ -217,7 +217,8 @@ "zoom": 0.8 } }, - "snippet/decorator/wildflowers" + "snippet/decorator/wildflowers", + "snippet/decorator/bush" ], "childStyle": { "style": "CELLULAR_IRIS_THICK", diff --git a/biomes/temperate/meadows.json b/biomes/temperate/meadows.json index 0a24a15f..13ef0c30 100644 --- a/biomes/temperate/meadows.json +++ b/biomes/temperate/meadows.json @@ -196,6 +196,7 @@ "palette": [{"block": "minecraft:short_grass"}] }, "snippet/decorator/leaf", - "snippet/decorator/wildflowers" + "snippet/decorator/wildflowers", + "snippet/decorator/bush" ] } diff --git a/biomes/temperate/oak-denmyre.json b/biomes/temperate/oak-denmyre.json index d3ff6eb3..668b6ede 100644 --- a/biomes/temperate/oak-denmyre.json +++ b/biomes/temperate/oak-denmyre.json @@ -222,6 +222,7 @@ "zoom": 0.2, "palette": [{"block": "minecraft:cobblestone_slab"}] }, - "snippet/decorator/leaf" + "snippet/decorator/leaf", + "snippet/decorator/bush" ] } diff --git a/biomes/temperate/oak-forest-extended.json b/biomes/temperate/oak-forest-extended.json index 59370f53..86dcf6b5 100644 --- a/biomes/temperate/oak-forest-extended.json +++ b/biomes/temperate/oak-forest-extended.json @@ -226,6 +226,7 @@ "chance": 0.05, "palette": [{"block": "minecraft:cobblestone_slab"}] }, - "snippet/decorator/leaf" + "snippet/decorator/leaf", + "snippet/decorator/bush" ] } diff --git a/biomes/temperate/oak-forest-flat.json b/biomes/temperate/oak-forest-flat.json index 857432e8..780bb646 100644 --- a/biomes/temperate/oak-forest-flat.json +++ b/biomes/temperate/oak-forest-flat.json @@ -244,6 +244,7 @@ "chance": 0.05, "palette": [{"block": "minecraft:cobblestone_slab"}] }, - "snippet/decorator/leaf" + "snippet/decorator/leaf", + "snippet/decorator/bush" ] } diff --git a/biomes/temperate/oak-forest.json b/biomes/temperate/oak-forest.json index 1862ce7b..89114d3b 100644 --- a/biomes/temperate/oak-forest.json +++ b/biomes/temperate/oak-forest.json @@ -228,6 +228,7 @@ "chance": 0.05, "palette": [{"block": "minecraft:cobblestone_slab"}] }, - "snippet/decorator/leaf" + "snippet/decorator/leaf", + "snippet/decorator/bush" ] } diff --git a/biomes/temperate/osaka-red-forest.json b/biomes/temperate/osaka-red-forest.json index 2f69142c..2bddd688 100644 --- a/biomes/temperate/osaka-red-forest.json +++ b/biomes/temperate/osaka-red-forest.json @@ -258,7 +258,8 @@ "zoom": 0.2, "palette": [{"block": "minecraft:blackstone_slab"}] }, - "snippet/decorator/leaf" + "snippet/decorator/leaf", + "snippet/decorator/bush" ], "effects": [{ "particleAltX": 0.301, diff --git a/biomes/temperate/osaka-violet-forest.json b/biomes/temperate/osaka-violet-forest.json index 1cb5c58e..d4826efa 100644 --- a/biomes/temperate/osaka-violet-forest.json +++ b/biomes/temperate/osaka-violet-forest.json @@ -280,6 +280,7 @@ "zoom": 0.2, "palette": [{"block": "minecraft:cobblestone_slab"}] }, - "snippet/decorator/leaf" + "snippet/decorator/leaf", + "snippet/decorator/bush" ] } diff --git a/biomes/temperate/overflowed.json b/biomes/temperate/overflowed.json index 01953519..e9b9e3b7 100644 --- a/biomes/temperate/overflowed.json +++ b/biomes/temperate/overflowed.json @@ -274,7 +274,8 @@ { "chance": 0.5, "palette": [{"block": "minecraft:short_grass"}] - } + }, + "snippet/decorator/bush" ], "features": [{ "rarity": 252, diff --git a/biomes/temperate/plains.json b/biomes/temperate/plains.json index cab99b85..4ad0b2ed 100644 --- a/biomes/temperate/plains.json +++ b/biomes/temperate/plains.json @@ -288,6 +288,7 @@ "chance": 0.5, "palette": [{"block": "minecraft:short_grass"}] }, - "snippet/decorator/leaf" + "snippet/decorator/leaf", + "snippet/decorator/bush" ] } \ No newline at end of file diff --git a/biomes/temperate/plateau-extended.json b/biomes/temperate/plateau-extended.json index 633d381f..1c6f54cd 100644 --- a/biomes/temperate/plateau-extended.json +++ b/biomes/temperate/plateau-extended.json @@ -299,6 +299,7 @@ "block": "minecraft:poppy" } ] - } + }, + "snippet/decorator/bush" ] } diff --git a/biomes/temperate/plateau.json b/biomes/temperate/plateau.json index af0a1d60..d2a87de1 100644 --- a/biomes/temperate/plateau.json +++ b/biomes/temperate/plateau.json @@ -294,6 +294,7 @@ "block": "minecraft:poppy" } ] - } + }, + "snippet/decorator/bush" ] } diff --git a/biomes/temperate/reaching-forest-violet.json b/biomes/temperate/reaching-forest-violet.json index 6a113696..0fc0345c 100644 --- a/biomes/temperate/reaching-forest-violet.json +++ b/biomes/temperate/reaching-forest-violet.json @@ -190,7 +190,8 @@ ], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/bush" ], "childShrinkFactor": 8 } diff --git a/biomes/temperate/reaching-forest.json b/biomes/temperate/reaching-forest.json index 2f53d568..9baeb5e5 100644 --- a/biomes/temperate/reaching-forest.json +++ b/biomes/temperate/reaching-forest.json @@ -177,7 +177,8 @@ "zoom": 0.3, "palette": [{"block": "minecraft:short_grass"}], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/bush" ], "childShrinkFactor": 8 } diff --git a/biomes/temperate/roughplains.json b/biomes/temperate/roughplains.json index a1425c57..c71c5845 100644 --- a/biomes/temperate/roughplains.json +++ b/biomes/temperate/roughplains.json @@ -248,7 +248,8 @@ } ], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/bush" ], "generators": [{ "generator": "mountain", diff --git a/biomes/temperate/sakura-forest.json b/biomes/temperate/sakura-forest.json index e39aca8e..5d31da68 100644 --- a/biomes/temperate/sakura-forest.json +++ b/biomes/temperate/sakura-forest.json @@ -334,6 +334,7 @@ "variance": {"style": "STATIC"}, "zoom": 0.2, "palette": [{"block": "minecraft:cobblestone_slab"}] - } + }, + "snippet/decorator/bush" ] } diff --git a/biomes/temperate/shattered-plains.json b/biomes/temperate/shattered-plains.json index 55b452c3..caf49148 100644 --- a/biomes/temperate/shattered-plains.json +++ b/biomes/temperate/shattered-plains.json @@ -282,7 +282,8 @@ { "chance": 0.5, "palette": [{"block": "minecraft:short_grass"}] - } + }, + "snippet/decorator/bush" ], "features": [{ "rarity": 252, diff --git a/biomes/temperate/stranged-plains.json b/biomes/temperate/stranged-plains.json index ceb1c3c9..6cf21bdd 100644 --- a/biomes/temperate/stranged-plains.json +++ b/biomes/temperate/stranged-plains.json @@ -212,7 +212,8 @@ } ], "forcePlace": false - } + }, + "snippet/decorator/bush" ], "childStyle": { "style": "NOWHERE", diff --git a/biomes/temperate/wilds-extended.json b/biomes/temperate/wilds-extended.json index 0caae2ab..aa896bf0 100644 --- a/biomes/temperate/wilds-extended.json +++ b/biomes/temperate/wilds-extended.json @@ -177,7 +177,8 @@ "block": "minecraft:beetroots" }], "style": {"style": "NOWHERE"} - } + }, + "snippet/decorator/bush" ], "effects": [{ "interval": 250, diff --git a/biomes/temperate/wilds.json b/biomes/temperate/wilds.json index 40625336..fcfbd646 100644 --- a/biomes/temperate/wilds.json +++ b/biomes/temperate/wilds.json @@ -180,7 +180,8 @@ "block": "minecraft:beetroots" }], "style": {"style": "NOWHERE"} - } + }, + "snippet/decorator/bush" ], "effects": [{ "interval": 250, diff --git a/biomes/tundra/bonsai-extended.json b/biomes/tundra/bonsai-extended.json index 111bc8b2..b858ffb3 100644 --- a/biomes/tundra/bonsai-extended.json +++ b/biomes/tundra/bonsai-extended.json @@ -330,6 +330,7 @@ "variance": {"style": "STATIC"}, "palette": [{"block": "minecraft:poppy"}], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/bush" ] } diff --git a/biomes/tundra/bonsai-forest.json b/biomes/tundra/bonsai-forest.json index 5973e7e3..05714a9d 100644 --- a/biomes/tundra/bonsai-forest.json +++ b/biomes/tundra/bonsai-forest.json @@ -331,6 +331,7 @@ "variance": {"style": "STATIC"}, "palette": [{"block": "minecraft:poppy"}], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/bush" ] } diff --git a/biomes/tundra/forest-extended-cliffs.json b/biomes/tundra/forest-extended-cliffs.json index ca6f2ee1..3890844c 100644 --- a/biomes/tundra/forest-extended-cliffs.json +++ b/biomes/tundra/forest-extended-cliffs.json @@ -281,7 +281,8 @@ "zoom": 0.3, "palette": [{"block": "minecraft:short_grass"}], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/bush" ], "biomeSkyScatter": [ "SNOWY_TAIGA", diff --git a/biomes/tundra/forest.json b/biomes/tundra/forest.json index 12b20f63..5e6784fd 100644 --- a/biomes/tundra/forest.json +++ b/biomes/tundra/forest.json @@ -214,7 +214,8 @@ "palette": [{"block": "minecraft:short_grass"}], "style": {"style": "STATIC"} }, - "snippet/decorator/leaf" + "snippet/decorator/leaf", + "snippet/decorator/bush" ], "childShrinkFactor": 2.4 } diff --git a/biomes/tundra/spruce-denmyre.json b/biomes/tundra/spruce-denmyre.json index e410a08a..634d4fec 100644 --- a/biomes/tundra/spruce-denmyre.json +++ b/biomes/tundra/spruce-denmyre.json @@ -257,6 +257,7 @@ "variance": {"style": "STATIC"}, "palette": [{"block": "minecraft:tall_grass"}], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/bush" ] } diff --git a/biomes/tundra/taiga-extended.json b/biomes/tundra/taiga-extended.json index f807a155..b788f7e7 100644 --- a/biomes/tundra/taiga-extended.json +++ b/biomes/tundra/taiga-extended.json @@ -302,6 +302,7 @@ {"block": "minecraft:fern"} ], "style": {"style": "STATIC"} - } + }, + "snippet/decorator/bush" ] } diff --git a/dimensions/overworld.json b/dimensions/overworld.json index d19cedba..f207aa96 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -1,12 +1,11 @@ { - "version": 31020, + "version": 30700, "name": "Overworld", "environment": "NORMAL", "dimensionAngleDeg": 69, "fluidHeight": 75, "jigsawStructureDivisor": 20, "continentZoom": 1, - "focusRegion": "temperate", "continentalStyle": { "style": "NOWHERE_CELLULAR", "fracture": { diff --git a/snippet/decorator/bush.json b/snippet/decorator/bush.json index e70fac29..77afbc02 100644 --- a/snippet/decorator/bush.json +++ b/snippet/decorator/bush.json @@ -1,11 +1,22 @@ { - "chance": 0.1, - "style":{ - "style": "STATIC" + "chance": 0.03, + "style": { + "style": "CLOVER_HERMITE", + "zoom": 0.52, + "exponent": 2.5, + "axialFracturing": true + }, + "slopeCondition":{ + "maximumSlope": 5 }, "palette": [ { - "block": "minecraft:bush" + "block": "minecraft:bush", + "weight": 1 + }, + { + "block": "minecraft:air", + "weight": 4 } ] } \ No newline at end of file From f275725fb0d9e991d7864222031d5b6035c9df83 Mon Sep 17 00:00:00 2001 From: Julian Krings Date: Fri, 11 Jul 2025 12:35:56 +0200 Subject: [PATCH 10/11] update gitignore --- .gitignore | 2 ++ .idea/misc.xml | 5 --- .idea/vcs.xml | 6 ---- .idea/workspace.xml | 88 --------------------------------------------- 4 files changed, 2 insertions(+), 99 deletions(-) delete mode 100644 .idea/misc.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml diff --git a/.gitignore b/.gitignore index 8671ba3b..107878b8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,7 @@ _docs/ .iris/ +.idea/ +.gradle/ LICENSE diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 86f49135..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index c83fc086..00000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - { - "lastFilter": { - "state": "OPEN", - "assignee": "RePixelatedMC" - } -} - { - "selectedUrlAndAccountId": { - "url": "https://github.com/IrisDimensions/overworld.git", - "accountId": "a0bb647b-b73e-4c51-add7-e7243364570b" - } -} - { - "associatedIndex": 3 -} - - - - - - - - - - - - - - 1751004933703 - - - - - - \ No newline at end of file From 7f79ef4af5133ef2587a6205a34dac57f84e56f8 Mon Sep 17 00:00:00 2001 From: Julian Krings Date: Fri, 11 Jul 2025 12:41:35 +0200 Subject: [PATCH 11/11] v+ --- dimensions/overworld.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dimensions/overworld.json b/dimensions/overworld.json index f207aa96..cec7671a 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -1,5 +1,5 @@ { - "version": 30700, + "version": 31100, "name": "Overworld", "environment": "NORMAL", "dimensionAngleDeg": 69,