Merge pull request #333 from IrisDimensions/dev

31100

.gitignore

@@ -5,5 +5,7 @@
 _docs/
 
 .iris/
+.idea/
+.gradle/
 
 LICENSE

biomes/dev.json

@@ -0,0 +1,25 @@
+{
+    "name": "test-dev",
+
+    "layers": [
+        {
+            "palette": [
+                {
+                    "block": "minecraft:grass_block"
+                }
+            ]
+
+        }
+    ],
+    "decorators": [
+        "snippet/decorator/bush"
+    ],
+
+    "generators": [
+        {
+            "generator": "flat",
+            "max": 1,
+            "min": 1
+        }
+    ]
+}

biomes/hot/desert-dunes-red.json

@@ -133,18 +133,30 @@
     ],
     "decorators": [
         {
-            "verticalZoom": 5,
+            "chance": 0.0005,
-            "chance": 0.004,
             "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
         },
         {
             "chance": 0.005,
             "palette": [{"block": "minecraft:dead_bush"}]
-        }
+        },
+        "snippet/decorator/dry_grass"
     ]
 }

biomes/hot/desert-dunes.json

@@ -132,18 +132,30 @@
     ],
     "decorators": [
         {
-            "verticalZoom": 5,
+            "chance": 0.0005,
-            "chance": 0.004,
             "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
         },
         {
             "chance": 0.005,
             "palette": [{"block": "minecraft:dead_bush"}]
-        }
+        },
+        "snippet/decorator/dry_grass"
     ]
 }

biomes/hot/mountain-plains.json

@@ -22,13 +22,25 @@
             "palette": [{"block": "minecraft:red_sandstone"}]
         }
     ],
-    "decorators": [{
+    "decorators": [        {
-        "chance": 0.001,
+            "chance": 0.0005,
             "variance": {"style": "STATIC"},
             "stackMax": 5,
             "style": {"style": "STATIC"},
             "palette": [{"block": "minecraft:cactus"}],
-        "heightVariance": {"style": "STATIC"},
+            "stackMin": 1
+        },
+         {
+            "chance": 0.0005,
+            "variance": {"style": "STATIC"},
+            "stackMax": 5,
+            "style": {"style": "STATIC"},
+            "palette": [{"block": "minecraft:cactus"}],
+             "topPalette": [
+                {
+                    "block": "minecraft:cactus_flower"
+                }
+            ],
             "stackMin": 1
         }]
 }

biomes/hot/oasis.json

@@ -39,6 +39,7 @@
         {
             "chance": 0.005,
             "palette": [{"block": "minecraft:dead_bush"}]
-        }
+        },
+        "snippet/decorator/dry_grass"
     ]
 }

biomes/hot/small-valley.json

@@ -266,6 +266,7 @@
         {
             "chance": 0.5,
             "palette": [{"block": "minecraft:short_grass"}]
-        }
+        },
+        "snippet/decorator/dry_grass"
     ]
 }

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
 }

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
 }

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

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
 }

biomes/mesa/mesa.json

@@ -165,7 +165,8 @@
             }
         ],
         "style": {"style": "STATIC"}
-    }],
+    },
+        "snippet/decorator/dry_grass"],
     "childStyle": {
         "style": "NOWHERE_CELLULAR",
         "zoom": 1.2,

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": [{

biomes/mesa/valleys.json

@@ -266,6 +266,7 @@
         {
             "chance": 0.5,
             "palette": [{"block": "minecraft:short_grass"}]
-        }
+        },
+        "snippet/decorator/dry_grass"
     ]
 }

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
 }

biomes/mountain/calcite-base.json

@@ -24,7 +24,7 @@
             }},
              {
             "breakSurface": true,
-            "cave": "cavesv4/crystalized/main",
+            "cave": "cavesv4/crystalized/tubes",
             "rarity": 90,
             "caveStartHeight": {
                 "max": 200,

biomes/mountain/forest-extended.json

@@ -207,6 +207,7 @@
                     "data": {"age": 0}
                 }
             ]
-        }
+        },
+         "snippet/decorator/bush"
     ]
 }

biomes/mountain/forest.json

@@ -206,6 +206,8 @@
                     "data": {"age": 0}
                 }
             ]
-        }
+        },
+        "snippet/decorator/leaf",
+         "snippet/decorator/bush"
     ]
 }

