Record shared 4.0.16 release identity

Author: SkyBlade1978

.github/workflows/ci.yml

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

CHANGELOG.txt

@@ -1,3 +1,12 @@
+Version 4.0.16.112021
+
+* Adopt the shared 4.0.16 release identity. Forge 1.12 has neither
+  three-dimensional biome-cell attribution nor a server-side GameTest harness,
+  so the 4.0.15 attribution and 4.0.16 GameTest lifecycle repairs are not
+  applicable on this target.
+* Ordinary dedicated benchmark servers continue to stop automatically when
+  requested.
+
 Version 4.0.14.112021
 
 * Convert exposed one-layer vanilla Snow from the first free cell immediately

README.md

@@ -10,7 +10,7 @@ It gives mods and modpacks one place to configure ores, deposit shapes, optional
 rock strata and geomes, provider-owned underground fluid deposits, biome
 palettes and world materials, flat bedrock, and bounded ore retrogen.
 
-This branch builds target-qualified version `4.0.14.112021`: the OreSpawn 4.0.14
+This branch builds target-qualified version `4.0.16.112021`: the OreSpawn 4.0.16
 feature set for Minecraft 1.12.2 and Forge. See the
 [versioning policy](docs/VERSIONS.md) for the encoding and release convention.
 

build.gradle

@@ -512,6 +512,7 @@ level-name=surface-integration-world
 level-seed=zsjpxah
 level-type=default
 online-mode=false
+server-port=0
 allow-nether=true
 generate-structures=false
 spawn-protection=0
@@ -1169,6 +1170,7 @@ level-name=surface-integration-world
 level-seed=zsjpxah
 level-type=default
 online-mode=false
+server-port=0
 allow-nether=true
 generate-structures=false
 spawn-protection=0
@@ -1328,7 +1330,7 @@ tasks.register('verifyReleaseConfiguration') {
     description = 'Validates the target-qualified release, API, schemas, reports, and publishing identity.'
 
     doLast {
-        if (project.mod_version != '4.0.14.112021'
+        if (project.mod_version != '4.0.16.112021'
                 || project.mod_group != expectedMavenGroup) {
             throw new GradleException("Unexpected OreSpawn release version: ${project.mod_version}")
         }
@@ -1355,8 +1357,8 @@ tasks.register('verifyReleaseConfiguration') {
                 'src/main/java/zone/moddev/mc/orespawn/worldgen/LegacyOs3ProfileMigration.java',
                 'README.md', 'CHANGELOG.txt'
         ].each { path ->
-            if (!file(path).getText('UTF-8').contains('4.0.14.112021')) {
-                throw new GradleException("Authoritative release location does not contain 4.0.14.112021: ${path}")
+            if (!file(path).getText('UTF-8').contains('4.0.16.112021')) {
+                throw new GradleException("Authoritative release location does not contain 4.0.16.112021: ${path}")
             }
         }
         if (!file('docs/API.md').getText('UTF-8').contains('orespawn@[4.0.6,5.0.0)')) {

docs/VERSIONS.md

@@ -52,7 +52,7 @@ Examples:
 | Minecraft | Loader | Target | Example full OreSpawn version |
 | --- | --- | ---: | --- |
 | 1.10.2 | Forge | `110021` | `4.0.6.110021` |
-| 1.12.2 | Forge | `112021` | `4.0.14.112021` |
+| 1.12.2 | Forge | `112021` | `4.0.16.112021` |
 | 1.13.2 | Forge | `113021` | `4.0.6.113021` |
 | 1.20.6 | Forge | `120061` | `4.0.6.120061` |
 | 1.21.11 | Forge | `121111` | `4.0.6.121111` |
@@ -151,7 +151,11 @@ two-dimensional biome system, so the dynamic-registry and vertical sampler
 repairs released as 4.0.11 and 4.0.12 are not applicable; it advances directly
 to 4.0.13 for provider biome-filter parity and namespaced geome support, then to
 4.0.14 so exposed one-layer Snow is included in configured weather-material
-conversion. A branch may therefore legitimately skip functional version numbers.
+conversion. Forge 1.12 has no Y-sensitive biome-cell attribution or server-side
+GameTest harness, so 4.0.15 and the GameTest lifecycle portion of 4.0.16 are not
+applicable; it adopts the shared 4.0.16 identity while retaining ordinary
+benchmark auto-stop. A branch may therefore legitimately skip functional version
+numbers.
 
 This provides three useful guarantees:
 

gradle.properties

@@ -26,7 +26,7 @@ curseforge_project_id=245586
 mod_id=orespawn
 mod_name=MMD OreSpawn
 mod_license=LGPL-2.1
-mod_version=4.0.14.112021
+mod_version=4.0.16.112021
 mod_group=zone.moddev.mc.orespawn
 mod_authors=SkyBlade1978, dshadowwolf, the MMD Team
 mod_description=Configurable, provider-driven terrain, ore, and deposit generation.

src/clientIntegrationTest/java/zone/moddev/mc/orespawn/client/ClientProbeTestMod.java

@@ -155,13 +155,10 @@ public void onClientTick(TickEvent.ClientTickEvent event) {
 				case 8:
 					if (minecraft.world != null && minecraft.player != null && reloadWorldFrames >= 8
 							&& stateTicks >= 100) {
-						stopIntegratedServer(minecraft);
-						nextState(9);
-					}
-					break;
-				case 9:
-					if (minecraft.world == null && !minecraft.isIntegratedServerRunning()) {
 						writeMarker();
+						// Let Minecraft's normal client shutdown own the final integrated-server
+						// disconnect. A second manual loadWorld(null) can leave already-scheduled
+						// 1.12 entity packets targeting a world that has just been removed.
 						minecraft.shutdown();
 						nextState(10);
 					}

src/main/java/com/mcmoddev/orespawn/compat/LegacyOs3Bridge.java

@@ -818,7 +818,7 @@ private static void writeHumanUpgradeReport(Path destination) throws IOException
 			}
 		}
 		List<String> lines = new ArrayList<>();
-		lines.add("OreSpawn 4.0.14.112021 Upgrade Report");
+		lines.add("OreSpawn 4.0.16.112021 Upgrade Report");
 		lines.add("================================");
 		lines.add("");
 		lines.add("RESULT: Legacy OreSpawn configuration was consumed and translated for OS4.");

src/main/java/zone/moddev/mc/orespawn/OreSpawn.java

@@ -52,7 +52,7 @@ public class OreSpawn {
 
 	public static final String MODID = "orespawn";
 	public static final String NAME = "OreSpawn";
-	public static final String VERSION = "4.0.14.112021";
+	public static final String VERSION = "4.0.16.112021";
 
 	private static final Logger LOGGER = LogManager.getLogger();
 

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

@@ -152,7 +152,7 @@ private static void writeUpgradeReport(Path worldRoot, Path configDirectory,
 		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.14.112021 Upgrade Report");
+		lines.add("OreSpawn 4.0.16.112021 Upgrade Report");
 		lines.add("================================");
 		lines.add("");
 		lines.add("RESULT: Existing Mineralogy " + identity.version + " world detected.");