Skip to content

Commit 067a77c

Browse files
mschae23mschae23
committed
Fixed vanilla example
1 parent 412e00e commit 067a77c

File tree

7 files changed

+40
-16
lines changed

7 files changed

+40
-16
lines changed

‎Cargo.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "density_function_lang"
3-
version = "3.0.1"
3+
version = "3.1.0"
44
edition = "2021"
55

66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

‎test/minecraft.densityfunction‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ module df {
132132
template quarter_negative(arg) { simple_1("minecraft:quarter_negative", arg) }
133133
template squeeze(arg) { simple_1("minecraft:squeeze", arg) }
134134

135-
template weird_scaled_sampler(arg, noise, rarity_value_mapper) { {
136-
"type": "minecraft:weird_scaled_sampler",
135+
template weird_scaled_sampler(input, noise, rarity_value_mapper) { {
136+
"type": "minecraft:weird_scaled_sampler", "input": input,
137137
"noise": noise, "rarity_value_mapper": rarity_value_mapper
138138
} }
139139

‎test/offset_factor_jaggedness.densityfunction‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -502,23 +502,23 @@ export jaggedness = apply_blending(df_spline(
502502
spline("minecraft:overworld/continents", [
503503
spline_point(-0.11, 0.0),
504504
spline_point(0.03, spline("minecraft:overworld/erosion", [
505-
spline_point(-1.0, spline("minecraft:ridges_folded", [
505+
spline_point(-1.0, spline("minecraft:overworld/ridges_folded", [
506506
spline_point(0.19999999, 0.0),
507507
spline_point(0.44999996, 0.0),
508508
spline_point(1.0, spline("minecraft:overworld/ridges", [
509509
spline_point(-0.01, 0.63),
510510
spline_point(-0.01, 0.3),
511511
])),
512512
])),
513-
spline_point(-0.78, spline("minecraft:ridges_folded", [
513+
spline_point(-0.78, spline("minecraft:overworld/ridges_folded", [
514514
spline_point(0.19999999, 0.0),
515515
spline_point(0.44999996, 0.0),
516516
spline_point(1.0, spline("minecraft:overworld/ridges", [
517517
spline_point(-0.01, 0.315),
518518
spline_point(-0.01, 0.15),
519519
])),
520520
])),
521-
spline_point(-0.5775, spline("minecraft:ridges_folded", [
521+
spline_point(-0.5775, spline("minecraft:overworld/ridges_folded", [
522522
spline_point(0.19999999, 0.0),
523523
spline_point(0.44999996, 0.0),
524524
spline_point(1.0, spline("minecraft:overworld/ridges", [
@@ -529,7 +529,7 @@ export jaggedness = apply_blending(df_spline(
529529
spline_point(-0.375, 0.0),
530530
])),
531531
spline_point(0.65, spline("minecraft:overworld/erosion", [
532-
spline_point(-1.0, spline("minecraft:ridges_folded", [
532+
spline_point(-1.0, spline("minecraft:overworld/ridges_folded", [
533533
spline_point(0.19999999, 0.0),
534534
spline_point(0.44999996, spline("minecraft:overworld/ridges", [
535535
spline_point(-0.01, 0.63),
@@ -540,15 +540,15 @@ export jaggedness = apply_blending(df_spline(
540540
spline_point(-0.01, 0.3),
541541
])),
542542
])),
543-
spline_point(-0.78, spline("minecraft:ridges_folded", [
543+
spline_point(-0.78, spline("minecraft:overworld/ridges_folded", [
544544
spline_point(0.19999999, 0.0),
545545
spline_point(0.44999996, 0.0),
546546
spline_point(1.0, spline("minecraft:overworld/ridges", [
547547
spline_point(-0.01, 0.63),
548548
spline_point(-0.01, 0.3),
549549
])),
550550
])),
551-
spline_point(-0.5775, spline("minecraft:ridges_folded", [
551+
spline_point(-0.5775, spline("minecraft:overworld/ridges_folded", [
552552
spline_point(0.19999999, 0.0),
553553
spline_point(0.44999996, 0.0),
554554
spline_point(1.0, spline("minecraft:overworld/ridges", [

‎test/target/overworld/caves/entrances.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,29 @@
3333
"type": "minecraft:max",
3434
"argument1": {
3535
"type": "minecraft:weird_scaled_sampler",
36+
"input": {
37+
"type": "minecraft:cache_once",
38+
"argument": {
39+
"type": "minecraft:noise",
40+
"noise": "minecraft:spaghetti_3d_rarity",
41+
"xz_scale": 2.0,
42+
"y_scale": 1.0
43+
}
44+
},
3645
"noise": "minecraft:spaghetti_3d_1",
3746
"rarity_value_mapper": "type_1"
3847
},
3948
"argument2": {
4049
"type": "minecraft:weird_scaled_sampler",
50+
"input": {
51+
"type": "minecraft:cache_once",
52+
"argument": {
53+
"type": "minecraft:noise",
54+
"noise": "minecraft:spaghetti_3d_rarity",
55+
"xz_scale": 2.0,
56+
"y_scale": 1.0
57+
}
58+
},
4159
"noise": "minecraft:spaghetti_3d_2",
4260
"rarity_value_mapper": "type_1"
4361
}

‎test/target/overworld/caves/spaghetti_2d.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66
"type": "minecraft:add",
77
"argument1": {
88
"type": "minecraft:weird_scaled_sampler",
9+
"input": {
10+
"type": "minecraft:noise",
11+
"noise": "minecraft:spaghetti_2d_modulator",
12+
"xz_scale": 2.0,
13+
"y_scale": 1.0
14+
},
915
"noise": "minecraft:spaghetti_2d",
1016
"rarity_value_mapper": "type_2"
1117
},

‎test/target/overworld/jaggedness.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"derivative": 0.0,
3434
"location": -1.0,
3535
"value": {
36-
"coordinate": "minecraft:ridges_folded",
36+
"coordinate": "minecraft:overworld/ridges_folded",
3737
"points": [
3838
{
3939
"derivative": 0.0,
@@ -71,7 +71,7 @@
7171
"derivative": 0.0,
7272
"location": -0.78,
7373
"value": {
74-
"coordinate": "minecraft:ridges_folded",
74+
"coordinate": "minecraft:overworld/ridges_folded",
7575
"points": [
7676
{
7777
"derivative": 0.0,
@@ -109,7 +109,7 @@
109109
"derivative": 0.0,
110110
"location": -0.5775,
111111
"value": {
112-
"coordinate": "minecraft:ridges_folded",
112+
"coordinate": "minecraft:overworld/ridges_folded",
113113
"points": [
114114
{
115115
"derivative": 0.0,
@@ -161,7 +161,7 @@
161161
"derivative": 0.0,
162162
"location": -1.0,
163163
"value": {
164-
"coordinate": "minecraft:ridges_folded",
164+
"coordinate": "minecraft:overworld/ridges_folded",
165165
"points": [
166166
{
167167
"derivative": 0.0,
@@ -213,7 +213,7 @@
213213
"derivative": 0.0,
214214
"location": -0.78,
215215
"value": {
216-
"coordinate": "minecraft:ridges_folded",
216+
"coordinate": "minecraft:overworld/ridges_folded",
217217
"points": [
218218
{
219219
"derivative": 0.0,
@@ -251,7 +251,7 @@
251251
"derivative": 0.0,
252252
"location": -0.5775,
253253
"value": {
254-
"coordinate": "minecraft:ridges_folded",
254+
"coordinate": "minecraft:overworld/ridges_folded",
255255
"points": [
256256
{
257257
"derivative": 0.0,

0 commit comments

Comments
 (0)