biomes/mountain/mountain.json

@@ -100,7 +100,8 @@
         {
             "chance": 0.5,
             "palette": [{"block": "minecraft:short_grass"}]
-        }
+        },
+        "snippet/decorator/leaf"
     ],
     "slab": {
         "style": {"style": "STATIC"},

biomes/mountain/mplain-extended.json

@@ -173,6 +173,8 @@
         {
             "chance": 0.5,
             "palette": [{"block": "minecraft:short_grass"}]
-        }
+        },
+        "snippet/decorator/leaf",
+         "snippet/decorator/bush"
     ]
 }

biomes/mountain/plain-extended.json

@@ -121,6 +121,7 @@
         {
             "chance": 0.5,
             "palette": [{"block": "minecraft:short_grass"}]
-        }
+        },
+         "snippet/decorator/bush"
     ]
 }

biomes/mountain/plains.json

@@ -291,7 +291,8 @@
                     }
                 }
             ]
-        }
+        },
+         "snippet/decorator/bush"
     ],
     "childStyle": {
         "style": "IRIS_DOUBLE",

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,
@@ -144,6 +157,7 @@
             "zoom": 0.3,
             "palette": [{"block": "minecraft:tall_grass"}],
             "style": {"style": "STATIC"}
-        }
+        },
+        "snippet/decorator/dry_grass"
     ]
 }

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,
@@ -202,7 +215,8 @@
             "zoom": 0.3,
             "palette": [{"block": "minecraft:tall_grass"}],
             "style": {"style": "STATIC"}
-        }
+        },
+        "snippet/decorator/dry_grass"
     ],
     "biomeSkyScatter": [
         "DESERT",

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,
@@ -205,7 +218,8 @@
             "zoom": 0.3,
             "palette": [{"block": "minecraft:tall_grass"}],
             "style": {"style": "STATIC"}
-        }
+        },
+        "snippet/decorator/dry_grass"
     ],
     "biomeSkyScatter": [
         "DESERT",

biomes/savanna/forest.json

@@ -246,7 +246,8 @@
                 }
             ],
             "style": {"style": "STATIC"}
-        }
+        },
+        "snippet/decorator/dry_grass"
     ],
     "biomeSkyScatter": ["DESERT"]
 }

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,
@@ -230,7 +243,8 @@
             "zoom": 0.3,
             "palette": [{"block": "minecraft:tall_grass"}],
             "style": {"style": "STATIC"}
-        }
+        },
+        "snippet/decorator/dry_grass"
     ],
     "biomeSkyScatter": [
         "DESERT",

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,
@@ -225,7 +238,8 @@
             "zoom": 0.3,
             "palette": [{"block": "minecraft:tall_grass"}],
             "style": {"style": "STATIC"}
-        }
+        },
+        "snippet/decorator/dry_grass"
     ],
     "biomeSkyScatter": [
         "DESERT",

biomes/savanna/shore/beach.json

@@ -91,5 +91,6 @@
         "zoom": 0.3,
         "palette": [{"block": "minecraft:short_grass"}],
         "style": {"style": "STATIC"}
-    }]
+    },
+        "snippet/decorator/dry_grass"]
 }

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,

biomes/swamp/shore/beach.json

@@ -104,6 +104,7 @@
             "palette": [{"block": "minecraft:sugar_cane"}],
             "style": {"style": "STATIC"},
             "heightVariance": {"style": "STATIC"}
-        }
+        },
+        "snippet/decorator/firefly-bush"
     ]
 }

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,

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,

biomes/temperate/birch-denmyre.json

@@ -207,6 +207,8 @@
             "variance": {"style": "STATIC"},
             "palette": [{"block": "minecraft:tall_grass"}],
             "style": {"style": "STATIC"}
-        }
+        },
+         "snippet/decorator/wildflowers",
+         "snippet/decorator/bush"
     ]
 }

biomes/temperate/birch-forest-extended.json

@@ -216,7 +216,9 @@
             "zoom": 0.3,
             "palette": [{"block": "minecraft:tall_grass"}],
             "style": {"style": "STATIC"}
