Update to 21w03a

MaximumFX · Jan 29, 2021 · 959b384 · 959b384
1 parent c7c49a3
commit 959b384
Show file tree

Hide file tree

Showing 77 changed files with 457 additions and 263 deletions.
diff --git a/worldgen/biome/badlands.json b/worldgen/biome/badlands.json
@@ -54,6 +54,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:patch_grass_badlands",
       "minecraft:patch_dead_bush_badlands",
       "minecraft:brown_mushroom_normal",

diff --git a/worldgen/biome/badlands_plateau.json b/worldgen/biome/badlands_plateau.json
@@ -54,6 +54,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:patch_grass_badlands",
       "minecraft:patch_dead_bush_badlands",
       "minecraft:brown_mushroom_normal",

diff --git a/worldgen/biome/bamboo_jungle.json b/worldgen/biome/bamboo_jungle.json
@@ -51,6 +51,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:bamboo",
       "minecraft:bamboo_vegetation",
       "minecraft:flower_warm",

diff --git a/worldgen/biome/bamboo_jungle_hills.json b/worldgen/biome/bamboo_jungle_hills.json
@@ -51,6 +51,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:bamboo",
       "minecraft:bamboo_vegetation",
       "minecraft:flower_warm",

diff --git a/worldgen/biome/beach.json b/worldgen/biome/beach.json
@@ -51,6 +51,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:flower_default",
       "minecraft:patch_grass_badlands",
       "minecraft:brown_mushroom_normal",

