From d6226240a01e08e4e860dbcbca4b9492aaf8fe89 Mon Sep 17 00:00:00 2001
From: Brian Neumann-Fopiano <mypsn1550@gmail.com>
Date: Tue, 29 Sep 2026 00:50:30 -0400
Subject: [PATCH] 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
---
 README.md                                                  | 7 ++++---
 adapters/fabric/build.gradle                               | 1 -
 adapters/forge/build.gradle                                | 1 -
 .../iris/modded/ModdedClientPackageIsolationTest.java      | 2 +-
 adapters/neoforge/build.gradle                             | 1 -
 build.gradle                                               | 1 -
 .../arcane/iris/buildtools/GenerationRevisionScope.java    | 1 -
 7 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 1e137b1f2..77959c775 100644
--- a/README.md
+++ b/README.md
@@ -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
diff --git a/adapters/fabric/build.gradle b/adapters/fabric/build.gradle
index 24b6b7a28..2a7d4c17d 100644
--- a/adapters/fabric/build.gradle
+++ b/adapters/fabric/build.gradle
@@ -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 {
diff --git a/adapters/forge/build.gradle b/adapters/forge/build.gradle
index 1dca2a8d7..5028ad734 100644
--- a/adapters/forge/build.gradle
+++ b/adapters/forge/build.gradle
@@ -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 {
diff --git a/adapters/modded-common/src/test/java/art/arcane/iris/modded/ModdedClientPackageIsolationTest.java b/adapters/modded-common/src/test/java/art/arcane/iris/modded/ModdedClientPackageIsolationTest.java
index c4f354f1f..c9fbd2942 100644
--- a/adapters/modded-common/src/test/java/art/arcane/iris/modded/ModdedClientPackageIsolationTest.java
+++ b/adapters/modded-common/src/test/java/art/arcane/iris/modded/ModdedClientPackageIsolationTest.java
@@ -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.
  *
diff --git a/adapters/neoforge/build.gradle b/adapters/neoforge/build.gradle
index fe8632d69..557e7bdd7 100644
--- a/adapters/neoforge/build.gradle
+++ b/adapters/neoforge/build.gradle
@@ -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 {
diff --git a/build.gradle b/build.gradle
index ccd014dad..a4a6eb464 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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',
diff --git a/buildSrc/src/main/java/art/arcane/iris/buildtools/GenerationRevisionScope.java b/buildSrc/src/main/java/art/arcane/iris/buildtools/GenerationRevisionScope.java
index 8c5ecdd3c..b1df903d5 100644
--- a/buildSrc/src/main/java/art/arcane/iris/buildtools/GenerationRevisionScope.java
+++ b/buildSrc/src/main/java/art/arcane/iris/buildtools/GenerationRevisionScope.java
@@ -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",