Update bristled_forest & grim_woodlands

DeathShadez · DeathShadez · commit d80baaf19b7c · 2023-07-18T21:41:16.000-04:00
diff --git a/biome-providers/stages/aether_distribution.yml b/biome-providers/stages/aether_distribution.yml
@@ -20,7 +20,7 @@ stages:
       - AETHER_DRIFTLANDS: 1
       - AETHER_LAVENDER_DRIFTLANDS: 1
       - AETHER_CRIMSON_HEIGHTS: 1
-      - AETHER_WEBBED_FOREST: 1
+      - AETHER_GRIM_WOODLANDS: 1
       - AETHER_DISCUS_AETHER: 1
       - AETHER_CLOUDLANDS: 1
     to: 
diff --git a/biomes/abstract/aether.yml b/biomes/abstract/aether.yml
@@ -22,6 +22,8 @@ vanilla: minecraft:windswept_hills
 #  downfall: 0.5
 
 features:
+  preprocessors:
+    - CLOUD_PLANE
   postprocessors:
     - HANGING_LANTERNS
   structures:
diff --git a/biomes/aether/aether_grim_meadows.yml b/biomes/aether/aether_grim_meadows.yml
@@ -1,15 +1,15 @@
-id: AETHER_WEBBED_FOREST
+id: AETHER_GRIM_WOODLANDS
 type: BIOME
 extends: [ AETHER, AETHER_PLAINS, EQ_DEFAULT]
-color: $biomes/colors.yml:AETHER_WEBBED_FOREST
+color: $biomes/colors.yml:AETHER_GRIM_WOODLANDS
 vanilla: minecraft:the_end
 
 colors:
-  grass: 0x4c5e3f
-  foliage: 0x4c5e3f
+  grass: 0x242423
+  foliage: 0x242423
 
 palette:
-  - AETHER_PODZOL: 319
+  - AETHER_GRIM_PODZOL: 319
 
 features:
   postprocessors:
@@ -19,7 +19,7 @@ features:
     - GRASS
     - FERNS
   trees:
-    - WEB_TREES
+    - GRIM_TREES
   landforms:
     - SMALL_MOSSY_BOULDER_PATCHES
     - GRAVES
diff --git a/biomes/aether/highlands/aether_bristled_forest.yml b/biomes/aether/highlands/aether_bristled_forest.yml
@@ -48,8 +48,8 @@ terrain:
             frequency: 0.005 / ${meta.yml:terrain-configuration.island-scale}
 
 colors:
-  grass: 0x619961
-  foliage: 0x619961
+  grass: 0x635229
+  foliage: 0x635229
 
 palette:
   - AETHER_PODZOL: 319
diff --git a/biomes/colors.yml b/biomes/colors.yml
@@ -1,7 +1,7 @@
 # aether highlands
 AETHER_HIGHLANDS: 0x99bbff
 AETHER_HIGHLANDS_FOREST: 0x003300
-AETHER_BRISTLED_FOREST: 0xEADDCA
+AETHER_BRISTLED_FOREST: 0x635229
 AETHER_RUGGED_CLIFFS: 0x2EFF2E
 AETHER_ANCIENT_WASTES: 0x444444
 AETHER_MOUNTAINS: 0x95e674
@@ -16,7 +16,7 @@ AETHER_FOREST: 0x669900
 AETHER_LAVENDER_DRIFTLANDS: 0xbf40bf
 AETHER_LUSH_FOREST: 0x00b300
 AETHER_PLAINS: 0x4d9900
-AETHER_WEBBED_FOREST: 0x4c5e3f
+AETHER_GRIM_WOODLANDS: 0x242423
 AETHER_CLOUDLANDS: 0xc9c9c9
 AETHER_DISCUS_AETHER: 0xB0da9f
 
