Merge pull request #324 from RePixelatedMC/repixelatedmc

V3800
IrisDimensions · Oct 23, 2023 · 83f717f · 83f717f
2 parents 9b8a396 + eef0809
commit 83f717f
Show file tree

Hide file tree

Showing 47 changed files with 458 additions and 534 deletions.
diff --git a/biomes/cursed/beach/cursed-beach.json b/biomes/cursed/beach/cursed-beach.json
@@ -52,17 +52,16 @@
 
     "objects": [{
         "place": [
-            "trees/darkoak/medgeneric1",
-            "trees/darkoak/medgeneric2",
-            "trees/darkoak/medgeneric3",
-            "trees/darkoak/medgeneric4",
-            "trees/darkoak/medgeneric5",
-            "trees/darkoak/medgeneric6",
-            "trees/darkoak/medgeneric7",
-            "trees/darkoak/medgeneric8",
-            "trees/darkoak/medgeneric9"
-
-
+            "trees/mixed/dotree1",
+            "trees/mixed/dotree2",
+            "trees/mixed/dotree3",
+            "trees/mixed/dotree4",
+            "trees/mixed/dotree5",
+            "trees/mixed/dotree6",
+            "trees/mixed/dotree7",
+            "trees/mixed/dotree8",
+            "trees/mixed/dotree9",
+            "trees/mixed/dotree10"
 
             ],
             "edit": [
@@ -78,7 +77,8 @@
             ],
 
         "carvingSupport": "SURFACE_ONLY",
-        "chance": 0.25,
+        "chance": 0.85,
+        "density": 1,
         "mode": "MIN_HEIGHT",
         "rotation": {
                 "yAxis": {

diff --git a/biomes/cursed/cursed-forest-tall.json b/biomes/cursed/cursed-forest-tall.json
@@ -0,0 +1,143 @@
+{
+    "name": "Cursed tall forest",
+    "derivative": "DEEP_DARK",
+    "vanillaDerivative": "DEEP_DARK",
+    "color": "#404040",
+    "entitySpawners": [
+        "corrupted/cursed-forest"
+    ],
+    "jigsawStructures": [
+        {
+            "structure": "woodland-mansion",
+            "rarity": 1200
+        }
+    ],
+    "customDerivitives": [
+        {
+            "category": "plains",
+            "id": "cursedforest",
+            "ambientParticle":{
+                "particle": "ASH",
+                "rarity": 3
+            },
+            "skyColor": "#111111",
+            "fogColor": "#111111",
+            "waterColor": "#660000",
+            "waterFogColor": "#660000",
+            "downfallType": "rain",
+            "grassColor": "#222222",
+            "foliageColor": "#444444"
+        }
+    ],
+
+     "effects": [
+        {
+            "sound": "MUSIC_NETHER_SOUL_SAND_VALLEY",
+            "soundDistance": 12,
+            "volume": 3.6,
+            "chance": 1,
+            "interval": 140000
+
+        },
+         {
+            "sound": "ENTITY_GHAST_SCREAM",
+            "soundDistance": 12,
+            "volume": 6.6,
+            "chance": 1,
+            "interval": 140000
+
+        }
+    ],
+
+    "generators": [{
+        "generator": "mountain",
+        "max": 37,
+        "min": 20
+    }],
+
+    "layers": [
+    {
+        "palette": [{"block": "minecraft:grass_block"}],
+        "maxHeight": 1,
+        "slopeCondition": {"maximumSlope": 4}
+    },
+    {
+        "palette": [{"block": "minecraft:deepslate"}],
+        "maxHeight": 12
+    }],
+    "wall": {"palette": [
+        {"block": "minecraft:deepslate"}
+    ]},
+
+    "objects": [{
+        "place": [
+            "trees/mixed/AmyLarge1",
+            "trees/mixed/AmyLarge2",
+            "trees/mixed/AmyLarge3",
+            "trees/mixed/AmyLarge4",
+            "trees/mixed/AmyLarge5",
+            "trees/mixed/AmyLarge6",
+            "trees/mixed/AmyLarge7",
+            "trees/mixed/AmyLarge8"
+            ],
+
+        "carvingSupport": "SURFACE_ONLY",
+        "density": 1,
+        "chance": 0.25,
+        "mode": "FAST_STILT",
+        "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 270,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+        }
+
+    },
+    {
+        "place": [
+            "clutter/arbusto1",
+            "clutter/arbusto2",
+            "clutter/arbusto3",
+            "clutter/arbusto4",
+            "clutter/arbusto5"
+            ],
+
+        "carvingSupport": "SURFACE_ONLY",
+        "chance": 0.15,
+        "mode": "FAST_STILT",
+        "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 270,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+        }
+
+    }
+
+
+    ],
+    "decorators": [
+        {
+            "chance": 0.01,
+            "palette": [{"block": "minecraft:tall_grass"}]
+        },
+        {
+            "chance": 0.5,
+            "palette": [{"block": "minecraft:grass"}]
+        },
+        {
+            "chance": 0.025,
+            "palette": [{"block": "minecraft:cobweb"}]
+        },
+         {
+            "chance": 0.015,
+            "palette": [{"block": "minecraft:wither_rose"}]
+        }
+    ]
+ }
diff --git a/biomes/cursed/cursed-forest.json b/biomes/cursed/cursed-forest.json
@@ -100,6 +100,7 @@
 
         "carvingSupport": "SURFACE_ONLY",
         "chance": 0.25,
+        "density": 1,
         "mode": "FAST_MIN_HEIGHT",
         "rotation": {
                 "yAxis": {

diff --git a/biomes/cursed/cursed-mountains.json b/biomes/cursed/cursed-mountains.json
@@ -7,7 +7,8 @@
         "corrupted/cursed-forest"
     ],
     "children": [
-        "cursed/cursed-forest"
+        "cursed/cursed-forest",
+        "cursed/cursed-forest-tall"
         ],
     "childShrinkFactor": 1,
     "childStyle":{

diff --git a/biomes/hot/desert-dunes.json b/biomes/hot/desert-dunes.json
@@ -16,7 +16,7 @@
         },
         {
             "structure": "pyramid-desert",
-            "rarity": 1500
+            "rarity": 1750
 
         }
     ],

diff --git a/biomes/mesa/mesa.json b/biomes/mesa/mesa.json
@@ -9,6 +9,12 @@
         "ERODED_BADLANDS",
         "ERODED_BADLANDS"
     ],
+    "jigsawStructures": [
+        {
+            "structure": "village-savanna",
+            "rarity": 1200
+        }
+    ],
     "children": [
         "mesa/valleys",
         "mesa/dark",

diff --git a/biomes/mesa/plateau-dirt.json b/biomes/mesa/plateau-dirt.json
@@ -10,6 +10,12 @@
         "max": 98,
         "generator": "cracked-cliffs"
     }],
+    "jigsawStructures": [
+        {
+            "structure": "village-savanna",
+            "rarity": 1200
+        }
+    ],
     "biomeStyle": {"style": "SIMPLEX"},
     "layers": [
         {

diff --git a/biomes/savanna/acacia-denmyre.json b/biomes/savanna/acacia-denmyre.json
@@ -12,6 +12,12 @@
         "waterColor": "#33CB99",
         "downfallType": "none"
     }],
+      "jigsawStructures": [
+        {
+            "structure": "village-savanna",
+            "rarity": 1200
+        }
+    ],
     "generators": [{
         "min": 4,
         "max": 7,

diff --git a/biomes/savanna/forest.json b/biomes/savanna/forest.json
@@ -8,6 +8,12 @@
         "SAVANNA",
         "DESERT"
     ],
+    "jigsawStructures": [
+        {
+            "structure": "village-savanna",
+            "rarity": 1200
+        }
+    ],
     "customDerivitives": [{
         "category": "savanna",
         "id": "savanna_forest",

diff --git a/biomes/temperate/birch-forest.json b/biomes/temperate/birch-forest.json
@@ -7,6 +7,16 @@
     "children": [
         "temperate/birch-thin",
         "temperate/birch-forest-extended"
+    ],
+     "jigsawStructures": [
+        {
+            "structure": "pillager-outpost",
+            "rarity": 800
+        },
+        {
+            "structure": "village-plains",
+            "rarity": 1200
+        }
     ],
     "generators": [
         {

diff --git a/biomes/temperate/calmplains.json b/biomes/temperate/calmplains.json
@@ -13,6 +13,16 @@
         {"block": "minecraft:stone"},
         {"block": "minecraft:cobblestone"}
     ]},
+     "jigsawStructures": [
+        {
+            "structure": "pillager-outpost",
+            "rarity": 800
+        },
+        {
+            "structure": "village-plains",
+            "rarity": 1200
+        }
+    ],
     "objects": [{
         "place": [
             "trees/mixed/pollup1",

diff --git a/biomes/temperate/combo-forest.json b/biomes/temperate/combo-forest.json
@@ -7,6 +7,16 @@
     "children": [
         "temperate/oak-denmyre",
         "temperate/combo-forest-extended"
+    ],
+     "jigsawStructures": [
+        {
+            "structure": "pillager-outpost",
+            "rarity": 800
+        },
+        {
+            "structure": "village-plains",
+            "rarity": 1200
+        }
     ],
     "generators": [{
         "min": 5,

diff --git a/biomes/temperate/flower-forest.json b/biomes/temperate/flower-forest.json
@@ -11,6 +11,16 @@
         "grassColor": "#48A620",
         "category": "forest"
     }],
+     "jigsawStructures": [
+        {
+            "structure": "pillager-outpost",
+            "rarity": 800
+        },
+        {
+            "structure": "village-plains",
+            "rarity": 1200
+        }
+    ],
     "children": ["temperate/flower-forest-extended"],
     "generators": [{
         "min": 4,

diff --git a/biomes/temperate/meadows.json b/biomes/temperate/meadows.json
@@ -12,6 +12,16 @@
         "downfallType": "rain",
         "grassColor": "#83BB6D"
     }],
+     "jigsawStructures": [
+        {
+            "structure": "pillager-outpost",
+            "rarity": 800
+        },
+        {
+            "structure": "village-plains",
+            "rarity": 1200
+        }
+    ],
     "generators": [{
         "min": 5,
         "max": 12,

diff --git a/biomes/temperate/oak-denmyre.json b/biomes/temperate/oak-denmyre.json
@@ -9,6 +9,16 @@
         "max": 12,
         "generator": "plain"
     }],
+     "jigsawStructures": [
+        {
+            "structure": "pillager-outpost",
+            "rarity": 800
+        },
+        {
+            "structure": "village-plains",
+            "rarity": 1200
+        }
+    ],
     "wall": {
         "style": {"style": "STATIC"},
         "palette": [

diff --git a/biomes/temperate/oak-forest-flat.json b/biomes/temperate/oak-forest-flat.json
@@ -10,6 +10,16 @@
         "grassColor": "#77A620",
         "category": "forest"
     }],
+     "jigsawStructures": [
+        {
+            "structure": "pillager-outpost",
+            "rarity": 800
+        },
+        {
+            "structure": "village-plains",
+            "rarity": 1200
+        }
+    ],
     "carving":{
         "caves": [
             {

diff --git a/biomes/temperate/oak-forest.json b/biomes/temperate/oak-forest.json
@@ -10,6 +10,7 @@
         "grassColor": "#77A620",
         "category": "forest"
     }],
+
     "children": ["temperate/oak-forest-extended"],
     "generators": [
         {