Skip to content

Commit 7daa13b

Browse files
committed
Record shared 4.0.16 release identity
1 parent 890d0ef commit 7daa13b

8 files changed

Lines changed: 29 additions & 15 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ jobs:
126126
if-no-files-found: error
127127
retention-days: 30
128128
path: |
129-
build/libs/OreSpawn-4.0.14.114041.jar
130-
build/libs/OreSpawn-4.0.14.114041-sources.jar
131-
build/libs/OreSpawn-4.0.14.114041-javadoc.jar
129+
build/libs/OreSpawn-4.0.16.114041.jar
130+
build/libs/OreSpawn-4.0.16.114041-sources.jar
131+
build/libs/OreSpawn-4.0.16.114041-javadoc.jar
132132
build/release/SHA256SUMS
133133
CHANGELOG.txt
134134

‎CHANGELOG.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
Version 4.0.16.114041
2+
3+
* Adopt the shared 4.0.16 release identity. Forge 1.14 has neither
4+
three-dimensional biome-cell attribution nor a server-side GameTest harness,
5+
so the 4.0.15 attribution and 4.0.16 GameTest lifecycle repairs are not
6+
applicable on this target.
7+
* Ordinary dedicated benchmark servers continue to stop automatically when
8+
requested.
9+
110
Version 4.0.14.114041
211

312
* Convert exposed one-layer vanilla Snow from the first free cell immediately

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ End" policy used by mods such as Base Metals.
1717
This is not the unrelated mod that adds mobs and dimensions under the same
1818
name.
1919

20-
This branch builds target-qualified version `4.0.14.114041`: the OreSpawn 4.0.14
20+
This branch builds target-qualified version `4.0.16.114041`: the OreSpawn 4.0.16
2121
feature set for Minecraft 1.14.4 and Forge. See the
2222
[versioning policy](docs/VERSIONS.md) for the encoding and release convention.
2323

‎build.gradle‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,7 @@ level-name=surface-integration-world
468468
level-seed=zsjpxah
469469
level-type=default
470470
online-mode=false
471+
server-port=0
471472
allow-nether=true
472473
generate-structures=false
473474
spawn-protection=0
@@ -736,7 +737,7 @@ def preparedReleaseDir = providers.gradleProperty('preparedReleaseDir')
736737
tasks.register('verifyReleaseConfiguration') {
737738
group = 'verification'
738739
doLast {
739-
if (project.mod_version != '4.0.14.114041'
740+
if (project.mod_version != '4.0.16.114041'
740741
|| project.mod_group != expectedMavenGroup
741742
|| project.minecraft_version != '1.14.4'
742743
|| project.forge_version != '28.2.26'
@@ -750,9 +751,9 @@ tasks.register('verifyReleaseConfiguration') {
750751
throw new GradleException('Unexpected dispatcher or Java target metadata')
751752
}
752753
List<String> expectedPublicArtifacts = [
753-
'OreSpawn-4.0.14.114041.jar',
754-
'OreSpawn-4.0.14.114041-sources.jar',
755-
'OreSpawn-4.0.14.114041-javadoc.jar'
754+
'OreSpawn-4.0.16.114041.jar',
755+
'OreSpawn-4.0.16.114041-sources.jar',
756+
'OreSpawn-4.0.16.114041-javadoc.jar'
756757
]
757758
if (base.archivesName.get() != expectedMavenArtifact
758759
|| expectedReleaseFiles.get().collect { it.toString() } != expectedPublicArtifacts) {
@@ -769,7 +770,7 @@ tasks.register('verifyReleaseConfiguration') {
769770
'src/main/java/zone/moddev/mc/orespawn/worldgen/LegacyMineralogyProfileMigration.java',
770771
'README.md', 'CHANGELOG.txt'
771772
].each { path ->
772-
if (!file(path).getText('UTF-8').contains('4.0.14.114041')) {
773+
if (!file(path).getText('UTF-8').contains('4.0.16.114041')) {
773774
throw new GradleException("Release identity missing from ${path}")
774775
}
775776
}
@@ -1294,6 +1295,7 @@ level-name=surface-integration-world
12941295
level-seed=zsjpxah
12951296
level-type=default
12961297
online-mode=false
1298+
server-port=0
12971299
allow-nether=true
12981300
generate-structures=false
12991301
spawn-protection=0

‎docs/VERSIONS.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Examples:
5252
| Minecraft | Loader | Target | Example full OreSpawn version |
5353
| --- | --- | ---: | --- |
5454
| 1.13.2 | Forge | `113021` | `4.0.6.113021` |
55-
| 1.14.4 | Forge | `114041` | `4.0.14.114041` |
55+
| 1.14.4 | Forge | `114041` | `4.0.16.114041` |
5656
| 1.20.6 | Forge | `120061` | `4.0.6.120061` |
5757
| 1.21.11 | Forge | `121111` | `4.0.6.121111` |
5858
| 26.1.2 | Forge | `2601021` | `4.0.6.2601021` |
@@ -151,8 +151,11 @@ static, two-dimensional biome provider, so the dynamic-registry and vertical
151151
sampler repairs released as 4.0.11 and 4.0.12 are not applicable; it advances
152152
directly to 4.0.13 for provider biome-filter parity and namespaced geome support,
153153
then to 4.0.14 so one-layer Snow above the motion-blocking surface is included
154-
in configured weather-material conversion. A branch may therefore legitimately
155-
skip functional version numbers.
154+
in configured weather-material conversion. Forge 1.14 has no Y-sensitive biome
155+
cell attribution or server-side GameTest harness, so 4.0.15 and the GameTest
156+
lifecycle portion of 4.0.16 are not applicable; it adopts the shared 4.0.16
157+
identity while retaining ordinary benchmark auto-stop. A branch may therefore
158+
legitimately skip functional version numbers.
156159

157160
This provides three useful guarantees:
158161

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ mcp_version=20190829.143755
1919
mod_id=orespawn
2020
mod_name=MMD OreSpawn
2121
mod_license=LGPL-2.1
22-
mod_version=4.0.14.114041
22+
mod_version=4.0.16.114041
2323
mod_group=zone.moddev.mc.orespawn
2424
mod_authors=SkyBlade1978, dshadowwolf, the MMD Team
2525
mod_description=Configurable, provider-driven terrain, ore, and deposit generation.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ private static void writeReport(Path config, List<String> lines) {
359359

360360
private static void writeUpgradeReport(Path config, int imported, List<String> detail) {
361361
List<String> lines = new ArrayList<>();
362-
lines.add("OreSpawn 4.0.14.114041 Upgrade Report");
362+
lines.add("OreSpawn 4.0.16.114041 Upgrade Report");
363363
lines.add("================================");
364364
lines.add("");
365365
lines.add("RESULT: Legacy OreSpawn settings were imported into the OS4 profile.");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ private static void writeUpgradeReport(Path worldRoot, Path configPath,
199199
Path report = worldRoot.resolve("serverconfig/orespawn-upgrade-report.txt");
200200
List<String> missing = missingBlocks(igneous, metamorphic, sedimentary);
201201
List<String> lines = new ArrayList<>();
202-
lines.add("OreSpawn 4.0.14.114041 Upgrade Report");
202+
lines.add("OreSpawn 4.0.16.114041 Upgrade Report");
203203
lines.add("================================");
204204
lines.add("");
205205
lines.add("RESULT: Existing Mineralogy " + identity.version + " world detected.");

0 commit comments

Comments
 (0)