Skip to content

Commit 2a866f3

Browse files
DeathShadezDeathShadez
committed
Add chorus_trees, hanging_bee_nests,& main_pillars
1 parent 5f923d2 commit 2a866f3

33 files changed

+483
-37
lines changed

‎biome-providers/stages/end_distribution.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ stages:
1313
default-from: end
1414
default-to:
1515
- END_WASTES: 1
16+
- END_HIGHLANDS: 1
1617
- WARPED_BARRENS: 1
1718
- CHORUVE_FOREST: 1
1819
- JAGGED_END: 1

‎biomes/aether/aether_lavender_driftlands.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,5 @@ features:
6969
- HANGING_LANTERNS
7070
landforms:
7171
- SMALL_MOSSY_BOULDER_PATCHES
72+
- HANGING_BEE_NESTS
7273
#- CLOUDS

‎biomes/colors.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ AETHER_PLAINS: 0x4d9900
1616
CHORUVE_FOREST: 0xff4d88
1717
DARK_END: 0x1f1f14
1818
END_WASTES: 0xccccb3
19+
END_HIGHLANDS: 0xbda3d4
1920
JAGGED_END: 0x7a7a52
2021
MAIN_END: 0x4d004d
2122
SHATTERED_END: 0x632f6a

‎biomes/end/end_highlands.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
id: END_HIGHLANDS
2+
type: BIOME
3+
extends: [ END, EQ_DEFAULT ]
4+
vanilla: minecraft:end_highlands
5+
color: $biomes/colors.yml:END_HIGHLANDS
6+
7+
palette:
8+
- BLOCK:minecraft:end_stone: 319
9+
10+
features:
11+
trees:
12+
- CHORUS_TREES

‎biomes/end/end_wastes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
id: END_WASTES
22
type: BIOME
33
extends: [ END, EQ_DEFAULT ]
4-
vanilla: minecraft:end_highlands
4+
vanilla: minecraft:end_midlands
55
color: $biomes/colors.yml:END_WASTES
66

77
palette:

‎biomes/end/main_end.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ terrain:
1515
simplex3(x, y*flatness, z)
1616
),
1717
lerp(y, min, 0, min+taper,
18-
simplex3(x, (y-undercarriageTranslate)*flatness, z) * 7
18+
simplex3(x, (y-undercarriageTranslate)*flatness, z) * 10
1919
)
2020
)
2121
)
@@ -24,7 +24,7 @@ terrain:
2424
max: 70
2525
min: 0
2626
taper: ${meta.yml:terrain-configuration.island-taper}
27-
flatness: 7
27+
flatness: 6
2828
undercarriageTranslate: ${meta.yml:terrain-configuration.island-undercarriage-translate}
2929
samplers:
3030
simplex3:
@@ -47,5 +47,9 @@ terrain:
4747
type: OPEN_SIMPLEX_2
4848
frequency: 0.005 / ${meta.yml:terrain-configuration.island-scale}
4949

50+
features:
51+
trees:
52+
- MAIN_PILLARS
53+
5054
palette:
5155
- BLOCK:minecraft:end_stone: 319

‎biomes/end/pearlescent_end.yml

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,17 @@ terrain:
88
sampler:
99
type: EXPRESSION
1010
expression: |
11-
-1+threshold+
11+
-1+threshold+4*
1212
lerp(y, max, 0, max-taper,
1313
max(
14-
max(
15-
lerp(y, min-undercarriageTranslate, 0, min-undercarriageTranslate+taper,
16-
simplex3(x, y*flatness, z)
17-
),
18-
lerp(y, min, 0, min+taper,
19-
simplex3(x, (y-undercarriageTranslate)*flatness, z) * undercarriageMask(x, y/2, z) * 1.3
20-
)
21-
),
22-
max(
23-
lerp(y, min-undercarriageTranslate, 0, min+taper-undercarriageTranslate,
24-
uppercarriageMask(x, y, z) * 2
25-
),
26-
lerp(y, min, 0, min+taper,
27-
simplex3(x, (y+undercarriageTranslate)*flatness, z) * undercarriageMask(x, y/2, z) * 1.3
28-
)
29-
)
14+
lerp(y, min-undercarriageTranslate, 0, min-undercarriageTranslate+taper,
15+
simplex3(x*5, y*flatness, z*5)
16+
) * trigonal(x,y,z),
17+
lerp(y, min, 0, min+taper,
18+
(simplex3(x, (y-undercarriageTranslate)*flatness, z) * undercarriageMask(x, y/2, z) * 1.3)
19+
) * trigonal(x,y,z)
3020
)
31-
)
21+
) * trigonal(x,y,z)
3222
variables:
3323
threshold: ${meta.yml:terrain-configuration.island-threshold}
3424
max: ${meta.yml:terrain-configuration.island-max-height}
@@ -45,7 +35,7 @@ terrain:
4535
octaves: 5
4636
sampler:
4737
type: OPEN_SIMPLEX_2
48-
frequency: 0.002 / ${meta.yml:terrain-configuration.island-scale}
38+
frequency: 0.005 / ${meta.yml:terrain-configuration.island-scale}
4939
undercarriageMask:
5040
dimensions: 3
5141
type: PROBABILITY
@@ -56,14 +46,14 @@ terrain:
5646
sampler:
5747
type: OPEN_SIMPLEX_2
5848
frequency: 0.005 / ${meta.yml:terrain-configuration.island-scale}
59-
uppercarriageMask:
49+
trigonal:
6050
dimensions: 3
6151
type: CELLULAR
6252
return: CellValue
63-
frequency: 0.05 / ${meta.yml:terrain-configuration.island-scale}
64-
53+
frequency: 0.05
54+
salt: 3146
6555
palette:
66-
- PEARLESCENT_END: 319
56+
- PEARLESCENT_GROUND: 319
6757

