From 5e423b83d004fbbb3716026b7eea88c9524a28f1 Mon Sep 17 00:00:00 2001
From: Brian Fopiano <mypsn1550@gmail.com>
Date: Wed, 28 Jul 2021 18:14:38 -0700
Subject: [PATCH] Coloring

---
 biomes/swamp/cambian-drift.json          | 18 ++++--------------
 biomes/temperate/longtree-forest.json    |  6 ++++++
 biomes/temperate/oak-forest.json         | 19 ++++++++-----------
 biomes/temperate/sakura-pink-forest.json |  2 +-
 4 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/biomes/swamp/cambian-drift.json b/biomes/swamp/cambian-drift.json
index c9a1e5a7..ab2dd275 100644
--- a/biomes/swamp/cambian-drift.json
+++ b/biomes/swamp/cambian-drift.json
@@ -4,13 +4,13 @@
     "rarity": 1,
     "color": "#489A20",
     "vanillaDerivative": "DARK_FOREST",
-    "children": ["swamp/sea/lake"],
     "generators": [{
-        "min": -7,
-        "max": -3,
-        "generator": "plain"
+        "min": -3,
+        "max": 15,
+        "generator": "mountain"
     }],
     "customDerivitives": [{
+        "category": "forest",
         "id": "swamp_cambian_drift",
         "waterColor": "#684D1A",
         "foliageColor": "2B4A00",
@@ -55,16 +55,6 @@
             ]
         }
     ],
-    "jigsawStructures": [
-        {
-            "rarity": 1700,
-            "structure": "pillager_outpost"
-        },
-        {
-            "rarity": 1000,
-            "structure": "village-tundra"
-        }
-    ],
     "decorators": [
         {
             "chance": 0.03,
diff --git a/biomes/temperate/longtree-forest.json b/biomes/temperate/longtree-forest.json
index 45165491..7dcad400 100644
--- a/biomes/temperate/longtree-forest.json
+++ b/biomes/temperate/longtree-forest.json
@@ -13,6 +13,12 @@
         "interval": 550,
         "particleCount": 3
     }],
+    "customDerivitives": [{
+        "id": "longtree_forest",
+        "foliageColor": "#58AB24",
+        "grassColor": "#4AB71C",
+        "category": "forest"
+    }],
     "jigsawStructures": [
         {
             "rarity": 1000,
diff --git a/biomes/temperate/oak-forest.json b/biomes/temperate/oak-forest.json
index 7e3674b1..c709b436 100644
--- a/biomes/temperate/oak-forest.json
+++ b/biomes/temperate/oak-forest.json
@@ -13,6 +13,12 @@
         "max": 40,
         "min": 0
     }],
+    "customDerivitives": [{
+        "id": "oak_forest",
+        "foliageColor": "#64B233",
+        "grassColor": "#48A620",
+        "category": "forest"
+    }],
     "rarity": 3,
     "jigsawStructures": [
         {
@@ -135,17 +141,7 @@
                 "trees/oak/shoakgeneric3",
                 "trees/oak/shoakgeneric4",
                 "trees/oak/shoakgeneric4",
-                "trees/oak/toak1",
-                "trees/oak/toak2",
-                "trees/oak/toak3",
-                "trees/oak/toak4",
-                "trees/oak/toak5",
-                "trees/oak/toak6",
-                "trees/oak/toak7",
-                "trees/oak/toak8",
-                "trees/oak/toak9",
-                "trees/oak/toak10",
-                "trees/oak/toak11",
+
                 "trees/oak/generic1",
                 "trees/oak/generic2",
                 "trees/oak/generic3",
@@ -157,6 +153,7 @@
                 "clutter/sbush3"
             ],
             "chance": 0.9,
+            "density": 2,
             "rotation": {
                 "enabled": true,
                 "yAxis": {
diff --git a/biomes/temperate/sakura-pink-forest.json b/biomes/temperate/sakura-pink-forest.json
index 3c566ec4..8a3a5af7 100644
--- a/biomes/temperate/sakura-pink-forest.json
+++ b/biomes/temperate/sakura-pink-forest.json
@@ -214,7 +214,7 @@
     "biomeStyle": {"style": "SIMPLEX"},
     "decorators": [
         {
-            "chance": 0.8,
+            "chance": 0.6,
             "variance": {"style": "STATIC"},
             "zoom": 0.2,
             "palette": [