diff --git a/features/aether/cloud_plane.yml b/features/aether/cloud_plane.yml
@@ -0,0 +1,37 @@
+id: CLOUD_PLANE
+type: FEATURE
+
+distributor:
+  type: AND
+  distributors:
+    - type: SAMPLER
+      sampler:
+        type: POSITIVE_WHITE_NOISE
+        salt: 1031
+      threshold: 0.4
+    - type: SAMPLER
+      sampler:
+        type: PROBABILITY
+        sampler:
+          type: DOMAIN_WARP
+          amplitude: 5
+          warp:
+            type: GAUSSIAN
+          sampler:
+            type: OPEN_SIMPLEX_2
+            salt: 9419
+      threshold: 0.4
+
+locator:
+  type: PATTERN
+  range:
+    min: 254
+    max: 255
+  pattern:
+    type: MATCH_AIR
+    offset: 0
+
+structures:
+  distribution:
+    type: CONSTANT
+  structures: BLOCK:minecraft:white_stained_glass
diff --git a/features/aether/structures/ruins/ancient_towers.yml b/features/aether/structures/ruins/ancient_towers.yml
@@ -3,9 +3,9 @@ type: FEATURE
 
 distributor:
   type: PADDED_GRID
-  width: 57
-  padding: 43
-  salt: 4858
+  width: 78
+  padding: 67
+  salt: 4808
 
 locator:
   type: AND
diff --git a/features/aether/vegetation/trees/grim_trees.yml b/features/aether/vegetation/trees/grim_trees.yml
@@ -1,4 +1,4 @@
-id: WEB_TREES
+id: GRIM_TREES
 type: FEATURE
 
 distributor:
@@ -12,7 +12,7 @@ locator:
   locators:
     - type: TOP
       range: &range
-        min: 100
+        min: 50
         max: 319
     - type: PATTERN
       range: *range
@@ -33,6 +33,5 @@ structures:
   distribution:
     type: WHITE_NOISE
   structures: 
-    - dead_tree_procedural: 1
-    - web_tree_procedural: 6
-    - web_tree_procedural_2: 3
+    - grim_tree_procedural: 5
+    - big_grim_tree_procedural: 1
diff --git a/palettes/aether/aether_grim_podzol.yml b/palettes/aether/aether_grim_podzol.yml
@@ -0,0 +1,42 @@
+id: AETHER_GRIM_PODZOL
+type: PALETTE
+
+layers:
+  - materials:
+      - minecraft:grass_block: 4
+      - minecraft:coarse_dirt: 1
+      - minecraft:podzol: 1
+      - minecraft:black_concrete_powder: 2
+    layers: 1
+    sampler:
+      type: DOMAIN_WARP
+      amplitude: 1
+      warp:
+        type: GAUSSIAN
+      sampler:
+        type: FBM
+        octaves: 2
+        sampler:
+          type: OPEN_SIMPLEX_2
+          frequency: 0.2
+          salt: 293
+  - materials:
+      - minecraft:dirt: 1
+    layers: 2
+  - materials: 
+    - minecraft:stone: 10
+    - minecraft:cobblestone: 5
+    - minecraft:mossy_cobblestone: 3
+    layers: 1
+    sampler:
+      type: DOMAIN_WARP
+      amplitude: 1
+      warp:
+        type: GAUSSIAN
+      sampler:
+        type: FBM
+        octaves: 2
+        sampler:
+          type: OPEN_SIMPLEX_2
+          frequency: 0.2
+          salt: 293
diff --git a/structures/aether/vegetation/trees/big_grim_tree_procedural.tesf b/structures/aether/vegetation/trees/big_grim_tree_procedural.tesf
@@ -2,13 +2,13 @@ num randPrecision = 100;
 num goldenAngle = 2.39996;
 num pi = 3.14159;
 
-num trunkHeight = 5+randomInt(7);
+num trunkHeight = 8+randomInt(9);
 str trunkBlock = "minecraft:dark_oak_log";
 str rootBlock = "minecraft:dark_oak_wood";
 
-num sideBranchInterval = 10;
+num sideBranchInterval = 3;
 num sideBranchMinHeight = 3+randomInt(3);
-num sideBranchLengthMin = 2+randomInt(2);
+num sideBranchLengthMin = 7+randomInt(2);
 num sideBranchLengthVariation = 2;
 num sideBranchVerticalVariation = 0;
 num sideBranchVerticalDirection = 0.5+randomInt(randPrecision)/randPrecision/2;
@@ -22,11 +22,11 @@ str sideBranchBlockX = "minecraft:dark_oak_log[axis=x]";
 str sideBranchBlockY = "minecraft:dark_oak_log[axis=y]";
 str sideBranchBlockZ = "minecraft:dark_oak_log[axis=z]";
 
