Dropped minecraft-common scope

- Generation revision no longer requires the removed minecraft-common sources
- Modded shared inputs drop the removed module
- Loader source sets no longer add the removed module
- README points shared Minecraft-native code at VolmLib
This commit is contained in:
Brian Neumann-Fopiano committed 2026-09-29 00:50:30 -04:00
1 parent 85849693b6
commit d6226240a0
7 files changed
+5 -9

No files matched your search

+4 -3
View File
@@ -298,9 +298,10 @@ properties:
| `-PirisWorldCheck=<world>` | `iris.worldcheck` | Post-generation world integrity check | | `-PirisWorldCheck=<world>` | `iris.worldcheck` | Post-generation world integrity check |
Fabric additionally takes `-PirisClientRunDir=<dir>` to relocate the `runClient` working directory. Fabric additionally takes `-PirisClientRunDir=<dir>` to relocate the `runClient` working directory.
Shared code lives in `adapters/minecraft-common` (all adapters), `adapters/modded-common` Shared code lives in `adapters/modded-common` (loaders + the shared test suite) and
(loaders + the shared test suite), and `adapters/client-common` (client HUD and world-type `adapters/client-common` (client HUD and world-type screens); every adapter adds those source
screens); every adapter adds those source directories, so one edit reaches all three loaders. directories, so one edit reaches all three loaders. Shared Minecraft-native code lives in VolmLib
(`native/minecraft-common`).
For IDE import you can surface the three adapter builds in the root composite with For IDE import you can surface the three adapter builds in the root composite with
`-PincludeModdedAdapters=true`. It is off by default: each adapter includes the root build back to `-PincludeModdedAdapters=true`. It is off by default: each adapter includes the root build back to
-1
View File
@@ -83,7 +83,6 @@ sourceSets {
main { main {
java { java {
srcDir '../modded-common/src/main/java' srcDir '../modded-common/src/main/java'
srcDir '../minecraft-common/src/main/java'
srcDir '../client-common/src/main/java' srcDir '../client-common/src/main/java'
} }
resources { resources {
-1
View File
@@ -91,7 +91,6 @@ sourceSets {
main { main {
java { java {
srcDir '../modded-common/src/main/java' srcDir '../modded-common/src/main/java'
srcDir '../minecraft-common/src/main/java'
srcDir '../client-common/src/main/java' srcDir '../client-common/src/main/java'
} }
resources { resources {
@@ -17,7 +17,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
/** /**
* Dist gate. The loader source sets fold modded-common, minecraft-common and client-common into one output, so * Dist gate. The loader source sets fold modded-common and client-common into one output, so
* nothing at compile time stops a server-side class from touching a client-only type. On a dedicated server * nothing at compile time stops a server-side class from touching a client-only type. On a dedicated server
* that is a NoClassDefFoundError at the first call, usually deep inside worldgen. * that is a NoClassDefFoundError at the first call, usually deep inside worldgen.
* *
-1
View File
@@ -84,7 +84,6 @@ sourceSets {
main { main {
java { java {
srcDir '../modded-common/src/main/java' srcDir '../modded-common/src/main/java'
srcDir '../minecraft-common/src/main/java'
srcDir '../client-common/src/main/java' srcDir '../client-common/src/main/java'
} }
resources { resources {
-1
View File
@@ -340,7 +340,6 @@ Closure<File> resolveLocalVolmLibDirectory = { ->
List<Object> moddedSharedInputs = [] List<Object> moddedSharedInputs = []
[ [
'adapters/modded-common/src', 'adapters/modded-common/src',
'adapters/minecraft-common/src',
'adapters/client-common/src', 'adapters/client-common/src',
'core/src/main', 'core/src/main',
'core/build.gradle', 'core/build.gradle',
@@ -11,7 +11,6 @@ public final class GenerationRevisionScope {
"core/src/main/java", "core/src/main/java",
"spi/src/main/java", "spi/src/main/java",
"adapters/bukkit/plugin/src/main/java", "adapters/bukkit/plugin/src/main/java",
"adapters/minecraft-common/src/main/java",
"adapters/modded-common/src/main/java", "adapters/modded-common/src/main/java",
"adapters/client-common/src/main/java", "adapters/client-common/src/main/java",
"adapters/fabric/src/main/java", "adapters/fabric/src/main/java",