From 35f6d02ce196af5504c46debd6179429008ee251 Mon Sep 17 00:00:00 2001
From: K530 <51176691+K530-hub@users.noreply.github.com>
Date: Fri, 21 Jan 2022 21:38:25 +0300
Subject: [PATCH 1/3] Small fix of cave vines

---
 biomes/carving/lush.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/biomes/carving/lush.json b/biomes/carving/lush.json
index 991946ee..82aeff63 100644
--- a/biomes/carving/lush.json
+++ b/biomes/carving/lush.json
@@ -63,6 +63,10 @@
       "scaleStack": true,
       "stackMin": 4,
       "stackMax": 25,
+      "topPalette": [
+              {"block": "minecraft:cave_vines"},
+              {"block": "minecraft:cave_vines","data": {"berries": "true"}}
+            ],
       "palette": [
         { "block": "minecraft:cave_vines_plant", "data": { "berries": false } },
         { "block": "minecraft:cave_vines_plant", "data": { "berries": true } }

From 101c1e645f385f45832abf128ff09d9403c83da6 Mon Sep 17 00:00:00 2001
From: Brian Fopiano <mypsn1550@gmail.com>
Date: Wed, 2 Feb 2022 16:55:11 -0800
Subject: [PATCH 2/3] Unique, and Dank Tweaked so there are not infinite of
 them

Only allowing Initial Spawns for now
---
 entities/unique/aeternum.json |  7 +-----
 entities/unique/dan.json      |  7 +-----
 entities/unique/fred.json     |  4 +---
 spawners/dank.json            | 41 ++++++++++++++++-------------------
 4 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/entities/unique/aeternum.json b/entities/unique/aeternum.json
index 56fe834a..97d6370b 100644
--- a/entities/unique/aeternum.json
+++ b/entities/unique/aeternum.json
@@ -1,8 +1,3 @@
 {
-    "type": "CAT",
-    "silent": true,
-    "passengers": [{
-        "type": "PARROT",
-        "customNameVisible": true
-    }]
+    "type": "PARROT"
 }
diff --git a/entities/unique/dan.json b/entities/unique/dan.json
index 89e51ae4..0af2deb9 100644
--- a/entities/unique/dan.json
+++ b/entities/unique/dan.json
@@ -1,8 +1,3 @@
 {
-    "type": "VEX",
-    "passengers": [{
-        "type": "CREEPER",
-        "customNameVisible": true,
-        "invulnerable": true
-    }]
+    "type": "VEX"
 }
diff --git a/entities/unique/fred.json b/entities/unique/fred.json
index 28e0b4fb..3495cd2d 100644
--- a/entities/unique/fred.json
+++ b/entities/unique/fred.json
@@ -1,9 +1,7 @@
 {
-    "type": "VEX",
+    "type": "PANDA",
     "passengers": [{
         "type": "PANDA",
-        "invulnerable": true,
-        "baby": true,
         "pandaMainGene": "PLAYFUL",
         "pandaHiddenGene": "AGGRESSIVE"
     }]
diff --git a/spawners/dank.json b/spawners/dank.json
index aaea16da..aeaa12a2 100644
--- a/spawners/dank.json
+++ b/spawners/dank.json
@@ -1,24 +1,21 @@
 {
-    "spawns": [
-        {
-            "entity": "unique/dan",
-            "maxSpawns": 2,
-            "minSpawns": 1,
-            "rarity": 1
-        },
-        {
-            "entity": "unique/brian",
-            "maxSpawns": 2,
-            "minSpawns": 1,
-            "rarity": 1
-        },
-        {
-            "entity": "unique/aeternum",
-            "maxSpawns": 2,
-            "minSpawns": 1,
-            "rarity": 1
+    "maximumRate": {
+        "amount": 3,
+        "per": {
+            "minecraftDays": 3
         }
-    ],
-    "group": "NORMAL",
-    "weather": "DOWNFALL"
-}
+    },
+    "maxEntitiesPerChunk": 2,
+    "initialSpawns": [{
+    "entity": "unique/brian",
+    "rarity": 15,
+    "maxSpawns": 2,
+    "minSpawns": 1
+    },{
+    "entity": "unique/skelepirate",
+    "rarity": 1,
+    "maxSpawns": 3,
+    "minSpawns": 1
+   }]
+
+}
\ No newline at end of file

From 1499b140d25d31b3745de6ce77fb3b4d2e2b064a Mon Sep 17 00:00:00 2001
From: Brian Fopiano <mypsn1550@gmail.com>
Date: Wed, 2 Feb 2022 16:55:53 -0800
Subject: [PATCH 3/3] Village Fixes? Maybe?

Less Villagers, Again only using Inital instead of Directed
---
 spawners/pillager-respawn.json |  2 +-
 spawners/pillager.json         | 16 ++++++++++++----
 spawners/skelepirate.json      |  2 +-
 spawners/villager.json         | 27 ++++++++++++++++++---------
 4 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/spawners/pillager-respawn.json b/spawners/pillager-respawn.json
index 0625eca7..96defb08 100644
--- a/spawners/pillager-respawn.json
+++ b/spawners/pillager-respawn.json
@@ -14,6 +14,6 @@
         "entity": "standard/hostile/pillager",
         "maxSpawns": 5,
         "minSpawns": 3,
-        "rarity": 1
+        "rarity": 4
     }]
 }
diff --git a/spawners/pillager.json b/spawners/pillager.json
index c8db7152..eb527985 100644
--- a/spawners/pillager.json
+++ b/spawners/pillager.json
@@ -1,6 +1,14 @@
-{"initialSpawns": [{
+{
+    "maximumRate": {
+        "amount": 3,
+        "per": {
+            "minecraftDays": 6
+        }
+    },
+    "maxEntitiesPerChunk": 2,
+    "initialSpawns": [{
     "entity": "standard/hostile/pillager",
-    "rarity": 1,
-    "maxSpawns": 5,
-    "minSpawns": 4
+    "rarity": 2,
+    "maxSpawns": 2,
+    "minSpawns": 1
 }]}
diff --git a/spawners/skelepirate.json b/spawners/skelepirate.json
index ec0b5bff..741b6450 100644
--- a/spawners/skelepirate.json
+++ b/spawners/skelepirate.json
@@ -2,6 +2,6 @@
     "initialSpawns": [{
     "entity": "unique/skelepirate",
     "rarity": 1,
-    "maxSpawns": 2,
+    "maxSpawns": 3,
     "minSpawns": 1
 }]}
diff --git a/spawners/villager.json b/spawners/villager.json
index 43dce48d..86df5b26 100644
--- a/spawners/villager.json
+++ b/spawners/villager.json
@@ -1,12 +1,21 @@
 {
-    "spawns": [
-        {
-            "entity": "standard/passive/villager",
-            "rarity": 1
-        },
-        {
-            "entity": "standard/passive/golem",
-            "rarity": 24
+    "maximumRate": {
+        "amount": 3,
+        "per": {
+            "minecraftDays": 3
         }
-    ]
+    },
+    "maxEntitiesPerChunk": 2,
+    "initialSpawns": [{
+    "entity": "unique/iron_golem",
+    "rarity": 15,
+    "maxSpawns": 2,
+    "minSpawns": 1
+    },{
+    "entity": "standard/passive/villager",
+    "rarity": 1,
+    "maxSpawns": 3,
+    "minSpawns": 1
+   }]
+
 }
\ No newline at end of file