Skip to content

Commit aafa8ad

Browse files
committed
Bring OreSpawn 4.1 to Forge 1.20.6
1 parent 117e8a1 commit aafa8ad

132 files changed

Lines changed: 13984 additions & 1820 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
test ! -e "$GRADLE_USER_HOME"
5454
mkdir -p "$GRADLE_USER_HOME"
5555
chmod +x ./gradlew
56-
./gradlew verifyMavenizerCompatibilityFixture help \
56+
./gradlew classes verifyLegacyFixtures verifyMavenizerCompatibilityFixture \
5757
--no-daemon --no-build-cache --stacktrace --max-workers=2 \
5858
-Dorg.gradle.java.installations.paths="$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64" \
5959
-Dorg.gradle.java.installations.auto-detect=false \
@@ -68,14 +68,14 @@ jobs:
6868
| sort -z | xargs -0 -r sha256sum > "$RUNNER_TEMP/markers-before.sha256"
6969
test -s "$RUNNER_TEMP/markers-before.sha256"
7070
71-
- name: Verify same-cache preparation is idempotent
71+
- name: Replay the compiled target offline
7272
shell: bash
7373
env:
7474
GRADLE_USER_HOME: ${{ runner.temp }}/orespawn-cold-gradle
7575
run: |
7676
set -euo pipefail
77-
./gradlew verifyMavenizerCompatibilityFixture help \
78-
--no-daemon --no-build-cache --stacktrace --max-workers=2 \
77+
./gradlew classes verifyLegacyFixtures verifyMavenizerCompatibilityFixture \
78+
--offline --rerun-tasks --no-daemon --no-build-cache --stacktrace --max-workers=2 \
7979
-Dorg.gradle.java.installations.paths="$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64" \
8080
-Dorg.gradle.java.installations.auto-detect=false \
8181
-Dorg.gradle.java.installations.auto-download=false
@@ -120,7 +120,7 @@ jobs:
120120
- name: Build, test, and audit release artifacts
121121
run: >-
122122
./gradlew clean check build javadoc verifyReleaseArtifacts writeReleaseChecksums
123-
verifyEclipseProductionClasspath --no-daemon --stacktrace
123+
verifyEclipseProductionClasspath --no-daemon --no-build-cache --stacktrace
124124
-Dorg.gradle.java.installations.paths="$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64"
125125
-Dorg.gradle.java.installations.auto-detect=false
126126
-Dorg.gradle.java.installations.auto-download=false
@@ -132,9 +132,9 @@ jobs:
132132
if-no-files-found: error
133133
retention-days: 30
134134
path: |
135-
build/libs/OreSpawn-4.0.16.120061.jar
136-
build/libs/OreSpawn-4.0.16.120061-sources.jar
137-
build/libs/OreSpawn-4.0.16.120061-javadoc.jar
135+
build/libs/OreSpawn-4.1.0.120061.jar
136+
build/libs/OreSpawn-4.1.0.120061-sources.jar
137+
build/libs/OreSpawn-4.1.0.120061-javadoc.jar
138138
build/release/SHA256SUMS
139139
CHANGELOG.txt
140140

‎CHANGELOG.txt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
Version 4.1.0.120061
2+
3+
* Add a Mods directory showing each installed mod's OreSpawn settings.
4+
* Add Ore Sources controls for shared ores, with Balanced, Single, Custom and Keep Original choices.
5+
* Start known shared MMD ores in Balanced mode, with one placement budget and all eligible outputs selected.
6+
* Add custom ore groups, review controls, resets and clearer placement-source choices.
7+
* Add a biome directory, exact replacements in new terrain and provider palette settings.
8+
* Make World Materials clearly dimension-wide rather than specific to the selected biome.
9+
* Keep missing-mod settings and saved world policies when upgrading profiles to schemas 5, 8 and 7.
10+
* Keep Help & Guide beside Recommended Defaults so the main menus fit smaller windows.
11+
* Restrict fluid-deposit block selection to fluids and wrap empty-list messages.
12+
* Clear native ore wrappers when a server stops so settings are rebuilt for the next world.
13+
* Split the build into smaller commented scripts, improve Eclipse test launches and use LF for shared text files.
14+
115
Version 4.0.16.120061
216

317
* Leave benchmark shutdown to the GameTest harness when a benchmark is run

‎README.md‎

Lines changed: 17 additions & 4 deletions
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.16.120061`: the OreSpawn 4.0.16
20+
This branch builds target-qualified version `4.1.0.120061`: the OreSpawn 4.1
2121
feature set for Minecraft 1.20.6 and Forge. See the
2222
[versioning policy](docs/VERSIONS.md) for the encoding and release convention.
2323

@@ -54,6 +54,15 @@ Important files:
5454
Profile edits affect newly generated chunks. Ore and flat-bedrock retrogen are
5555
separate opt-in features; OreSpawn never retro-generates rock strata.
5656

57+
**Ore Sources** groups ores by exact block tags such as `forge:ores/sulfur`.
58+
When two loaded ordinary MMD providers share one tag, new worlds use a
59+
Balanced output policy and one placement budget per channel. Older worlds keep
60+
their saved Keep Original behaviour. Imported Ore Dictionary aliases remain
61+
visible but dormant until you assign a known exact block tag. The **Biomes**
62+
directory can replace one loaded biome with another in new terrain; its
63+
**Overworld Materials** control applies across the dimension, not just the
64+
selected biome.
65+
5766
When an already-generated world has saved Mineralogy 1.10, 1.12, or 5.x mod
5867
metadata but no OreSpawn world profile, OreSpawn reads the matching published
5968
configuration contract and records the exact engine, numeric settings, rock
@@ -119,8 +128,12 @@ and fixtures. Published jars are deterministic and retain Forge 50's official
119128
runtime names, are audited for their four access-transformer rules and contents, and
120129
accompanied by SHA-256 checksums.
121130

122-
Machine-specific `AGENTS.md` and `agent-notes/` files are intentionally ignored.
123-
Public developer and AI integration guidance lives in `docs/` and is included
124-
in the built jar.
131+
Developer and player guides live in `docs/` and are included in the built jar.
132+
133+
For shared-ore GUI testing, generate the Eclipse launches and open
134+
`runOreSourcesClient.launch` or `runTestOreSourcesClient.launch`. These add two
135+
test-only providers and keep your settings in `run-ore-sources`, separate from
136+
the ordinary launch. `oreSourcesClientIntegrationTest` runs the corresponding
137+
automated check without changing that manual profile.
125138

126139
OreSpawn is licensed under LGPL-2.1.

0 commit comments

Comments
 (0)