-        }
+        },
+         "snippet/decorator/wildflowers",
+         "snippet/decorator/bush"
     ],
     "childStyle": {
         "style": "NOWHERE_SIMPLEX",

biomes/temperate/birch-forest.json

@@ -229,7 +229,9 @@
             "zoom": 0.3,
             "palette": [{"block": "minecraft:tall_grass"}],
             "style": {"style": "STATIC"}
-        }
+        },
+         "snippet/decorator/wildflowers",
+         "snippet/decorator/bush"
     ],
     "childStyle": {
         "style": "NOWHERE_SIMPLEX",

biomes/temperate/birch-tall.json

@@ -235,7 +235,9 @@
         {
             "chance": 0.025,
             "palette": [{"block": "minecraft:birch_leaves"}]
-        }
+        },
+         "snippet/decorator/wildflowers",
+         "snippet/decorator/bush"
     ],
     "childStyle": {
         "style": "NOWHERE_SIMPLEX",

biomes/temperate/birch-thin.json

@@ -197,6 +197,8 @@
             "zoom": 0.3,
             "palette": [{"block": "minecraft:tall_grass"}],
             "style": {"style": "STATIC"}
-        }
+        },
+         "snippet/decorator/wildflowers",
+         "snippet/decorator/bush"
     ]
 }

biomes/temperate/calmplains.json

@@ -207,7 +207,9 @@
                 }
             ],
             "style": {"style": "STATIC"}
-        }
+        },
+        "snippet/decorator/leaf",
+         "snippet/decorator/bush"
     ],
     "generators": [{
         "generator": "mountain",

biomes/temperate/cherry-blossom-forest.json

@@ -403,6 +403,7 @@
                     "block": "minecraft:cobblestone_slab"
                 }
             ]
-        }
+        },
+         "snippet/decorator/bush"
     ]
 }

biomes/temperate/combo-forest-extended.json

@@ -293,6 +293,9 @@
             "variance": {"style": "STATIC"},
             "zoom": 0.2,
             "palette": [{"block": "minecraft:cobblestone_slab"}]
-        }
+        },
+        "snippet/decorator/leaf",
+         "snippet/decorator/wildflowers",
+         "snippet/decorator/bush"
     ]
 }

biomes/temperate/combo-forest.json

@@ -306,6 +306,9 @@
             "variance": {"style": "STATIC"},
             "zoom": 0.2,
             "palette": [{"block": "minecraft:cobblestone_slab"}]
-        }
+        },
+        "snippet/decorator/leaf",
+         "snippet/decorator/wildflowers",
+         "snippet/decorator/bush"
     ]
 }

biomes/temperate/croak.json

@@ -166,7 +166,9 @@
                     },
 
             "chance": 0.2
-        }
+        },
+        "snippet/decorator/leaf",
+         "snippet/decorator/bush"
     ],
     "objects": [
         {

biomes/temperate/fancyplains.json

@@ -124,7 +124,8 @@
                 }
             ],
             "style": {"style": "STATIC"}
-        }
+        },
+         "snippet/decorator/bush"
     ],
     "generators": [{
         "generator": "mountain",

biomes/temperate/flower-forest-extended.json

@@ -472,6 +472,8 @@
             "variance": {"style": "STATIC"},
             "zoom": 0.2,
             "palette": [{"block": "minecraft:cobblestone_slab"}]
-        }
+        },
+         "snippet/decorator/wildflowers",
+         "snippet/decorator/bush"
     ]
 }

biomes/temperate/flower-forest.json

@@ -483,6 +483,9 @@
             "variance": {"style": "STATIC"},
             "zoom": 0.2,
             "palette": [{"block": "minecraft:cobblestone_slab"}]
-        }
+        },
+        "snippet/decorator/leaf",
+         "snippet/decorator/wildflowers",
+         "snippet/decorator/bush"
     ]
 }

biomes/temperate/highlands.json

@@ -125,6 +125,7 @@
                 {"block": "minecraft:fern"}
             ],
             "style": {"style": "STATIC"}
-        }
+        },
+         "snippet/decorator/bush"
     ]
 }

biomes/temperate/island.json

@@ -126,6 +126,7 @@
                 "style": "NOWHERE",
                 "zoom": 0.28
             }
-        }
+        },
+         "snippet/decorator/bush"
     ]
 }

biomes/temperate/longtree-forest-extended.json

