Skip to content

Commit 3ca3b7f

Browse files
authored
Add exact ore host variants on 1.10.2
Keep existing provider settings and generation behaviour unchanged.
2 parents 05f838a + dc3fe7d commit 3ca3b7f

15 files changed

Lines changed: 219 additions & 16 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.1.3.110021.jar
130-
build/libs/OreSpawn-4.1.3.110021-sources.jar
131-
build/libs/OreSpawn-4.1.3.110021-javadoc.jar
129+
build/libs/OreSpawn-4.1.4.110021.jar
130+
build/libs/OreSpawn-4.1.4.110021-sources.jar
131+
build/libs/OreSpawn-4.1.4.110021-javadoc.jar
132132
build/release/SHA256SUMS
133133
CHANGELOG.txt
134134

‎CHANGELOG.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Version 4.1.4.110021
2+
3+
* Let Java providers select an exact legacy host variant, such as plain stone
4+
without granite. Keep existing block selectors and placement behaviour.
5+
* Reject invalid exact-host weights without leaving a partly configured host.
6+
17
Version 4.1.3.110021
28

39
* Apply hybrid and replacement background limits to imported built-in ore

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ It gives mods and modpacks one place to configure ores, deposit shapes, optional
1010
rock strata and geomes, provider-owned underground fluid deposits, biome
1111
palettes and world materials, flat bedrock, and bounded ore retrogen.
1212

13-
This branch builds target-qualified version `4.1.3.110021`: the OreSpawn 4.1.3
13+
This branch builds target-qualified version `4.1.4.110021`: the OreSpawn 4.1.4
1414
feature set for Minecraft 1.10.2 and Forge. It adds stable generation identity,
1515
non-loading geology sampling, per-resource background control, existing-world
1616
provider merge policy, an Ore Sources arbiter for equivalent provider ores and

‎docs/API.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# Java API
22

3+
## Exact legacy host states
4+
5+
Since 4.1.4.110021, Java providers can use `hostState(blockId, metadata)` on the
6+
ore dimension builder. For example, `hostState(new ResourceLocation("minecraft",
7+
"stone"), 0)` accepts plain stone without also accepting granite, diorite or
8+
andesite. A third argument supplies a replacement weight between zero and one.
9+
10+
`hostBlock` still selects the whole block, as before. Families and other hosts
11+
are alternatives, so do not add a broad stone or family selector when the
12+
restriction needs to be exact. This addition uses the existing JSON metadata
13+
matcher and does not change old providers. Mods that call the new method must
14+
require OreSpawn 4.1.4 or later; older providers keep their existing dependency
15+
range.
16+
317
This branch targets Minecraft 1.10.2 and Forge 12. Public examples therefore
418
use the public `ResourceLocation(String, String)` constructor. Forge 12 has no
519
`DeferredRegister`, so provider mods use OreSpawn's API-major-1

‎docs/VERSIONS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Examples:
5151

5252
| Minecraft | Loader | Target | Example full version |
5353
| --- | --- | ---: | --- |
54-
| 1.10.2 | Forge | `110021` | `4.1.3.110021` |
54+
| 1.10.2 | Forge | `110021` | `4.1.4.110021` |
5555
| 1.12.2 | Forge | `112021` | `4.0.6.112021` |
5656
| 1.13.2 | Forge | `113021` | `4.0.6.113021` |
5757
| 1.20.6 | Forge | `120061` | `4.0.6.120061` |

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ mod_vendor=Minecraft Mod Development
3030
mod_license=LGPL-2.1
3131
mod_license_name=GNU Lesser General Public License, Version 2.1
3232
mod_license_url=https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
33-
mod_version=4.1.3.110021
33+
mod_version=4.1.4.110021
3434
mod_group=zone.moddev.mc.orespawn
3535
mod_authors=SkyBlade1978, dshadowwolf, the MMD Team
3636
mod_description=Configurable, provider-driven terrain, ore, and deposit generation.

‎gradle/release/artifacts.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ tasks.register('verifyReleaseConfiguration') {
7777
description = 'Validates the target-qualified release, API, schemas, reports, and publishing identity.'
7878

7979
doLast {
80-
if (project.mod_version != '4.1.3.110021'
80+
if (project.mod_version != '4.1.4.110021'
8181
|| project.mod_group != expectedMavenGroup) {
8282
throw new GradleException("Unexpected OreSpawn release version: ${project.mod_version}")
8383
}
@@ -106,8 +106,8 @@ tasks.register('verifyReleaseConfiguration') {
106106
'src/main/java/zone/moddev/mc/orespawn/worldgen/LegacyOs3ProfileMigration.java',
107107
'README.md', 'CHANGELOG.txt'
108108
].each { path ->
109-
if (!file(path).getText('UTF-8').contains('4.1.3.110021')) {
110-
throw new GradleException("Authoritative release location does not contain 4.1.3.110021: ${path}")
109+
if (!file(path).getText('UTF-8').contains('4.1.4.110021')) {
110+
throw new GradleException("Authoritative release location does not contain 4.1.4.110021: ${path}")
111111
}
112112
}
113113
if (!file('docs/API.md').getText('UTF-8').contains('orespawn@[4.0.6,5.0.0)')) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1027,7 +1027,7 @@ private static void writeHumanUpgradeReport(Path destination) throws IOException
10271027
}
10281028
}
10291029
List<String> lines = new ArrayList<>();
1030-
lines.add("OreSpawn 4.1.3.110021 Upgrade Report");
1030+
lines.add("OreSpawn 4.1.4.110021 Upgrade Report");
10311031
lines.add("================================");
10321032
lines.add("");
10331033
lines.add("RESULT: Legacy OreSpawn configuration was consumed and translated for OS4.");

‎src/main/java/cyano/orespawn/OreSpawn.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class OreSpawn {
1919
public static OreSpawn INSTANCE;
2020
public static final String MODID = "orespawn";
2121
public static final String NAME = "OreSpawn";
22-
public static final String VERSION = "4.1.3.110021";
22+
public static final String VERSION = "4.1.4.110021";
2323
public static final List<Path> oreSpawnConfigFiles = new ArrayList<>();
2424
public static final List<String> additionalStoneBlocks = new ArrayList<>();
2525
public static boolean disableVanillaOreGen;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class OreSpawn {
5252

5353
public static final String MODID = "orespawn";
5454
public static final String NAME = "OreSpawn";
55-
public static final String VERSION = "4.1.3.110021";
55+
public static final String VERSION = "4.1.4.110021";
5656

5757
private static final Logger LOGGER = LogManager.getLogger();
5858

0 commit comments

Comments
 (0)