mirror of
https://github.com/VolmitSoftware/Iris.git
synced 2026-10-12 03:24:14 +00:00
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:
@@ -298,9 +298,10 @@ properties:
|
||||
| `-PirisWorldCheck=<world>` | `iris.worldcheck` | Post-generation world integrity check |
|
||||
|
||||
Fabric additionally takes `-PirisClientRunDir=<dir>` to relocate the `runClient` working directory.
|
||||
Shared code lives in `adapters/minecraft-common` (all adapters), `adapters/modded-common`
|
||||
(loaders + the shared test suite), and `adapters/client-common` (client HUD and world-type
|
||||
screens); every adapter adds those source directories, so one edit reaches all three loaders.
|
||||
Shared code lives in `adapters/modded-common` (loaders + the shared test suite) and
|
||||
`adapters/client-common` (client HUD and world-type screens); every adapter adds those source
|
||||
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
|
||||
`-PincludeModdedAdapters=true`. It is off by default: each adapter includes the root build back to
|
||||
|
||||
@@ -83,7 +83,6 @@ sourceSets {
|
||||
main {
|
||||
java {
|
||||
srcDir '../modded-common/src/main/java'
|
||||
srcDir '../minecraft-common/src/main/java'
|
||||
srcDir '../client-common/src/main/java'
|
||||
}
|
||||
resources {
|
||||
|
||||
@@ -91,7 +91,6 @@ sourceSets {
|
||||
main {
|
||||
java {
|
||||
srcDir '../modded-common/src/main/java'
|
||||
srcDir '../minecraft-common/src/main/java'
|
||||
srcDir '../client-common/src/main/java'
|
||||
}
|
||||
resources {
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ import static org.junit.Assert.assertNotNull;
|
||||
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
|
||||
* that is a NoClassDefFoundError at the first call, usually deep inside worldgen.
|
||||
*
|
||||
|
||||
@@ -84,7 +84,6 @@ sourceSets {
|
||||
main {
|
||||
java {
|
||||
srcDir '../modded-common/src/main/java'
|
||||
srcDir '../minecraft-common/src/main/java'
|
||||
srcDir '../client-common/src/main/java'
|
||||
}
|
||||
resources {
|
||||
|
||||
@@ -340,7 +340,6 @@ Closure<File> resolveLocalVolmLibDirectory = { ->
|
||||
List<Object> moddedSharedInputs = []
|
||||
[
|
||||
'adapters/modded-common/src',
|
||||
'adapters/minecraft-common/src',
|
||||
'adapters/client-common/src',
|
||||
'core/src/main',
|
||||
'core/build.gradle',
|
||||
|
||||
@@ -11,7 +11,6 @@ public final class GenerationRevisionScope {
|
||||
"core/src/main/java",
|
||||
"spi/src/main/java",
|
||||
"adapters/bukkit/plugin/src/main/java",
|
||||
"adapters/minecraft-common/src/main/java",
|
||||
"adapters/modded-common/src/main/java",
|
||||
"adapters/client-common/src/main/java",
|
||||
"adapters/fabric/src/main/java",
|
||||
|
||||
Reference in New Issue
Block a user