@@ -376,7 +376,9 @@
                 {"block": "minecraft:dandelion"},
                 {"block": "minecraft:oxeye_daisy"}
             ]
-        }
+        },
+        "snippet/decorator/leaf",
+         "snippet/decorator/bush"
     ],
     "effects": [{
         "particleAltX": 0.301,

biomes/temperate/longtree-forest.json

@@ -377,7 +377,9 @@
                 {"block": "minecraft:dandelion"},
                 {"block": "minecraft:oxeye_daisy"}
             ]
-        }
+        },
+        "snippet/decorator/leaf",
+         "snippet/decorator/bush"
     ],
     "effects": [{
         "particleAltX": 0.301,

biomes/temperate/lush-plains-red.json

@@ -198,6 +198,7 @@
                 "block": "minecraft:oak_leaves",
                 "data": {"persistent": true}
             }]
-        }
+        },
+         "snippet/decorator/bush"
     ]
 }

biomes/temperate/lush-plains-yellow.json

@@ -208,6 +208,8 @@
                 "block": "minecraft:oak_leaves",
                 "data": {"persistent": true}
             }]
-        }
+        },
+        "snippet/decorator/wildflowers",
+         "snippet/decorator/bush"
     ]
 }

biomes/temperate/lush-plains.json

@@ -216,7 +216,9 @@
                 "style": "STATIC",
                 "zoom": 0.8
             }
-        }
+        },
+        "snippet/decorator/wildflowers",
+         "snippet/decorator/bush"
     ],
     "childStyle": {
         "style": "CELLULAR_IRIS_THICK",

biomes/temperate/meadows.json

@@ -194,6 +194,9 @@
         {
             "chance": 0.1,
             "palette": [{"block": "minecraft:short_grass"}]
-        }
+        },
+        "snippet/decorator/leaf",
+         "snippet/decorator/wildflowers",
+         "snippet/decorator/bush"
     ]
 }

biomes/temperate/oak-denmyre.json

@@ -221,6 +221,8 @@
             "variance": {"style": "STATIC"},
             "zoom": 0.2,
             "palette": [{"block": "minecraft:cobblestone_slab"}]
-        }
+        },
+        "snippet/decorator/leaf",
+         "snippet/decorator/bush"
     ]
 }

biomes/temperate/oak-forest-extended.json

@@ -225,6 +225,8 @@
         {
             "chance": 0.05,
             "palette": [{"block": "minecraft:cobblestone_slab"}]
-        }
+        },
+        "snippet/decorator/leaf",
+         "snippet/decorator/bush"
     ]
 }

biomes/temperate/oak-forest-flat.json

@@ -243,6 +243,8 @@
         {
             "chance": 0.05,
             "palette": [{"block": "minecraft:cobblestone_slab"}]
-        }
+        },
+        "snippet/decorator/leaf",
+         "snippet/decorator/bush"
     ]
 }

biomes/temperate/oak-forest.json

@@ -227,6 +227,8 @@
         {
             "chance": 0.05,
             "palette": [{"block": "minecraft:cobblestone_slab"}]
-        }
+        },
+        "snippet/decorator/leaf",
+         "snippet/decorator/bush"
     ]
 }

biomes/temperate/osaka-red-forest.json

@@ -257,7 +257,9 @@
             "variance": {"style": "STATIC"},
             "zoom": 0.2,
             "palette": [{"block": "minecraft:blackstone_slab"}]
-        }
+        },
+        "snippet/decorator/leaf",
+         "snippet/decorator/bush"
     ],
     "effects": [{
         "particleAltX": 0.301,
@@ -268,5 +270,6 @@
         "particleOffset": 12,
         "interval": 550,
         "particleCount": 0
-    }]
+    }
+    ]
 }

biomes/temperate/osaka-violet-forest.json

@@ -279,6 +279,8 @@
             "variance": {"style": "STATIC"},
             "zoom": 0.2,
             "palette": [{"block": "minecraft:cobblestone_slab"}]
-        }
+        },
+        "snippet/decorator/leaf",
+         "snippet/decorator/bush"
     ]
 }

biomes/temperate/overflowed.json

