Added example for vanilla noise settings

- very large and very small values are now shown in scientific notation

Author: mschae23

.gitignore

@@ -6,4 +6,4 @@ target/
 *.iml
 
 # Compiler test
-!test/target/
+!example/**/target/

README.md

@@ -7,4 +7,4 @@ density_function_lang.exe main.densityfunction --target-dir target
 ```
 
 ## Examples
-See [test/main.densityfunction](test/main.densityfunction).
+See [test/main.densityfunction](example/df/main.densityfunction).

test/main.densityfunction renamed to example/df/main.densityfunction

@@ -9,9 +9,9 @@ export zero = 0.0;
 module overworld {
     export base_3d_noise = old_blended_noise(0.25, 0.125, 80.0, 160.0, 8.0);
 
-    export continents = flat_cache(shifted_noise("minecraft:shift_x", 0.0, "minecraft:shift_z", 0.25, 0.0, "minecraft:continentalness"));
+    export continents = flat_cache(shifted_noise("minecraft:continentalness", "minecraft:shift_x", 0.0, "minecraft:shift_z", 0.25, 0.0));
     export depth = y_clamped_gradient(-64, 320, 1.5, -1.5) + "minecraft:overworld/offset";
-    export erosion = flat_cache(shifted_noise("minecraft:shift_x", 0.0, "minecraft:shift_z", 0.25, 0.0, "minecraft:erosion"));
+    export erosion = flat_cache(shifted_noise("minecraft:erosion", "minecraft:shift_x", 0.0, "minecraft:shift_z", 0.25, 0.0));
 
     include "offset_factor_jaggedness.densityfunction";
 
@@ -33,10 +33,6 @@ module overworld {
         )
     }
 
-    template apply_surface_slides(input) {
-        apply_slides(input, -64, 384, 80, 64, -0.078125, 0, 24, 0.1171875)
-    }
-
     template initial_density(factor, depth) {
         4.0 * (depth * factor).quarter_negative()
     }

test/minecraft.densityfunction renamed to example/df/minecraft.densityfunction

@@ -116,12 +116,12 @@ module df {
     template shift_a(arg) { simple_1("minecraft:shift_a", arg) }
     template shift_b(arg) { simple_1("minecraft:shift_b", arg) }
 
-    template shifted_noise(shift_x, shift_y, shift_z, scale_xz, scale_y, noise) {
+    template shifted_noise(noise, shift_x, shift_y, shift_z, scale_xz, scale_y) {
         {
             "type": "minecraft:shifted_noise",
+            "noise": noise,
             "shift_x": shift_x, "shift_y": shift_y, "shift_z": shift_z,
-            "xz_scale": scale_xz, "y_scale": scale_y,
-            "noise": noise
+            "xz_scale": scale_xz, "y_scale": scale_y
         }
     }
 
@@ -222,6 +222,10 @@ module df {
         )
     }
 
+    template apply_surface_slides(input) {
+        apply_slides(input, -64, 384, 80, 64, -0.078125, 0, 24, 0.1171875)
+    }
+
     module impl {
         template lerp_const_start(delta, start, end) { // Requires start to be a constant number
             // if (start == 0.0) {

test/offset_factor_jaggedness.densityfunction renamed to example/df/offset_factor_jaggedness.densityfunction

@@ -2,11 +2,11 @@
     "type": "minecraft:flat_cache",
     "argument": {
         "type": "minecraft:shifted_noise",
+        "noise": "minecraft:continentalness",
         "shift_x": "minecraft:shift_x",
         "shift_y": 0.0,
         "shift_z": "minecraft:shift_z",
         "xz_scale": 0.25,
-        "y_scale": 0.0,
-        "noise": "minecraft:continentalness"
+        "y_scale": 0.0
     }
 }

test/target/overworld/base_3d_noise.json renamed to example/df/target/overworld/base_3d_noise.json

@@ -2,11 +2,11 @@
     "type": "minecraft:flat_cache",
     "argument": {
         "type": "minecraft:shifted_noise",
+        "noise": "minecraft:erosion",
         "shift_x": "minecraft:shift_x",
         "shift_y": 0.0,
         "shift_z": "minecraft:shift_z",
         "xz_scale": 0.25,
-        "y_scale": 0.0,
-        "noise": "minecraft:erosion"
+        "y_scale": 0.0
     }
 }

test/target/overworld/caves/entrances.json renamed to example/df/target/overworld/caves/entrances.json

@@ -127,12 +127,12 @@
                                                         {
                                                             "derivative": 0.0,
                                                             "location": 0.5954547,
-                                                            "value": 0.000000029802322
+                                                            "value": 2.9802322E-8
                                                         },
                                                         {
                                                             "derivative": 0.2534563,
                                                             "location": 0.6054547,
-                                                            "value": 0.000000029802322
+                                                            "value": 2.9802322E-8
                                                         },
                                                         {
                                                             "derivative": 0.2534563,
@@ -349,12 +349,12 @@
                                                         {
                                                             "derivative": 0.0,
                                                             "location": 0.5954547,
-                                                            "value": 0.000000029802322
+                                                            "value": 2.9802322E-8
                                                         },
                                                         {
                                                             "derivative": 0.2534563,
                                                             "location": 0.6054547,
-                                                            "value": 0.000000029802322
+                                                            "value": 2.9802322E-8
                                                         },
                                                         {
                                                             "derivative": 0.2534563,
@@ -571,12 +571,12 @@
                                                         {
                                                             "derivative": 0.0,
                                                             "location": 0.5954547,
-                                                            "value": 0.000000029802322
+                                                            "value": 2.9802322E-8
                                                         },
                                                         {
                                                             "derivative": 0.2534563,
                                                             "location": 0.6054547,
-                                                            "value": 0.000000029802322
+                                                            "value": 2.9802322E-8
                                                         },
                                                         {
                                                             "derivative": 0.2534563,

test/target/overworld/caves/noodle.json renamed to example/df/target/overworld/caves/noodle.json

@@ -0,0 +1,12 @@
+{
+    "type": "minecraft:flat_cache",
+    "argument": {
+        "type": "minecraft:shifted_noise",
+        "noise": "minecraft:shift_x",
+        "shift_x": 0.0,
+        "shift_y": "minecraft:shift_z",
+        "shift_z": 0.25,
+        "xz_scale": 0.0,
+        "y_scale": "minecraft:ridge"
+    }
+}