6858
features:
6959
landforms:

‎features/aether/hanging_bee_nests.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
id: HANGING_BEE_NESTS
2+
type: FEATURE
3+
4+
distributor:
5+
type: PADDED_GRID
6+
width: 24
7+
padding: 15
8+
salt: 2453
9+
10+
locator:
11+
type: AND
12+
locators:
13+
- type: PATTERN
14+
range: &range
15+
min: 100
16+
max: 225
17+
pattern:
18+
type: MATCH_SOLID
19+
offset: 1
20+
- type: PATTERN
21+
range: *range
22+
pattern:
23+
type: MATCH
24+
block: minecraft:air
25+
offset: 0
26+
- type: PATTERN
27+
range: *range
28+
pattern:
29+
type: MATCH
30+
block: minecraft:air
31+
offset: -5
32+
structures:
33+
distribution:
34+
type: CONSTANT
35+
structures: hanging_bee_nest

‎features/aether/island_ruins.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
id: ISLAND_RUINS
2+
type: FEATURE
3+
4+
distributor:
5+
type: PADDED_GRID
6+
width: 125
7+
padding: 175
8+
salt: 4620
9+
10+
locator:
11+
type: AND
12+
locators:
13+
- type: PATTERN
14+
range: &range
15+
min: 175
16+
max: 200
17+
pattern:
18+
type: MATCH_AIR
19+
offset: 5
20+
- type: PATTERN
21+
range: *range
22+
pattern:
23+
type: MATCH_AIR
24+
offset: 0
25+
- type: PATTERN
26+
range: *range
27+
pattern:
28+
type: MATCH_AIR
29+
offset: -5
30+
structures:
31+
distribution:
32+
type: CONSTANT
33+
structures: island_ruin

‎features/end/vegetation/trees/chorus_trees.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
id: CHORUS_TREES
2+
type: FEATURE
3+
4+
distributor:
5+
type: PADDED_GRID
6+
width: 6
7+
padding: 8
8+
salt: 2677
9+
10+
locator:
11+
type: AND
12+
locators:
13+
- type: TOP
14+
range: &range
15+
min: 64
16+
max: 319
17+
- type: PATTERN
18+
range: *range
19+
pattern:
20+
type: MATCH
21+
block: minecraft:end_stone
22+
offset: -1
23+
24+
structures:
25+
distribution:
26+
type: CONSTANT
27+
structures:
28+
- chorus_tree: 1