@@ -274,7 +274,8 @@
         {
             "chance": 0.5,
             "palette": [{"block": "minecraft:short_grass"}]
-        }
+        },
+         "snippet/decorator/bush"
     ],
     "features": [{
         "rarity": 252,

biomes/temperate/plains.json

@@ -287,24 +287,8 @@
         {
             "chance": 0.5,
             "palette": [{"block": "minecraft:short_grass"}]
-        }
+        },
-    ],
+        "snippet/decorator/leaf",
-    "features": [{
+         "snippet/decorator/bush"
-        "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
-            }
-        }
-    }]
 }

biomes/temperate/plateau-extended.json

@@ -299,6 +299,7 @@
                     "block": "minecraft:poppy"
                 }
             ]
-        }
+        },
+         "snippet/decorator/bush"
     ]
 }

biomes/temperate/plateau.json

@@ -294,6 +294,7 @@
                     "block": "minecraft:poppy"
                 }
             ]
-        }
+        },
+         "snippet/decorator/bush"
     ]
 }

biomes/temperate/reaching-forest-violet.json

@@ -190,7 +190,8 @@
 
                 ],
             "style": {"style": "STATIC"}
-        }
+        },
+         "snippet/decorator/bush"
     ],
     "childShrinkFactor": 8
 }

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
 }

biomes/temperate/roughplains.json

@@ -248,7 +248,8 @@
                 }
             ],
             "style": {"style": "STATIC"}
-        }
+        },
+         "snippet/decorator/bush"
     ],
     "generators": [{
         "generator": "mountain",

biomes/temperate/sakura-forest.json

@@ -334,6 +334,7 @@
             "variance": {"style": "STATIC"},
             "zoom": 0.2,
             "palette": [{"block": "minecraft:cobblestone_slab"}]
-        }
+        },
+         "snippet/decorator/bush"
     ]
 }

biomes/temperate/shattered-plains.json

@@ -282,7 +282,8 @@
         {
             "chance": 0.5,
             "palette": [{"block": "minecraft:short_grass"}]
-        }
+        },
+         "snippet/decorator/bush"
     ],
     "features": [{
         "rarity": 252,

biomes/temperate/stranged-plains.json

@@ -212,7 +212,8 @@
                 }
             ],
             "forcePlace": false
-        }
+        },
+         "snippet/decorator/bush"
     ],
     "childStyle": {
         "style": "NOWHERE",

biomes/temperate/wilds-extended.json

@@ -177,7 +177,8 @@
                 "block": "minecraft:beetroots"
             }],
             "style": {"style": "NOWHERE"}
-        }
+        },
+         "snippet/decorator/bush"
     ],
     "effects": [{
         "interval": 250,

biomes/temperate/wilds.json

@@ -180,7 +180,8 @@
                 "block": "minecraft:beetroots"
             }],
             "style": {"style": "NOWHERE"}
-        }
+        },
+         "snippet/decorator/bush"
     ],
     "effects": [{
         "interval": 250,

biomes/terralost/ancient-sands.json

@@ -168,14 +168,28 @@
     ],
     "decorators": [
         {
-            "verticalZoom": 5,
+            "chance": 0.002,
-            "chance": 0.004,
             "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,

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

biomes/tundra/autumn-extended.json

@@ -480,6 +480,7 @@
         {
             "chance": 0.05,
             "palette": [{"block": "minecraft:cobblestone_slab"}]
-        }
+        },
+        "snippet/decorator/leaf"
     ]
 }

biomes/tundra/autumn.json

@@ -483,7 +483,8 @@
         {
             "chance": 0.05,
             "palette": [{"block": "minecraft:cobblestone_slab"}]
-        }
+        },
+        "snippet/decorator/leaf"
     ],
     "childShrinkFactor": 2.4
 }

biomes/tundra/bonsai-extended.json

@@ -330,6 +330,7 @@
             "variance": {"style": "STATIC"},
             "palette": [{"block": "minecraft:poppy"}],
             "style": {"style": "STATIC"}
-        }
+        },
+         "snippet/decorator/bush"
     ]
 }

biomes/tundra/bonsai-forest.json

@@ -331,6 +331,7 @@
             "variance": {"style": "STATIC"},
             "palette": [{"block": "minecraft:poppy"}],
             "style": {"style": "STATIC"}
-        }
+        },
+         "snippet/decorator/bush"
     ]
 }

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",

biomes/tundra/forest.json