diff --git a/worldgen/biome/birch_forest.json b/worldgen/biome/birch_forest.json
@@ -52,6 +52,7 @@
     [],
     [
       "minecraft:forest_flower_vegetation",
+      "minecraft:glow_lichen",
       "minecraft:trees_birch",
       "minecraft:flower_default",
       "minecraft:patch_grass_forest",

diff --git a/worldgen/biome/birch_forest_hills.json b/worldgen/biome/birch_forest_hills.json
@@ -52,6 +52,7 @@
     [],
     [
       "minecraft:forest_flower_vegetation",
+      "minecraft:glow_lichen",
       "minecraft:trees_birch",
       "minecraft:flower_default",
       "minecraft:patch_grass_forest",

diff --git a/worldgen/biome/cold_ocean.json b/worldgen/biome/cold_ocean.json
@@ -55,6 +55,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:trees_water",
       "minecraft:flower_default",
       "minecraft:patch_grass_badlands",

diff --git a/worldgen/biome/dark_forest.json b/worldgen/biome/dark_forest.json
@@ -54,6 +54,7 @@
     [
       "minecraft:dark_forest_vegetation_brown",
       "minecraft:forest_flower_vegetation",
+      "minecraft:glow_lichen",
       "minecraft:flower_default",
       "minecraft:patch_grass_forest",
       "minecraft:brown_mushroom_normal",

diff --git a/worldgen/biome/dark_forest_hills.json b/worldgen/biome/dark_forest_hills.json
@@ -54,6 +54,7 @@
     [
       "minecraft:dark_forest_vegetation_red",
       "minecraft:forest_flower_vegetation",
+      "minecraft:glow_lichen",
       "minecraft:flower_default",
       "minecraft:patch_grass_forest",
       "minecraft:brown_mushroom_normal",

diff --git a/worldgen/biome/deep_cold_ocean.json b/worldgen/biome/deep_cold_ocean.json
@@ -55,6 +55,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:trees_water",
       "minecraft:flower_default",
       "minecraft:patch_grass_badlands",

diff --git a/worldgen/biome/deep_frozen_ocean.json b/worldgen/biome/deep_frozen_ocean.json
@@ -60,6 +60,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:trees_water",
       "minecraft:flower_default",
       "minecraft:patch_grass_badlands",

diff --git a/worldgen/biome/deep_lukewarm_ocean.json b/worldgen/biome/deep_lukewarm_ocean.json
@@ -55,6 +55,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:trees_water",
       "minecraft:flower_default",
       "minecraft:patch_grass_badlands",

diff --git a/worldgen/biome/deep_ocean.json b/worldgen/biome/deep_ocean.json
@@ -55,6 +55,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:trees_water",
       "minecraft:flower_default",
       "minecraft:patch_grass_badlands",

diff --git a/worldgen/biome/deep_warm_ocean.json b/worldgen/biome/deep_warm_ocean.json
@@ -55,6 +55,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:trees_water",
       "minecraft:flower_default",
       "minecraft:patch_grass_badlands",

diff --git a/worldgen/biome/desert.json b/worldgen/biome/desert.json
@@ -53,6 +53,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:flower_default",
       "minecraft:patch_grass_badlands",
       "minecraft:patch_dead_bush_2",

diff --git a/worldgen/biome/desert_hills.json b/worldgen/biome/desert_hills.json
@@ -52,6 +52,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:flower_default",
       "minecraft:patch_grass_badlands",
       "minecraft:patch_dead_bush_2",

diff --git a/worldgen/biome/desert_lakes.json b/worldgen/biome/desert_lakes.json
@@ -52,6 +52,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:flower_default",
       "minecraft:patch_grass_badlands",
       "minecraft:patch_dead_bush_2",

diff --git a/worldgen/biome/dripstone_caves.json b/worldgen/biome/dripstone_caves.json
@@ -57,6 +57,7 @@
     ],
     [
       "minecraft:patch_tall_grass_2",
+      "minecraft:glow_lichen",
       "minecraft:plain_vegetation",
       "minecraft:flower_plain_decorated",
       "minecraft:patch_grass_plain",
@@ -77,9 +78,65 @@
     "minecraft:ruined_portal"
   ],
   "spawners": {
-    "monster": [],
+    "monster": [
+      {
+        "type": "minecraft:spider",
+        "weight": 100,
+        "minCount": 4,
+        "maxCount": 4
+      },
+      {
+        "type": "minecraft:zombie",
+        "weight": 95,
+        "minCount": 4,
+        "maxCount": 4
+      },
+      {
+        "type": "minecraft:zombie_villager",
+        "weight": 5,
+        "minCount": 1,
+        "maxCount": 1
+      },
+      {
+        "type": "minecraft:skeleton",
+        "weight": 100,
+        "minCount": 4,
+        "maxCount": 4
+      },
+      {
+        "type": "minecraft:creeper",
+        "weight": 100,
+        "minCount": 4,
+        "maxCount": 4
+      },
+      {
+        "type": "minecraft:slime",
+        "weight": 100,
+        "minCount": 4,
+        "maxCount": 4
+      },
+      {
+        "type": "minecraft:enderman",
+        "weight": 10,
+        "minCount": 1,
+        "maxCount": 4
+      },
+      {
+        "type": "minecraft:witch",
+        "weight": 5,
+        "minCount": 1,
+        "maxCount": 1
+      }
+    ],
     "creature": [],
-    "ambient": [],
+    "ambient": [
+      {
+        "type": "minecraft:bat",
+        "weight": 10,
+        "minCount": 8,
+        "maxCount": 8
+      }
+    ],
     "water_creature": [],
     "water_ambient": [],
     "misc": []

diff --git a/worldgen/biome/eroded_badlands.json b/worldgen/biome/eroded_badlands.json
@@ -54,6 +54,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:patch_grass_badlands",
       "minecraft:patch_dead_bush_badlands",
       "minecraft:brown_mushroom_normal",

diff --git a/worldgen/biome/flower_forest.json b/worldgen/biome/flower_forest.json
@@ -52,6 +52,7 @@
     [],
     [
       "minecraft:forest_flower_vegetation_common",
+      "minecraft:glow_lichen",
       "minecraft:forest_flower_trees",
       "minecraft:flower_forest",
       "minecraft:patch_grass_badlands",

diff --git a/worldgen/biome/forest.json b/worldgen/biome/forest.json
@@ -52,6 +52,7 @@
     [],
     [
       "minecraft:forest_flower_vegetation",
+      "minecraft:glow_lichen",
       "minecraft:birch_other",
       "minecraft:flower_default",
       "minecraft:patch_grass_forest",

diff --git a/worldgen/biome/frozen_ocean.json b/worldgen/biome/frozen_ocean.json
@@ -60,6 +60,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:trees_water",
       "minecraft:flower_default",
       "minecraft:patch_grass_badlands",

diff --git a/worldgen/biome/frozen_river.json b/worldgen/biome/frozen_river.json
@@ -51,6 +51,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:trees_water",
       "minecraft:flower_default",
       "minecraft:patch_grass_badlands",

diff --git a/worldgen/biome/giant_spruce_taiga.json b/worldgen/biome/giant_spruce_taiga.json
@@ -54,6 +54,7 @@
     [],
     [
       "minecraft:patch_large_fern",
+      "minecraft:glow_lichen",
       "minecraft:trees_giant_spruce",
       "minecraft:flower_default",
       "minecraft:patch_grass_taiga",

diff --git a/worldgen/biome/giant_spruce_taiga_hills.json b/worldgen/biome/giant_spruce_taiga_hills.json
@@ -54,6 +54,7 @@
     [],
     [
       "minecraft:patch_large_fern",
+      "minecraft:glow_lichen",
       "minecraft:trees_giant_spruce",
       "minecraft:flower_default",
       "minecraft:patch_grass_taiga",

diff --git a/worldgen/biome/giant_tree_taiga.json b/worldgen/biome/giant_tree_taiga.json
@@ -54,6 +54,7 @@
     [],
     [
       "minecraft:patch_large_fern",
+      "minecraft:glow_lichen",
       "minecraft:trees_giant",
       "minecraft:flower_default",
       "minecraft:patch_grass_taiga",

diff --git a/worldgen/biome/giant_tree_taiga_hills.json b/worldgen/biome/giant_tree_taiga_hills.json
@@ -54,6 +54,7 @@
     [],
     [
       "minecraft:patch_large_fern",
+      "minecraft:glow_lichen",
       "minecraft:trees_giant",
       "minecraft:flower_default",
       "minecraft:patch_grass_taiga",

diff --git a/worldgen/biome/gravelly_mountains.json b/worldgen/biome/gravelly_mountains.json
@@ -54,6 +54,7 @@
       "minecraft:ore_infested"
     ],
     [
+      "minecraft:glow_lichen",
       "minecraft:trees_mountain",
       "minecraft:flower_default",
       "minecraft:patch_grass_badlands",

diff --git a/worldgen/biome/ice_spikes.json b/worldgen/biome/ice_spikes.json
@@ -54,6 +54,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:spruce_snowy",
       "minecraft:flower_default",
       "minecraft:patch_grass_badlands",

diff --git a/worldgen/biome/jungle.json b/worldgen/biome/jungle.json
@@ -51,6 +51,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:bamboo_light",
       "minecraft:trees_jungle",
       "minecraft:flower_warm",

diff --git a/worldgen/biome/jungle_edge.json b/worldgen/biome/jungle_edge.json
@@ -51,6 +51,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:trees_jungle_edge",
       "minecraft:flower_warm",
       "minecraft:patch_grass_jungle",

diff --git a/worldgen/biome/jungle_hills.json b/worldgen/biome/jungle_hills.json
@@ -51,6 +51,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:bamboo_light",
       "minecraft:trees_jungle",
       "minecraft:flower_warm",

diff --git a/worldgen/biome/lukewarm_ocean.json b/worldgen/biome/lukewarm_ocean.json
@@ -55,6 +55,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:trees_water",
       "minecraft:flower_default",
       "minecraft:patch_grass_badlands",

diff --git a/worldgen/biome/modified_badlands_plateau.json b/worldgen/biome/modified_badlands_plateau.json
@@ -54,6 +54,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:patch_grass_badlands",
       "minecraft:patch_dead_bush_badlands",
       "minecraft:brown_mushroom_normal",

diff --git a/worldgen/biome/modified_gravelly_mountains.json b/worldgen/biome/modified_gravelly_mountains.json
@@ -54,6 +54,7 @@
       "minecraft:ore_infested"
     ],
     [
+      "minecraft:glow_lichen",
       "minecraft:trees_mountain",
       "minecraft:flower_default",
       "minecraft:patch_grass_badlands",

diff --git a/worldgen/biome/modified_jungle.json b/worldgen/biome/modified_jungle.json
@@ -51,6 +51,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:trees_jungle",
       "minecraft:flower_warm",
       "minecraft:patch_grass_jungle",

diff --git a/worldgen/biome/modified_jungle_edge.json b/worldgen/biome/modified_jungle_edge.json
@@ -51,6 +51,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:trees_jungle_edge",
       "minecraft:flower_warm",
       "minecraft:patch_grass_jungle",

diff --git a/worldgen/biome/modified_wooded_badlands_plateau.json b/worldgen/biome/modified_wooded_badlands_plateau.json
@@ -54,6 +54,7 @@
     ],
     [],
     [
+      "minecraft:glow_lichen",
       "minecraft:oak_badlands",
       "minecraft:patch_grass_badlands",
       "minecraft:patch_dead_bush_badlands",

diff --git a/worldgen/biome/mountain_edge.json b/worldgen/biome/mountain_edge.json
@@ -54,6 +54,7 @@
       "minecraft:ore_infested"
     ],
     [
+      "minecraft:glow_lichen",
       "minecraft:trees_mountain_edge",
       "minecraft:flower_default",
       "minecraft:patch_grass_badlands",

diff --git a/worldgen/biome/mountains.json b/worldgen/biome/mountains.json
@@ -54,6 +54,7 @@
       "minecraft:ore_infested"
     ],
     [
+      "minecraft:glow_lichen",
       "minecraft:trees_mountain",
       "minecraft:flower_default",
       "minecraft:patch_grass_badlands",