Recalibrate Stable Layers edge detail presets

Author: SkyBlade1978

docs/CONFIGURATION.md

@@ -75,6 +75,21 @@ When a control is `custom`, its value comes from `formations.custom`:
 | `edge_octaves` | 1-8 | Number of boundary-detail scales |
 | `continuity` | 0-1 | Proportion of formations retaining global identity |
 
+For Stable Layers, the Edge Detail presets use these
+`wavelength / amplitude / octaves` values:
+
+| Preset | Edge detail |
+|---|---:|
+| Tiny | `48 / 4 / 1` |
+| Small | `64 / 12 / 2` |
+| Average | `96 / 24 / 3` |
+| Large | `128 / 48 / 4` |
+| Huge | `192 / 96 / 5` |
+
+Average is calibrated to retain visible variation at later layer contacts.
+Custom profiles keep their explicit values; these numbers are only used by the
+named presets and as defaults for new Custom settings.
+
 Cyano settings use `cyano.geome_size` (4-32767),
 `cyano.rock_layer_noise` (1-32767), and `cyano.rock_layer_thickness` (1-255).
 They are ignored by Sky.

src/main/java/zone/moddev/mc/orespawn/worldgen/FormationSettings.java

@@ -26,12 +26,12 @@ public static Algorithm fromConfigName(String name) {
 	}
 
 	public enum Preset {
-		TINY("tiny", 64.0D, 25.0D, 128.0D, 1, 15.0D, 1, 0.00D, 12.0D, 32.0D, 0.0D, 0),
-		SMALL("small", 128.0D, 50.0D, 192.0D, 3, 30.0D, 2, 0.50D, 24.0D, 48.0D, 4.0D, 1),
-		AVERAGE("average", 256.0D, 100.0D, 256.0D, 8, 60.0D, 4, 0.85D, 48.0D, 64.0D, 12.0D, 2),
-		LARGE("large", 512.0D, 200.0D, 384.0D, 28, 90.0D, 5, 0.95D, 128.0D, 96.0D, 24.0D, 3),
-		HUGE("huge", 1024.0D, 640.0D, 512.0D, 128, 120.0D, 6, 1.00D, 288.0D, 128.0D, 48.0D, 4),
-		CUSTOM("custom", 256.0D, 100.0D, 256.0D, 8, 60.0D, 4, 0.85D, 48.0D, 64.0D, 12.0D, 2);
+		TINY("tiny", 64.0D, 25.0D, 128.0D, 1, 15.0D, 1, 0.00D, 12.0D, 48.0D, 4.0D, 1),
+		SMALL("small", 128.0D, 50.0D, 192.0D, 3, 30.0D, 2, 0.50D, 24.0D, 64.0D, 12.0D, 2),
+		AVERAGE("average", 256.0D, 100.0D, 256.0D, 8, 60.0D, 4, 0.85D, 48.0D, 96.0D, 24.0D, 3),
+		LARGE("large", 512.0D, 200.0D, 384.0D, 28, 90.0D, 5, 0.95D, 128.0D, 128.0D, 48.0D, 4),
+		HUGE("huge", 1024.0D, 640.0D, 512.0D, 128, 120.0D, 6, 1.00D, 288.0D, 192.0D, 96.0D, 5),
+		CUSTOM("custom", 256.0D, 100.0D, 256.0D, 8, 60.0D, 4, 0.85D, 48.0D, 96.0D, 24.0D, 3);
 
 		final String configName;
 		final double stratumWavelength;

src/main/java/zone/moddev/mc/orespawn/worldgen/GeomeConfig.java

@@ -450,16 +450,16 @@ private static FormationSettings readFormationSettings(JsonObject root) {
 				: stableLayers ? waviness.stableWavinessAmplitude : waviness.wavinessAmplitude;
 		double edgeWavelength = stableLayers
 				? irregularity == Preset.CUSTOM
-						? getBoundedDouble(custom, "edge_wavelength", 64.0D, 8.0D, 512.0D)
+						? getBoundedDouble(custom, "edge_wavelength", 96.0D, 8.0D, 512.0D)
 						: irregularity.stableEdgeWavelength
 				: 64.0D;
 		double edgeAmplitude = !stableLayers
 				? 0.0D
 				: irregularity == Preset.CUSTOM
-						? getBoundedDouble(custom, "edge_amplitude", 12.0D, 0.0D, 256.0D)
+						? getBoundedDouble(custom, "edge_amplitude", 24.0D, 0.0D, 256.0D)
 						: irregularity.stableEdgeAmplitude;
 		int edgeOctaves = irregularity == Preset.CUSTOM
-				? getBoundedInt(custom, "edge_octaves", stableLayers ? 2 : 4, 1, 8)
+				? getBoundedInt(custom, "edge_octaves", stableLayers ? 3 : 4, 1, 8)
 				: stableLayers ? irregularity.stableEdgeOctaves : irregularity.edgeOctaves;
 		double formationContinuity = continuity == Preset.CUSTOM
 				? getBoundedDouble(custom, "continuity", 0.85D, 0.0D, 1.0D)
@@ -1549,8 +1549,8 @@ private static JsonObject defaultFormationConfig() {
 		formations.addProperty("edge_irregularity", Preset.AVERAGE.configName);
 		formations.addProperty("formation_continuity", Preset.AVERAGE.configName);
 		formations.add("custom", customFormationConfig(
-				256.0D, 100.0D, 8, 48.0D, 2, 0.85D,
-				256.0D, 64.0D, 12.0D));
+				256.0D, 100.0D, 8, 48.0D, 3, 0.85D,
+				256.0D, 96.0D, 24.0D));
 		return formations;
 	}
 