@@ -213,7 +213,9 @@
             "zoom": 0.3,
             "palette": [{"block": "minecraft:short_grass"}],
             "style": {"style": "STATIC"}
-        }
+        },
+        "snippet/decorator/leaf",
+         "snippet/decorator/bush"
     ],
     "childShrinkFactor": 2.4
 }

biomes/tundra/redwood-extended-cliffs.json

@@ -408,6 +408,7 @@
         {
             "chance": 0.05,
             "palette": [{"block": "minecraft:cobblestone_slab"}]
-        }
+        },
+        "snippet/decorator/leaf"
     ]
 }

biomes/tundra/redwood-forest.json

@@ -370,7 +370,8 @@
         {
             "chance": 0.05,
             "palette": [{"block": "minecraft:cobblestone_slab"}]
-        }
+        },
+        "snippet/decorator/leaf"
     ],
     "childShrinkFactor": 2.4
 }

biomes/tundra/spruce-denmyre.json

@@ -257,6 +257,7 @@
             "variance": {"style": "STATIC"},
             "palette": [{"block": "minecraft:tall_grass"}],
             "style": {"style": "STATIC"}
-        }
+        },
+         "snippet/decorator/bush"
     ]
 }

biomes/tundra/taiga-extended.json

@@ -302,6 +302,7 @@
                 {"block": "minecraft:fern"}
             ],
             "style": {"style": "STATIC"}
-        }
+        },
+         "snippet/decorator/bush"
     ]
 }

dimensions/overworld.json

@@ -1,5 +1,5 @@
 {
-    "version": 31020,
+    "version": 31100,
     "name": "Overworld",
     "environment": "NORMAL",
     "dimensionAngleDeg": 69,
@@ -89,6 +89,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": [
             {
@@ -285,20 +353,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,

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"
     }
 }

entities/standard/passive/snowman.json

@@ -1 +1 @@
-{"type": "SNOWMAN"}
+{"type": "SNOW_GOLEM"}

entities/standard/passive/villager.json

@@ -1 +1,4 @@
-{"type": "VILLAGER"}
+{
+    "type": "VILLAGER",
+    "pickupItems": true
+}

entities/unique/amenhotep.json

@@ -6,8 +6,8 @@
         "chance": 1,
         "maxPitch": 0.7,
         "minPitch": 0.2,
-        "sound": "ENTITY_SKELETON_HORSE_DEATH",
+        "sound": "ENTITY.SKELETON_HORSE.DEATH",
-        "particleEffect": "ENCHANTMENT_TABLE",
+        "particleEffect": "ENCHANT",
         "particleCount": 100
     },
     "attributes": [{

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": [

entities/unique/lightning.json

@@ -1,3 +1,3 @@
 {
-    "type": "LIGHTNING"
+    "type": "LIGHTNING_BOLT"
 }

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,

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",

loot/structures/ruined-portal.json

@@ -291,7 +291,7 @@
                     "minLevel": 1
                 },
                 {
-                    "enchantment": "sweeping",
+                    "enchantment": "sweeping_edge",
                     "chance": 0.1,
                     "maxLevel": 3,
                     "minLevel": 1

loot/structures/village/savanna.json

@@ -24,7 +24,7 @@
             "slottypes": "STORAGE"
         },
         {
-            "type": "grass",
+            "type": "short_grass",
             "maxamount": 1,
             "rarity": 2,
             "slottypes": "STORAGE"

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
         }

snippet/decorator/bush.json

@@ -0,0 +1,22 @@
+{
+    "chance": 0.03,
+    "style": {
+        "style": "CLOVER_HERMITE",
+        "zoom": 0.52,
+        "exponent": 2.5,
+        "axialFracturing": true
+    },
+    "slopeCondition":{
+        "maximumSlope": 5
+    },
+    "palette": [
+        {
+            "block": "minecraft:bush",
+            "weight": 1
+        },
+                {
+            "block": "minecraft:air",
+            "weight": 4
+        }
+    ]
+}

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
+        }
+    ]
+}

snippet/decorator/firefly-bush.json

@@ -0,0 +1,11 @@
+{
+    "style": {
+        "style": "STATIC"
+    },
+    "chance": 0.01,
+    "palette": [
+        {
+            "block": "minecraft:firefly_bush"
+        }
+    ]
+}

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"
+            }
+        }
+    ]
+}