-num topBranches = 3+randomInt(2);
-num topBranchLengthUpwardsMin = 3+randomInt(3);
-num topBranchLengthOutwardsMin = 4+randomInt(3);
-num topBranchVerticalDirection = 0.5+randomInt(randPrecision)/randPrecision/3;
-num topBranchLeafRadiusMin = 3;
+num topBranches = 5+randomInt(5);
+num topBranchLengthUpwardsMin = 8+randomInt(5);
+num topBranchLengthOutwardsMin = 12+randomInt(5);
+num topBranchVerticalDirection = 0.1+randomInt(randPrecision)/randPrecision/3;
+num topBranchLeafRadiusMin = 4;
 num topBranchLeafTranslate = 0;
 num topBranchLeafTopFlatness = 2;
 num topBranchLeafBottomFlatness = 3;
@@ -164,9 +164,9 @@ block(0, -1, 0, "minecraft:dirt");
 
 num twopi = pi*2;
 
-for (num v = 35; v > trunkHeight; v = v - 1) {
-    num rx = sin(randomInt(randPrecision)/randPrecision * twopi) * (randomInt(9) + 3);
-    num rz = cos(randomInt(randPrecision)/randPrecision * twopi) * (randomInt(9) + 3);
+for (num v = trunkHeight+10; v > trunkHeight; v = v - 1) {
+    num rx = sin(randomInt(randPrecision)/randPrecision * twopi) * (randomInt(3)+1);
+    num rz = cos(randomInt(randPrecision)/randPrecision * twopi) * (randomInt(3)+1);
     structure(rx, v, rz, "hanging_cobweb", "NONE");
     structure(-rx, v, rz, "hanging_cobweb", "NONE");
     structure(rx, v, -rz, "hanging_cobweb", "NONE");
diff --git a/structures/aether/vegetation/trees/dead_tree_procedural.tesf b/structures/aether/vegetation/trees/dead_tree_procedural.tesf
@@ -2,30 +2,42 @@ num randPrecision = 100;
 num goldenAngle = 2.39996;
 num pi = 3.14159;
 
-num trunkHeight = 2+randomInt(6);
+num trunkHeight = 5+randomInt(7);
 str trunkBlock = "minecraft:dark_oak_log";
-str rootBlock = "minecraft:dark_oak_log";
+str rootBlock = "minecraft:dark_oak_wood";
 
-num sideBranchInterval = 3+randomInt(2);
-num sideBranchMinHeight = 2+randomInt(2);
-num sideBranchLengthMin = 2+randomInt(3);
+num sideBranchInterval = 3;
+num sideBranchMinHeight = 1+randomInt(3);
+num sideBranchLengthMin = 5+randomInt(2);
 num sideBranchLengthVariation = 2;
 num sideBranchVerticalVariation = 0;
-num sideBranchVerticalDirection = 0.3+randomInt(randPrecision)/randPrecision/2;
+num sideBranchVerticalDirection = 0.5+randomInt(randPrecision)/randPrecision/2;
+num sideBranchLeafRadiusMin = 4;
+num sideBranchLeafTranslate = 0;
+num sideBranchLeafTopFlatness = 2;
+num sideBranchLeafBottomFlatness = 3;
+num sideBranchLeafDensity = 0.5;
+str sideBranchLeafStructure = "blank";
 str sideBranchBlockX = "minecraft:dark_oak_log[axis=x]";
 str sideBranchBlockY = "minecraft:dark_oak_log[axis=y]";
 str sideBranchBlockZ = "minecraft:dark_oak_log[axis=z]";
 
-num topBranches = 2+randomInt(2);
-num topBranchLengthUpwardsMin = 2+randomInt(2);
-num topBranchLengthOutwardsMin = 2+randomInt(3);
-num topBranchVerticalDirection = 0.5;
+num topBranches = 5+randomInt(5);
+num topBranchLengthUpwardsMin = 6+randomInt(5);
+num topBranchLengthOutwardsMin = 10+randomInt(5);
+num topBranchVerticalDirection = 0.1+randomInt(randPrecision)/randPrecision/3;
+num topBranchLeafRadiusMin = 4;
+num topBranchLeafTranslate = 0;
+num topBranchLeafTopFlatness = 2;
+num topBranchLeafBottomFlatness = 3;
+num topBranchLeafDensity = 0.5;
+str topBranchLeafStructure = "blank";
 str topBranchBlockX = "minecraft:dark_oak_log[axis=x]";
 str topBranchBlockY = "minecraft:dark_oak_log[axis=y]";
 str topBranchBlockZ = "minecraft:dark_oak_log[axis=z]";
 
 // Generate roots at base of trunk
-num roots = 0;
+num roots = 1+randomInt(3);
 num rootMaxDepth = 3;
 num rootHeight = 5;
 num rootLength = 2;
@@ -76,6 +88,25 @@ for (num i = 0; i < trunkHeight; i = i + 1) {
             }
             // Rotate angle of next branch
             branchAngle = branchAngle + goldenAngle;
+            // Generate leaf cluster at the end of the branch
+            num radius = sideBranchLeafRadiusMin;
+            num radiusSquared = pow(radius, 2);
+            // Leaf cluster origin (end of branch)
+            num lox = ox+branchLength*dx;
+            num loy = oy+branchLength*dy + sideBranchLeafTranslate;
+            num loz = oz+branchLength*dz;
+            for (num cx = ceil(-radius); cx <= ceil(radius); cx = cx + 1) {
+                for (num cy = ceil(-radius/sideBranchLeafBottomFlatness); cy <= ceil(radius/sideBranchLeafTopFlatness); cy = cy + 1) {
+                    for (num cz = ceil(-radius); cz <= ceil(radius); cz = cz + 1) {
+                        num squashFactor = sideBranchLeafBottomFlatness;
+                        if (cy > 0) squashFactor = sideBranchLeafTopFlatness;
+                        num distanceSquared = pow(cx,2)+pow(cy*squashFactor,2)+pow(cz,2);
+                        if (distanceSquared < radiusSquared && randomInt(randPrecision)/randPrecision < sideBranchLeafDensity) {
+                            structure(lox+cx, loy+cy, loz+cz, sideBranchLeafStructure, "NONE", "CW_90", "CCW_90", "CW_180");
+                        }
+                    }
+                }
+            }
         }
     }
     block(0, i, 0, trunkBlock);