src/main/java/zone/moddev/mc/orespawn/worldgen/WorldGeologyProfile.java

@@ -289,9 +289,9 @@ private static JsonObject recommendedFormationJson() {
 		custom.addProperty("vertical_thickness", 8);
 		custom.addProperty("waviness_wavelength", 256.0D);
 		custom.addProperty("waviness_amplitude", 48.0D);
-		custom.addProperty("edge_wavelength", 64.0D);
-		custom.addProperty("edge_amplitude", 12.0D);
-		custom.addProperty("edge_octaves", 2);
+		custom.addProperty("edge_wavelength", 96.0D);
+		custom.addProperty("edge_amplitude", 24.0D);
+		custom.addProperty("edge_octaves", 3);
 		custom.addProperty("continuity", 0.85D);
 		formations.add("custom", custom);
 		return formations;

src/test/java/zone/moddev/mc/orespawn/worldgen/FormationSettingsTest.java

@@ -0,0 +1,36 @@
+package zone.moddev.mc.orespawn.worldgen;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import com.google.gson.JsonObject;
+import org.junit.jupiter.api.Test;
+import zone.moddev.mc.orespawn.worldgen.FormationSettings.Preset;
+
+class FormationSettingsTest {
+	@Test
+	void stableLayerEdgeDetailUsesTheRecalibratedPresetLadder() {
+		assertEdgeDetail(Preset.TINY, 48.0D, 4.0D, 1);
+		assertEdgeDetail(Preset.SMALL, 64.0D, 12.0D, 2);
+		assertEdgeDetail(Preset.AVERAGE, 96.0D, 24.0D, 3);
+		assertEdgeDetail(Preset.LARGE, 128.0D, 48.0D, 4);
+		assertEdgeDetail(Preset.HUGE, 192.0D, 96.0D, 5);
+	}
+
+	@Test
+	void customAndRecommendedEdgeDefaultsMatchAverage() {
+		assertEdgeDetail(Preset.CUSTOM, 96.0D, 24.0D, 3);
+
+		JsonObject custom = WorldGeologyProfile.recommended(false).toFormationJson()
+				.getAsJsonObject("custom");
+		assertEquals(96.0D, custom.get("edge_wavelength").getAsDouble());
+		assertEquals(24.0D, custom.get("edge_amplitude").getAsDouble());
+		assertEquals(3, custom.get("edge_octaves").getAsInt());
+	}
+
+	private static void assertEdgeDetail(Preset preset, double wavelength, double amplitude,
+			int octaves) {
+		assertEquals(wavelength, preset.stableEdgeWavelength);
+		assertEquals(amplitude, preset.stableEdgeAmplitude);
+		assertEquals(octaves, preset.stableEdgeOctaves);
+	}
+}