Skip to content

Commit d7e067b

Browse files
authored
Bring OreSpawn 4.1 to NeoForge 1.20.6
Add the 4.1 settings and follow-up fixes for NeoForge 1.20.6.
2 parents 86a1696 + 93eb6b1 commit d7e067b

138 files changed

Lines changed: 14312 additions & 1216 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.

‎.gitattributes‎

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

55
*.bat text eol=crlf
6-
#*.bat text eol=lf
76
*.gradle text diff=java
87
mcmod.info text
98
*.java text

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ jobs:
7373
if-no-files-found: error
7474
retention-days: 30
7575
path: |
76-
build/libs/OreSpawn-4.0.16.120062.jar
77-
build/libs/OreSpawn-4.0.16.120062-sources.jar
78-
build/libs/OreSpawn-4.0.16.120062-javadoc.jar
76+
build/libs/OreSpawn-4.1.0.120062.jar
77+
build/libs/OreSpawn-4.1.0.120062-sources.jar
78+
build/libs/OreSpawn-4.1.0.120062-javadoc.jar
7979
build/release/SHA256SUMS
8080
CHANGELOG.txt
8181
- name: Upload diagnostics on failure

‎CHANGELOG.txt‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
Version 4.1.0.120062
2+
3+
* Keep imported vanilla ore settings inactive while Manage Vanilla Ores is off.
4+
When it is on, use the imported settings without a second default ore pass.
5+
* Treat imported built-in patterns as ordinary veins while retaining saved
6+
placement choices and independent custom channels.
7+
* Show inactive sources separately from missing mods, without rewriting saved
8+
rules or choices just to display them.
9+
* Put Help & Guide beside Recommended Defaults and fit the world-creation tab
10+
above the footer in smaller windows.
11+
* Reject invalid geome names instead of silently changing their spelling.
12+
* Recognise inline vanilla ore features and release their wrappers when a
13+
server stops, while preserving shared feature identities across biomes.
14+
* Add an isolated shared-ore client profile and real Nether fresh/reload checks.
15+
* Use Minecraft Mod Development as the jar vendor.
16+
* Keep generated Javadoc artwork and license notices identical on Windows and Linux.
17+
18+
* Add provider extensions, the mod directory, ore-source groups and built-in MMD conflict defaults.
19+
* Add the biome directory, exact new-terrain replacements and dimension material controls.
20+
* Keep existing worlds' ore-source choices while starting new shared-tag MMD groups Balanced.
21+
* Split the NeoGradle build into smaller commented scripts and keep tracked text in LF format.
22+
123
Version 4.0.16.120062
224

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

‎README.md‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ 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 targets NeoForge 20.6.139 and Java 21. It keeps NeoForge's own
21+
registration, biome modifiers and development runs separate from the Forge
22+
build for the same Minecraft version.
23+
2024
## What Happens When It Is Installed?
2125

2226
OreSpawn is deliberately passive on its own. It does not replace stone, remove
@@ -36,6 +40,10 @@ When a provider exposes world settings, use **OreSpawn...** on the Create World
3640
screen. **Recommended Defaults** restores the settings supplied by the
3741
installed mods and pack. The in-game **Help & Guide** explains the controls.
3842

43+
Leave **Manage Vanilla Ores** off to keep normal Minecraft ore placement,
44+
including when an older configuration has been imported. Turning it on uses
45+
eligible imported settings instead of adding a second default placement pass.
46+
3947
Important files:
4048

4149
| Location | Purpose |
@@ -94,10 +102,10 @@ exported to `config/orespawn-guide/` without overwriting existing files.
94102

95103
## Building
96104

97-
This branch builds target-qualified version `4.0.16.120062`: the OreSpawn 4.0.16
105+
This branch builds target-qualified version `4.1.0.120062`: the OreSpawn 4.1
98106
feature set for Minecraft 1.20.6 and NeoForge.
99107

100-
OreSpawn 4.0.16.120062 uses NeoGradle 7.1.38 and Gradle 9.2.1. Use exact
108+
OreSpawn 4.1.0.120062 uses NeoGradle 7.1.38 and Gradle 9.2.1. Use exact
101109
Temurin 21.0.7+6 from the repository root:
102110

103111
```powershell
@@ -117,7 +125,7 @@ Import or refresh the project with Eclipse Buildship. NeoGradle supplies the
117125
Eclipse model and run configurations through the `eclipse` task; this branch
118126
does not use ForgeGradle's `genEclipseRuns` task.
119127

120-
The audited public outputs are `OreSpawn-4.0.16.120062.jar`, its sources jar,
128+
The audited public outputs are `OreSpawn-4.1.0.120062.jar`, its sources jar,
121129
and its Javadoc jar. CI additionally proves a cache-cold NeoGradle bootstrap
122130
and a same-cache offline rerun.
123131

0 commit comments

Comments
 (0)