Fix Stable Layers rock height eligibility

Author: SkyBlade1978

.github/workflows/ci.yml

@@ -56,9 +56,9 @@ jobs:
           if-no-files-found: error
           retention-days: 30
           path: |
-            build/libs/OreSpawn-4.0.9.120011.jar
-            build/libs/OreSpawn-4.0.9.120011-sources.jar
-            build/libs/OreSpawn-4.0.9.120011-javadoc.jar
+            build/libs/OreSpawn-4.0.10.120011.jar
+            build/libs/OreSpawn-4.0.10.120011-sources.jar
+            build/libs/OreSpawn-4.0.10.120011-javadoc.jar
             build/release/SHA256SUMS
             CHANGELOG.txt
 

CHANGELOG.txt

@@ -1,3 +1,12 @@
+Version 4.0.10.120011
+
+* Evaluate Stable Layers rock min_y and max_y bounds against actual world Y
+  instead of the vertically shifted formation coordinate.
+* Preserve the shifted formation identity for layer, family, and rock choice
+  while preventing vanilla Stone fallback near dimension floors and ceilings.
+* Apply the correction only while generating new chunks; existing chunks and
+  saved profiles remain unchanged.
+
 Version 4.0.9.120011
 
 * Replace provider-declared natural terrain hosts during the existing geology

README.md

@@ -17,7 +17,7 @@ End" policy used by mods such as Base Metals.
 This is not the unrelated mod that adds mobs and dimensions under the same
 name.
 
-This branch builds target-qualified version `4.0.9.120011`: the OreSpawn 4.0.9
+This branch builds target-qualified version `4.0.10.120011`: the OreSpawn 4.0.10
 feature set for Minecraft 1.20.1 and Forge. See the
 [versioning policy](docs/VERSIONS.md) for the encoding and release convention.
 

build.gradle