‎features/end/vegetation/trees/main_pillars.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
id: MAIN_PILLARS
2+
type: FEATURE
3+
4+
distributor:
5+
type: AND
6+
distributors:
7+
- type: SAMPLER
8+
sampler:
9+
type: EXPRESSION
10+
expression: |
11+
max(circle(centerRadius, x+noise(x,z)-1, z+noise(x,z)-1, 1),circle(centerRadius-50, x+noise(x,z)-1, z+noise(x,z)-1, 0.5))
12+
variables:
13+
centerRadius: ${meta.yml:biome-distribution.main-end-scale}
14+
buffer: ${meta.yml:biome-distribution.void-buffer-scale}
15+
functions:
16+
circle: {arguments: [r, x, z, l], expression: "if(x*x+z*z>r*r,-1,l)"}
17+
samplers:
18+
noise:
19+
type: OPEN_SIMPLEX_2
20+
dimensions: 2
21+
salt: 3912
22+
frequency: 0.1
23+
- type: SAMPLER
24+
sampler:
25+
type: POSITIVE_WHITE_NOISE
26+
salt: 6821
27+
threshold: 0.003
28+
29+
locator:
30+
type: AND
31+
locators:
32+
- type: SURFACE
33+
range: &range
34+
min: 40
35+
max: 319
36+
- type: PATTERN
37+
range: *range
38+
pattern:
39+
type: MATCH
40+
block: minecraft:end_stone
41+
offset: -1
42+
- type: PATTERN
43+
range: *range
44+
pattern:
45+
type: MATCH_AIR
46+
offset: 0
47+
48+
structures:
49+
distribution:
50+
type: WHITE_NOISE
51+
structures:
52+
- small_shattered_pillar: 10
53+
- medium_shattered_pillar: 4
54+
- large_shattered_pillar: 2

‎palettes/end/pearlescent_end.yml renamed to ‎palettes/end/pearlescent_ground.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
id: PEARLESCENT_END
1+
id: PEARLESCENT_GROUND
22
type: PALETTE
33

44
layers:
@@ -23,5 +23,6 @@ sampler:
2323
return: "CellValue"
2424
frequency: 0.5
2525
salt: 9345
26+
2627

2728

‎palettes/end/trigonal_ground.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
id: TRIGONAL_GROUND
2+
type: PALETTE
3+
4+
layers:
5+
- materials:
6+
- minecraft:air: 1
7+
- minecraft:end_stone: 1
8+
layers: 1
9+
sampler:
10+
type: CELLULAR
11+
return: CellValue
12+
frequency: 0.05
13+
salt: 3146

‎structures/aether/bee_nest.tesf renamed to ‎structures/aether/bee_nests/bee_nest.tesf

File renamed without changes.

‎structures/aether/bee_nests/bee_nest_block.tesf

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
if (getBlock(0,0,0) != "minecraft:air") fail;
2+
3+
str direction = "west";
4+
num randomDir = randomInt(4);
5+
num randomHon = randomInt(6);
6+
7+
if (randomDir == 0) {
8+
direction = "west";
9+
} else if (randomDir == 1) {
10+
direction = "east";
11+
} else if (randomDir == 2) {
12+
direction = "south";
13+
} else if (randomDir == 3) {
14+
direction = "north";
15+
}
16+
17+
block(0,0,0,"minecraft:bee_nest[facing="+ direction +",honey_level="+ randomHon +"]");

‎structures/aether/bee_nests/hanging_bee_nest.tesf

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
num radius = 4+randomInt(3);
2+
num random = randomInt(3);
3+
str setBlock = "minecraft:amethyst_block";
4+
5+
6+
if (getBlock(0,1,0) == "minecraft:air") fail;
7+
if (getBlock(3,1,0) == "minecraft:air") fail;
8+
if (getBlock(0,1,3) == "minecraft:air") fail;
9+
if (getBlock(-3,1,0) == "minecraft:air") fail;
10+
if (getBlock(0,1,-3) == "minecraft:air") fail;
11+
12+
for (num y = -1; y < 30; y = y + 1) {
13+
for (num x = -radius; x < radius; x = x + 1) {
14+
for (num z = -radius; z < radius; z = z + 1) {
15+
if ((pow(x,2)*(3+random))+(pow(y,2)/(3+random))+(pow(z,2)*(3+random)) < pow(radius,2)) {
16+
structure(x, -y, z, "bee_nest_block","NONE");
17+
}
18+
}
19+
}
20+
}
21+
22+
entity(4, -2, 0, "minecraft:bee");
23+
entity(0, -2, 4, "minecraft:bee");
24+
entity(-4, -2, 0, "minecraft:bee");
25+
entity(0, -2, -4, "minecraft:bee");
26+
entity(4, -2, 4, "minecraft:bee");
27+
entity(-4, -2, -4, "minecraft:bee");
28+

‎structures/aether/ruins/grass_replace_dirt.tesf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
if (getBlock(0,0,0) == "minecraft:dirt" && getBlock(0,1,0) == "minecraft:air") {
2+
block(0,0,0,"minecraft:grass_block");
3+
}
4+

0 commit comments

Comments
 (0)