Add exact ore host variants on 1.10.2

Author: SkyBlade1978

.github/workflows/ci.yml

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

CHANGELOG.txt

@@ -1,3 +1,9 @@
+Version 4.1.4.110021
+
+* Let Java providers select an exact legacy host variant, such as plain stone
+  without granite. Keep existing block selectors and placement behaviour.
+* Reject invalid exact-host weights without leaving a partly configured host.
+
 Version 4.1.3.110021
 
 * Apply hybrid and replacement background limits to imported built-in ore

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.1.3.110021`: the OreSpawn 4.1.3
+This branch builds target-qualified version `4.1.4.110021`: the OreSpawn 4.1.4
 feature set for Minecraft 1.10.2 and Forge. It adds stable generation identity,
 non-loading geology sampling, per-resource background control, existing-world
 provider merge policy, an Ore Sources arbiter for equivalent provider ores and

docs/API.md

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

docs/VERSIONS.md

@@ -51,7 +51,7 @@ Examples:
 
 | Minecraft | Loader | Target | Example full version |
 | --- | --- | ---: | --- |
-| 1.10.2 | Forge | `110021` | `4.1.3.110021` |
+| 1.10.2 | Forge | `110021` | `4.1.4.110021` |
 | 1.12.2 | Forge | `112021` | `4.0.6.112021` |
 | 1.13.2 | Forge | `113021` | `4.0.6.113021` |
 | 1.20.6 | Forge | `120061` | `4.0.6.120061` |

gradle.properties

@@ -30,7 +30,7 @@ mod_vendor=Minecraft Mod Development
 mod_license=LGPL-2.1
 mod_license_name=GNU Lesser General Public License, Version 2.1
 mod_license_url=https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
-mod_version=4.1.3.110021
+mod_version=4.1.4.110021
 mod_group=zone.moddev.mc.orespawn
 mod_authors=SkyBlade1978, dshadowwolf, the MMD Team
 mod_description=Configurable, provider-driven terrain, ore, and deposit generation.

gradle/release/artifacts.gradle

@@ -77,7 +77,7 @@ tasks.register('verifyReleaseConfiguration') {
     description = 'Validates the target-qualified release, API, schemas, reports, and publishing identity.'
 
     doLast {
-        if (project.mod_version != '4.1.3.110021'
+        if (project.mod_version != '4.1.4.110021'
                 || project.mod_group != expectedMavenGroup) {
             throw new GradleException("Unexpected OreSpawn release version: ${project.mod_version}")
         }
@@ -106,8 +106,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.1.3.110021')) {
-                throw new GradleException("Authoritative release location does not contain 4.1.3.110021: ${path}")
+            if (!file(path).getText('UTF-8').contains('4.1.4.110021')) {
+                throw new GradleException("Authoritative release location does not contain 4.1.4.110021: ${path}")
             }
         }
         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

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

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

@@ -19,7 +19,7 @@ public class OreSpawn {
 	public static OreSpawn INSTANCE;
 	public static final String MODID = "orespawn";
 	public static final String NAME = "OreSpawn";
-	public static final String VERSION = "4.1.3.110021";
+	public static final String VERSION = "4.1.4.110021";
 	public static final List<Path> oreSpawnConfigFiles = new ArrayList<>();
 	public static final List<String> additionalStoneBlocks = new ArrayList<>();
 	public static boolean disableVanillaOreGen;

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.1.3.110021";
+	public static final String VERSION = "4.1.4.110021";
 
 	private static final Logger LOGGER = LogManager.getLogger();