@@ -703,7 +703,7 @@ def preparedReleaseDir = providers.gradleProperty('preparedReleaseDir')
 tasks.register('verifyReleaseConfiguration') {
     group = 'verification'
     doLast {
-        if (project.mod_version != '4.0.9.120011'
+        if (project.mod_version != '4.0.10.120011'
                 || project.mod_group != expectedMavenGroup
                 || project.minecraft_version != '1.20.1'
                 || project.forge_version != '47.4.10'
@@ -717,9 +717,9 @@ tasks.register('verifyReleaseConfiguration') {
             throw new GradleException('Unexpected dispatcher or Java target metadata')
         }
         List<String> expectedPublicArtifacts = [
-                'OreSpawn-4.0.9.120011.jar',
-                'OreSpawn-4.0.9.120011-sources.jar',
-                'OreSpawn-4.0.9.120011-javadoc.jar'
+                'OreSpawn-4.0.10.120011.jar',
+                'OreSpawn-4.0.10.120011-sources.jar',
+                'OreSpawn-4.0.10.120011-javadoc.jar'
         ]
         if (base.archivesName.get() != expectedMavenArtifact
                 || expectedReleaseFiles.get().collect { it.toString() } != expectedPublicArtifacts) {
@@ -736,7 +736,7 @@ tasks.register('verifyReleaseConfiguration') {
                 'src/main/java/zone/moddev/mc/orespawn/worldgen/LegacyMineralogyProfileMigration.java',
                 'README.md', 'CHANGELOG.txt'
         ].each { path ->
-            if (!file(path).getText('UTF-8').contains('4.0.9.120011')) {
+            if (!file(path).getText('UTF-8').contains('4.0.10.120011')) {
                 throw new GradleException("Release identity missing from ${path}")
             }
         }

docs/VERSIONS.md

@@ -58,7 +58,7 @@ Examples:
 | 1.17.1 | Forge | `117011` | `4.0.9.117011` |
 | 1.18.2 | Forge | `118021` | `4.0.10.118021` |
 | 1.19.4 | Forge | `119041` | `4.0.10.119041` |
-| 1.20.1 | Forge | `120011` | `4.0.9.120011` |
+| 1.20.1 | Forge | `120011` | `4.0.10.120011` |
 | 1.20.6 | Forge | `120061` | `4.0.6.120061` |
 | 1.21.11 | Forge | `121111` | `4.0.6.121111` |
 | 26.1.2 | Forge | `2601021` | `4.0.6.2601021` |
@@ -152,7 +152,9 @@ If a different branch later receives a shared fix, it uses the next unused
 Bug number, such as Forge 1.14.4's `4.0.8.114041`, even though the 4.0.7 repair
 was not applicable there. Forge 1.15.2 through 1.20.1 then advanced to their
 target-qualified 4.0.9 releases for the provider terrain-host ordering repair.
-A branch may therefore legitimately skip functional version numbers.
+Forge 1.18.2 through 1.20.1 then advanced to their target-qualified 4.0.10
+releases for the distinct Stable Layers actual-height eligibility repair. A
+branch may therefore legitimately skip functional version numbers.
 
 This provides three useful guarantees:
 

gradle.properties

@@ -19,7 +19,7 @@ mcp_version=20230612.114412
 mod_id=orespawn
 mod_name=MMD OreSpawn
 mod_license=LGPL-2.1
-mod_version=4.0.9.120011
+mod_version=4.0.10.120011
 mod_group=zone.moddev.mc.orespawn
 mod_authors=SkyBlade1978, dshadowwolf, the MMD Team
 mod_description=Configurable, provider-driven terrain, ore, and deposit generation.

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

@@ -35,6 +35,7 @@ public final class BakedGeomeConfig {
 	private final Map<Biome, double[]> biomeWeights;
 	private final Map<ResourceLocation, double[]> biomeWeightsById;
 	private final double[] fallbackWeights;
+	private final RockEntry[] rocks;
 	private final BlockState[] rockStates;
 	private final Set<Block> sedimentaryBlocks;
 	private final Set<Block> oreReplaceableBlocks;
@@ -45,6 +46,9 @@ public final class BakedGeomeConfig {
 	private WeightedBlockPicker[][][] legacyRockPickers;
 	private byte[] stableFamilyChoices;
 	private int[] stableRockChoices;
+	private int[][] familyRockIndexes;
+	private double[][][] stableRockLogWeights;
+	private double[][][] stableRockPriorities;
 
 	BakedGeomeConfig(GeomeDefinition[] geomes, double geomeScale, double biomeInfluence,
 			double regionalNoiseInfluence, double boundaryNoiseInfluence, Map<Biome, double[]> biomeWeights,
@@ -72,6 +76,7 @@ public final class BakedGeomeConfig {
 			noiseOffsetZ[i] = -((i + 1) * 6151);
 		}
 
+		this.rocks = rocks.clone();
 		rockStates = new BlockState[rocks.length];
 		for (int i = 0; i < rocks.length; i++) {
 			rockStates[i] = rocks[i].state;
@@ -152,15 +157,69 @@ RockFamily pickFamily(int geomeIndex, int y, int formationValue, int diversitySl
 		return RockFamily.SEDIMENTARY;
 	}
 
+	RockFamily pickStableFamilyAtWorldY(int geomeIndex, int worldY, int formationY,
+			int formationValue, int diversitySlot) {
+		RockFamily preferred = pickFamily(geomeIndex, formationY, formationValue, diversitySlot);
+		if (hasEligibleStableRock(geomeIndex, preferred, worldY, formationY)) {
+			return preferred;
+		}
+
+		int bucket = formationValue & 0xFF;
+		int boundedFormationY = clampStableValue(formationY);
+		double bestScore = Double.NEGATIVE_INFINITY;
+		RockFamily bestFamily = preferred;
+		for (RockFamily family : RockFamily.values()) {
+			if (!hasEligibleStableRock(geomeIndex, family, worldY, formationY)) {
+				continue;
+			}
+			double weight = Math.pow(geomes[geomeIndex].familyWeights[family.ordinal()], 2.5D)
+					* familyDepthWeight(family, boundedFormationY);
+			if (weight <= 0.0D) {
+				continue;
+			}
+			double score = Math.log(weight) + gumbelPriority(bucket, geomeIndex, family.ordinal(),
+					isStableBucket(bucket, -1), 0x6A09E667F3BCC909L);
+			if (score > bestScore) {
+				bestScore = score;
+				bestFamily = family;
+			}
+		}
+		return bestFamily;
+	}
+
 	public BlockState pickRock(int geomeIndex, RockFamily family, int y, int formationValue) {
 		if (formations.usesStableLayers()) {
-			int index = stableRockIndex(geomeIndex, family.ordinal(), clampStableY(y), formationValue & 0xFF);
-			int rockIndex = stableRockChoices[index];
-			return rockIndex < 0 ? FALLBACK : rockStates[rockIndex];
+			return pickStableRockAtWorldY(geomeIndex, family, y, y, formationValue);
 		}
 		return legacyRockPickers[geomeIndex][family.ordinal()][clampLegacyY(y)].pick(formationValue);
 	}
 
+	BlockState pickStableRockAtWorldY(int geomeIndex, RockFamily family, int worldY,
+			int formationY, int formationValue) {
+		int yIndex = clampStableY(formationY);
+		int bucket = formationValue & 0xFF;
+		int choiceIndex = stableRockIndex(geomeIndex, family.ordinal(), yIndex, bucket);
+		int selectedRock = stableRockChoices[choiceIndex];
+		if (isEligibleStableRock(geomeIndex, selectedRock, worldY, yIndex)) {
+			return rockStates[selectedRock];
+		}
+
+		double bestScore = Double.NEGATIVE_INFINITY;
+		int bestRock = -1;
+		for (int rockIndex : familyRockIndexes[family.ordinal()]) {
+			if (!isEligibleStableRock(geomeIndex, rockIndex, worldY, yIndex)) {
+				continue;
+			}
+			double score = stableRockLogWeights[geomeIndex][rockIndex][yIndex]
+					+ stableRockPriorities[geomeIndex][rockIndex][bucket];
+			if (score > bestScore) {
+				bestScore = score;
+				bestRock = rockIndex;
+			}
+		}
+		return bestRock < 0 ? FALLBACK : rockStates[bestRock];
+	}
+
 	public String geomeName(int geomeIndex) {
 		return geomes[geomeIndex].name;
 	}
@@ -283,9 +342,9 @@ private void buildStablePickers(RockEntry[] rocks) {
 		stableRockChoices = new int[geomes.length * RockFamily.values().length * HEIGHT * FORMATION_BUCKETS];
 		Arrays.fill(stableRockChoices, -1);
 		int familyCount = RockFamily.values().length;
-		int[][] familyRockIndexes = groupRockIndexes(rocks);
-		double[][][] rockLogWeights = new double[geomes.length][rocks.length][HEIGHT];
-		double[][][] rockPriorities = new double[geomes.length][rocks.length][FORMATION_BUCKETS];
+		familyRockIndexes = groupRockIndexes(rocks);
+		stableRockLogWeights = new double[geomes.length][rocks.length][HEIGHT];
+		stableRockPriorities = new double[geomes.length][rocks.length][FORMATION_BUCKETS];
 		double[][][] familyLogWeights = new double[geomes.length][familyCount][HEIGHT];
 		double[][][] familyWeights = new double[geomes.length][familyCount][HEIGHT];
 		double[][][] familyPriorities = new double[geomes.length][familyCount][FORMATION_BUCKETS];
@@ -294,14 +353,13 @@ private void buildStablePickers(RockEntry[] rocks) {
 			for (int rockIndex = 0; rockIndex < rocks.length; rockIndex++) {
 				RockEntry rock = rocks[rockIndex];
 				for (int y = MIN_Y; y <= MAX_Y; y++) {
-					double rawWeight = y < rock.minY || y > rock.maxY ? 0.0D
-							: rock.weight * rock.geomeWeights[geome]
-									* depthWeight(y, rock.depthPeak, rock.depthSpread);
-					rockLogWeights[geome][rockIndex][y - MIN_Y] = rawWeight > 0.0D
+					double rawWeight = rock.weight * rock.geomeWeights[geome]
+							* depthWeight(y, rock.depthPeak, rock.depthSpread);
+					stableRockLogWeights[geome][rockIndex][y - MIN_Y] = rawWeight > 0.0D
 							? Math.log(rawWeight) : Double.NEGATIVE_INFINITY;
 				}
 				for (int bucket = 0; bucket < FORMATION_BUCKETS; bucket++) {
-					rockPriorities[geome][rockIndex][bucket] = gumbelPriority(bucket, geome, rockIndex,
+					stableRockPriorities[geome][rockIndex][bucket] = gumbelPriority(bucket, geome, rockIndex,
 							isStableBucket(bucket, rock.family.ordinal()),
 							0xBB67AE8584CAA73BL ^ ((long) rock.family.ordinal() << 32));
 				}
@@ -313,7 +371,9 @@ private void buildStablePickers(RockEntry[] rocks) {
 					int yIndex = y - MIN_Y;
 					boolean available = false;
 					for (int rockIndex : familyRockIndexes[familyIndex]) {
-						if (rockLogWeights[geome][rockIndex][yIndex] != Double.NEGATIVE_INFINITY) {
+						RockEntry rock = rocks[rockIndex];
+						if (y >= rock.minY && y <= rock.maxY
+								&& stableRockLogWeights[geome][rockIndex][yIndex] != Double.NEGATIVE_INFINITY) {
 							available = true;
 							break;
 						}
@@ -363,8 +423,12 @@ private void buildStablePickers(RockEntry[] rocks) {
 						double bestRockScore = Double.NEGATIVE_INFINITY;
 						int bestRock = -1;
 						for (int rockIndex : familyRockIndexes[familyIndex]) {
-							double rockScore = rockLogWeights[geome][rockIndex][yIndex]
-									+ rockPriorities[geome][rockIndex][bucket];
+							RockEntry rock = rocks[rockIndex];
+							if (y < rock.minY || y > rock.maxY) {
+								continue;
+							}
+							double rockScore = stableRockLogWeights[geome][rockIndex][yIndex]
+									+ stableRockPriorities[geome][rockIndex][bucket];
 							if (rockScore > bestRockScore) {
 								bestRockScore = rockScore;
 								bestRock = rockIndex;
@@ -377,6 +441,25 @@ private void buildStablePickers(RockEntry[] rocks) {
 		}
 	}
 
+	private boolean hasEligibleStableRock(int geomeIndex, RockFamily family, int worldY, int formationY) {
+		int yIndex = clampStableY(formationY);
+		for (int rockIndex : familyRockIndexes[family.ordinal()]) {
+			if (isEligibleStableRock(geomeIndex, rockIndex, worldY, yIndex)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private boolean isEligibleStableRock(int geomeIndex, int rockIndex, int worldY, int formationYIndex) {
+		if (rockIndex < 0) {
+			return false;
+		}
+		RockEntry rock = rocks[rockIndex];
+		return worldY >= rock.minY && worldY <= rock.maxY
+				&& stableRockLogWeights[geomeIndex][rockIndex][formationYIndex] != Double.NEGATIVE_INFINITY;
+	}
+
 	private void fillBalancedFamilyCycle(int geome, int yIndex, int bucket,
 			double[][][] familyWeights, double[][][] familyPriorities,
 			int[] quotas, int[] remaining, double[] remainders, boolean[] bonusAwarded) {
@@ -631,6 +714,10 @@ private static int clampStableY(int y) {
 		return Math.max(MIN_Y, Math.min(MAX_Y, y)) - MIN_Y;
 	}
 
+	private static int clampStableValue(int y) {
+		return Math.max(MIN_Y, Math.min(MAX_Y, y));
+	}
+
 	private static int clampLegacyY(int y) {
 		return Math.max(0, Math.min(LEGACY_MAX_Y, y));
 	}

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

@@ -143,7 +143,6 @@ private boolean replaceStableColumn(ChunkAccess chunk, BlockPos.MutableBlockPos
 		int layerStart = layerIndex * layerThickness;
 		int layerGeome = pickStableLayerGeome(geomeScores, geomeIndex, secondGeome,
 				layerIndex, geomeTransitionPhase);
-		BlockState replacement = pickStableReplacement(layerGeome, formationRegion, layerIndex);
 		boolean changed = false;
 		cursor.set(x, surfaceY, z);
 
@@ -154,12 +153,12 @@ private boolean replaceStableColumn(ChunkAccess chunk, BlockPos.MutableBlockPos
 				layerStart -= layerThickness;
 				layerGeome = pickStableLayerGeome(geomeScores, geomeIndex, secondGeome,
 						layerIndex, geomeTransitionPhase);
-				replacement = pickStableReplacement(layerGeome, formationRegion, layerIndex);
 			}
 			cursor.setY(y);
 			if (terrain.isReplaceable(chunk.getBlockState(cursor))
 					&& chunk.getBlockEntity(cursor) == null) {
-				chunk.setBlockState(cursor, replacement, false);
+				chunk.setBlockState(cursor,
+						pickStableReplacement(layerGeome, formationRegion, layerIndex, y), false);
 				changed = true;
 			}
 		}
@@ -252,7 +251,7 @@ private net.minecraft.world.level.block.state.BlockState pickReplacement(int geo
 		int stratum = baseRockValue + y;
 		int layerIndex = Math.floorDiv(stratum, layerThickness);
 		if (stableLayers) {
-			return pickStableReplacement(geomeIndex, formationRegion, layerIndex);
+			return pickStableReplacement(geomeIndex, formationRegion, layerIndex, y);
 		}
 
 		int layerY = y + (layerThickness / 2) - Math.floorMod(stratum, layerThickness);
@@ -262,7 +261,7 @@ private net.minecraft.world.level.block.state.BlockState pickReplacement(int geo
 		return config.pickRock(geomeIndex, family, layerY, rockHash);
 	}
 
-	private BlockState pickStableReplacement(int geomeIndex, long formationRegion, int layerIndex) {
+	private BlockState pickStableReplacement(int geomeIndex, long formationRegion, int layerIndex, int worldY) {
 		// A dipping or uplifted layer keeps the depth identity it had in stratum space.
 		int formationY = (layerIndex * layerThickness) + (layerThickness / 2);
 		int layerBucket = layerIndex & 0xFF;
@@ -288,8 +287,9 @@ private BlockState pickStableReplacement(int geomeIndex, long formationRegion, i
 			// from collapsing onto one exact rock.
 			rockBucket ^= LITHOLOGY_ROCK_SALTS[familySlot];
 		}
-		RockFamily family = config.pickFamily(geomeIndex, formationY, familyBucket, familySlot);
-		return config.pickRock(geomeIndex, family, formationY, rockBucket);
+		RockFamily family = config.pickStableFamilyAtWorldY(geomeIndex, worldY, formationY,
+				familyBucket, familySlot);
+		return config.pickStableRockAtWorldY(geomeIndex, family, worldY, formationY, rockBucket);
 	}
 
 	int stratumOffsetAt(int x, int z) {

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

@@ -358,7 +358,7 @@ private static void writeReport(Path config, List<String> lines) {
 
 	private static void writeUpgradeReport(Path config, int imported, List<String> detail) {
 		List<String> lines = new ArrayList<>();
-		lines.add("OreSpawn 4.0.9.120011 Upgrade Report");
+		lines.add("OreSpawn 4.0.10.120011 Upgrade Report");
 		lines.add("================================");
 		lines.add("");
 		lines.add("RESULT: Legacy OreSpawn settings were imported into the OS4 profile.");

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

@@ -204,7 +204,7 @@ private static void writeUpgradeReport(Path worldRoot, Path configPath,
         Path report = worldRoot.resolve("serverconfig/orespawn-upgrade-report.txt");
         List<String> missing = missingBlocks(igneous, metamorphic, sedimentary);
         List<String> lines = new ArrayList<>();
-        lines.add("OreSpawn 4.0.9.120011 Upgrade Report");
+        lines.add("OreSpawn 4.0.10.120011 Upgrade Report");
         lines.add("================================");
         lines.add("");
         lines.add("RESULT: Existing Mineralogy " + identity.version + " world detected.");