🧹

adapters/fabric/build.gradle

@@ -103,8 +103,11 @@ configurations.runtimeClasspath.extendsFrom(configurations.devBundle)
 configurations.testCompileClasspath.extendsFrom(configurations.devBundle)
 configurations.testRuntimeClasspath.extendsFrom(configurations.devBundle)
 
+// Jar-in-jar payload: exactly the Fabric API modules declared below, nothing else. Kept
+// non-transitive so the bundled set matches the `jars` list in fabric.mod.json one-for-one — a
+// transitive pull (fabric-transitive-access-wideners-v1) used to land in META-INF/jars undeclared.
 configurations.create('jij') {
-    transitive = true
+    transitive = false
 }
 
 dependencies {

adapters/fabric/settings.gradle

@@ -16,8 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import java.io.File
-
 pluginManagement {
     repositories {
         maven {
@@ -43,49 +41,8 @@ dependencyResolutionManagement {
     }
 }
 
-boolean hasVolmLibSettings(File directory) {
-    new File(directory, 'settings.gradle.kts').exists() || new File(directory, 'settings.gradle').exists()
-}
-
-File resolveLocalVolmLibDirectory() {
-    String configuredPath = providers.gradleProperty('localVolmLibDirectory')
-        .orElse(providers.environmentVariable('VOLMLIB_DIR'))
-        .orNull
-    if (configuredPath != null && !configuredPath.isBlank()) {
-        File configuredDirectory = file(configuredPath)
-        if (hasVolmLibSettings(configuredDirectory)) {
-            return configuredDirectory
-        }
-    }
-
-    File currentDirectory = settingsDir
-    while (currentDirectory != null) {
-        File candidate = new File(currentDirectory, 'VolmLib')
-        if (hasVolmLibSettings(candidate)) {
-            return candidate
-        }
-
-        currentDirectory = currentDirectory.parentFile
-    }
-
-    null
-}
-
-boolean useLocalVolmLib = providers.gradleProperty('useLocalVolmLib')
-    .orElse('true')
-    .map { String value -> value.equalsIgnoreCase('true') }
-    .get()
-File localVolmLibDirectory = resolveLocalVolmLibDirectory()
-
-if (useLocalVolmLib && localVolmLibDirectory != null) {
-    includeBuild(localVolmLibDirectory) {
-        dependencySubstitution {
-            substitute(module('com.github.VolmitSoftware:VolmLib')).using(project(':shared'))
-            substitute(module('com.github.VolmitSoftware.VolmLib:shared')).using(project(':shared'))
-            substitute(module('com.github.VolmitSoftware.VolmLib:volmlib-shared')).using(project(':shared'))
-        }
-    }
-}
+// Shared VolmLib source resolution; see gradle/volmlib-resolution.settings.gradle.
+apply from: new File(settingsDir, '../../gradle/volmlib-resolution.settings.gradle').canonicalFile
 
 includeBuild('../..') {
     dependencySubstitution {

adapters/fabric/src/main/java/art/arcane/iris/fabric/mixin/PackRepositoryMixin.java

@@ -26,6 +26,9 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.slf4j.LoggerFactory;
+
+import java.util.Arrays;
 
 @Mixin(PackRepository.class)
 public class PackRepositoryMixin {
@@ -37,5 +40,10 @@ public class PackRepositoryMixin {
                 return;
             }
         }
+        // Client resource-pack repositories legitimately have no ServerPacksSource; a missing server-data
+        // repository is reported once at boot by ModdedForcedDatapack.verifyInjected().
+        LoggerFactory.getLogger("Iris").debug(
+                "Iris forced datapack source not attached: no ServerPacksSource among {} source(s) {}",
+                sources.length, Arrays.toString(sources));
     }
 }

adapters/fabric/src/main/resources/fabric.mod.json

@@ -28,12 +28,12 @@
     { "file": "META-INF/jars/fabric-registry-sync-v0.jar" },
     { "file": "META-INF/jars/fabric-resource-loader-v1.jar" },
     { "file": "META-INF/jars/fabric-lifecycle-events-v1.jar" },
-    { "file": "META-INF/jars/fabric-networking-api-v1.jar" },
     { "file": "META-INF/jars/fabric-command-api-v2.jar" },
     { "file": "META-INF/jars/fabric-events-interaction-v0.jar" },
+    { "file": "META-INF/jars/fabric-networking-api-v1.jar" },
     { "file": "META-INF/jars/fabric-rendering-v1.jar" },
-    { "file": "META-INF/jars/fabric-transitive-access-wideners-v1.jar" },
-    { "file": "META-INF/jars/fabric-key-mapping-api-v1.jar" }
+    { "file": "META-INF/jars/fabric-key-mapping-api-v1.jar" },
+    { "file": "META-INF/jars/fabric-permission-api-v1.jar" }
   ],
   "depends": {
     "fabricloader": ">=0.19.3",