Skip to content

Commit 90cc9b7

Browse files
authored
Bring OreSpawn 4.1 to Minecraft 1.11.2
Keep older world settings, prevent duplicate ore rules when a world moves, and pick sulfur and lithium defaults after all mods have loaded.
1 parent 810c494 commit 90cc9b7

161 files changed

Lines changed: 19764 additions & 2826 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.

‎.editorconfig‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ root = true
44
end_of_line = lf
55
insert_final_newline = true
66

7+
[*.bat]
8+
end_of_line = crlf
9+
10+
[*.cmd]
11+
end_of_line = crlf
12+
713
[*.java]
814
charset = utf-8
915
indent_style = tab

‎.gitattributes‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* text=auto eol=lf
44

55
*.bat text eol=crlf
6-
#*.bat text eol=lf
6+
*.cmd text eol=crlf
77
*.gradle text diff=java
88
mcmod.info text
99
*.java text

‎.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.16.111021.jar
130-
build/libs/OreSpawn-4.0.16.111021-sources.jar
131-
build/libs/OreSpawn-4.0.16.111021-javadoc.jar
129+
build/libs/OreSpawn-4.1.6.111021.jar
130+
build/libs/OreSpawn-4.1.6.111021-sources.jar
131+
build/libs/OreSpawn-4.1.6.111021-javadoc.jar
132132
build/release/SHA256SUMS
133133
CHANGELOG.txt
134134

‎CHANGELOG.txt‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
## 4.1.6.111021
2+
3+
- Fix duplicate ore generation when an OreSpawn 1 world is moved without its converted provider file. Keep imported rules and saved choices, and back up the profile before removing a duplicate. Leave edited rules for review.
4+
- Pick the default sulfur and lithium sources after all mods have loaded. New setups can share those ores with Base Electric without adding extra veins. Existing worlds keep their choices and existing chunks stay as they are.
5+
6+
## 4.1.5.111021
7+
8+
- Bring the 4.1 provider, Ore Sources, biome and dimension-material features to Minecraft 1.11.2.
9+
- Keep existing provider settings and vanilla ore choices when importing old configs.
10+
- Bring the OreSpawn 1 compatibility bridge to 1.11.2 without running a second ore generator.
11+
- Support exact ore host variants and preserve native Mesa gold when vanilla ore management is off.
12+
- Make the Austrian German translation selectable and give Pirate Speak its own menu and guide text.
13+
14+
Version 4.0.17.111021
15+
16+
* Keep existing OreSpawn 4 provider settings when importing an older ore
17+
configuration. If there is no override yet, OreSpawn still imports the old
18+
rules as before.
19+
* Say which files were kept in the upgrade report without implying that their
20+
contents were validated.
21+
122
Version 4.0.16.111021
223

324
* Adopt the shared 4.0.16 release identity. Forge 1.11 has neither

‎README.md‎