@@ -108,6 +139,36 @@ for (num b = 1; b <= topBranches; b = b + 1) {
     }
     // Rotate angle of next branch
     branchAngle = branchAngle + goldenAngle;
+    // Generate leaf cluster at the end of the branch
+    num radius = topBranchLeafRadiusMin;
+    num radiusSquared = pow(radius, 2);
+    // Leaf cluster origin (end of branch)
+    num lox = ox+branchLength*dx;
+    num loy = oy+branchLength*dy + topBranchLeafTranslate;
+    num loz = oz+branchLength*dz;
+    for (num cx = ceil(-radius); cx <= ceil(radius); cx = cx + 1) {
+        for (num cy = ceil(-radius/topBranchLeafBottomFlatness); cy <= ceil(radius/topBranchLeafTopFlatness); cy = cy + 1) {
+            for (num cz = ceil(-radius); cz <= ceil(radius); cz = cz + 1) {
+                num squashFactor = topBranchLeafBottomFlatness;
+                if (cy > 0) squashFactor = topBranchLeafTopFlatness;
+                num distanceSquared = pow(cx,2)+pow(cy*squashFactor,2)+pow(cz,2);
+                if (distanceSquared < radiusSquared && randomInt(randPrecision)/randPrecision < topBranchLeafDensity) {
+                    structure(lox+cx, loy+cy, loz+cz, topBranchLeafStructure, "NONE", "CW_90", "CCW_90", "CW_180");
+                }
+            }
+        }
+    }
 }
 
-block(0, -1, 0, "minecraft:dirt");
+block(0, -1, 0, "minecraft:dirt");
+
+num twopi = pi*2;
+
+for (num v = trunkHeight+10; v > trunkHeight; v = v - 1) {
+    num rx = sin(randomInt(randPrecision)/randPrecision * twopi) * (randomInt(3)+1);
+    num rz = cos(randomInt(randPrecision)/randPrecision * twopi) * (randomInt(3)+1);
+    structure(rx, v, rz, "hanging_cobweb", "NONE");
+    structure(-rx, v, rz, "hanging_cobweb", "NONE");
+    structure(rx, v, -rz, "hanging_cobweb", "NONE");
+    structure(-rx, v, -rz, "hanging_cobweb", "NONE");
+}
diff --git a/structures/aether/vegetation/trees/grim_tree_procedural.tesf b/structures/aether/vegetation/trees/grim_tree_procedural.tesf