Lines changed: 48 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,15 @@ 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.0.16.111021`: the OreSpawn 4.0.16
14-
feature set for Minecraft 1.11.2 and Forge. See the
15-
[versioning policy](docs/VERSIONS.md) for the encoding and release convention.
13+
This branch builds target-qualified version `4.1.6.111021`: the OreSpawn 4.1.6
14+
feature set for Minecraft 1.11.2 and Forge. It adds stable generation identity,
15+
non-loading geology sampling, per-resource background control, existing-world
16+
provider merge policy, an Ore Sources arbiter for equivalent provider ores, a
17+
biome directory with exact new-terrain replacement overrides, and a client
18+
world-settings extension point for add-ons such as Realistic Deposits. It also
19+
retains the legacy Codec bridge while preserving API
20+
major 1. See the [versioning policy](docs/VERSIONS.md) for the encoding and
21+
release convention.
1622

1723
Its deprecated OS3 compatibility layer imports OreSpawn 3 configuration and
1824
keeps existing OreSpawn 3 consumer jars working while translating their rules
@@ -22,6 +28,9 @@ metadata block states, exclusive legacy height ceilings, and the historical
2228
Metals. OreSpawn never schedules both the original OS3 generator and its OS4
2329
translation.
2430

31+
If you already have an OreSpawn 4 provider override, importing an older config
32+
leaves it in place. The upgrade report tells you which files were kept.
33+
2534
This is not the unrelated mod that adds mobs and dimensions under the same
2635
name.
2736

@@ -42,7 +51,33 @@ TerraBlender.
4251

4352
When a provider exposes world settings, use **OreSpawn...** on the Create World
4453
screen. **Recommended Defaults** restores the settings supplied by the
45-
installed mods and pack. The in-game **Help & Guide** explains the controls.
54+
installed mods and pack. **Mods** opens a directory of every loaded mod that
55+
OreSpawn recognizes through a current provider, legacy compatibility path, or
56+
client configuration hook. It shows each mod's version, integration lineage,
57+
provider revision and status; its cog opens an add-on-owned configuration
58+
screen when one is available. The in-game **Help & Guide** explains the other
59+
controls.
60+
61+
On the ORES tab, **Ore Sources...** opens a material-group editor with compact,
62+
independently scrolling group and output lists. Routine one-alias, one-output
63+
entries are hidden behind **Show All**. Red groups need review, yellow groups
64+
have a saved policy, and green entries need no action. **Balanced**, **Single**
65+
and **Custom** use one managed placement budget and choose one output for a
66+
whole vein or stable custom-deposit body; **Keep Original** preserves each
67+
active rule. A group's cog edits its friendly name, exact Ore Dictionary aliases
68+
and Placement Rules. Custom groups can be dissolved deterministically, and
69+
**Reset All** restores inferred and curated defaults. All changes remain pending
70+
until the main editor's **Done** action; Cancel discards them.
71+
72+
**Biomes** opens a directory covering every loaded, referenced and missing
73+
biome, all palettes in their effective order, replacement status, surfaces and
74+
placement constraints. Exact replacements apply only to newly generated
75+
terrain through a final reserved palette; chains flatten, cycles are rejected,
76+
and missing targets remain dormant until their mod returns. Dimension materials
77+
are shown beside the dimension selector because they apply to every biome in
78+
that dimension. Light-equivalent aquifer fluids use a compact generation mask
79+
and pre-decoration substitution, while fluids with different light properties
80+
retain the compatible generator path. Existing chunks are never rewritten.
4681

4782
Important files:
4883

@@ -121,14 +156,22 @@ from an empty Gradle home followed by an offline replay from that same cache:
121156
.\gradlew.bat genEclipseRuns verifyEclipseProductionClasspath --no-daemon
122157
```
123158

159+
Git stores text with LF endings and checks out source, guides, and `gradlew`
160+
with LF on every platform. Windows `.bat` and `.cmd` files use CRLF. The
161+
`.gitattributes` and `.editorconfig` files agree on this policy; a fresh
162+
checkout applies it without changing any Git or editor-wide settings.
163+
124164
`build` runs the standard `check` lifecycle. In addition to the JUnit suite,
125165
that lifecycle packages a test-only provider mod and verifies 2,304 exposed
126166
surface columns per built-in normal-noise End and Nether dimension, including
127167
underwater, immediate filler, and ceiling-underside behavior. It also proves
128168
later vegetation, structures, and block entities
129169
survive, validates provider-rock vanilla springs and an external ore-pattern
130170
registration, then reopens and checks the exact saved world. The fixture is
131-
not included in OreSpawn's published jars.
171+
not included in OreSpawn's published jars. It also verifies multiple palettes,
172+
an unmanaged loaded biome, exact new-terrain replacement, unchanged old chunks,
173+
Ore Sources persistence/reset behavior, dimension-scoped materials, and
174+
fresh/reload profile and generation parity.
132175

133176
Import or refresh the project with Eclipse Buildship, then run
134177
`genEclipseRuns` and `verifyEclipseProductionClasspath`. This branch uses

0 commit comments

Comments
 (0)