diff --git a/build.gradle b/build.gradle
index 1b22a29e7..9e1560e42 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ plugins {
 def ENV = System.getenv()
 
 class Globals {
-	static def baseVersion = "0.11.6"
+	static def baseVersion = "0.11.7"
 	static def mcVersion = "1.16-pre2"
 	static def yarnVersion = "+build.1"
 }
diff --git a/fabric-command-api-v1/src/main/java/net/fabricmc/fabric/mixin/command/MixinMinecraftDedicatedServer.java b/fabric-command-api-v1/src/main/java/net/fabricmc/fabric/mixin/command/MixinMinecraftDedicatedServer.java
index 695d118ce..1c5004c5a 100644
--- a/fabric-command-api-v1/src/main/java/net/fabricmc/fabric/mixin/command/MixinMinecraftDedicatedServer.java
+++ b/fabric-command-api-v1/src/main/java/net/fabricmc/fabric/mixin/command/MixinMinecraftDedicatedServer.java
@@ -29,7 +29,7 @@ import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
 public abstract class MixinMinecraftDedicatedServer {
 	@Inject(method = "setupServer", at = @At("HEAD"))
 	private void setupServer(CallbackInfoReturnable<Boolean> info) {
-		CommandRegistrationCallback.EVENT.invoker().register(((MinecraftDedicatedServer)(Object)this).getCommandManager().getDispatcher(), true);
+		CommandRegistrationCallback.EVENT.invoker().register(((MinecraftDedicatedServer) (Object) this).getCommandManager().getDispatcher(), true);
 
 		//Possibly call findAmbiguities here
 	}
diff --git a/fabric-resource-loader-v0/build.gradle b/fabric-resource-loader-v0/build.gradle
index c691fda80..12cf7bfda 100644
--- a/fabric-resource-loader-v0/build.gradle
+++ b/fabric-resource-loader-v0/build.gradle
@@ -1,2 +1,2 @@
 archivesBaseName = "fabric-resource-loader-v0"
-version = getSubprojectVersion(project, "0.2.3")
+version = getSubprojectVersion(project, "0.2.4")
diff --git a/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/mixin/resource/loader/MixinClass_5359.java b/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/mixin/resource/loader/MixinClass_5359.java
index aa0ce5a5b..f9d88cb2d 100644
--- a/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/mixin/resource/loader/MixinClass_5359.java
+++ b/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/mixin/resource/loader/MixinClass_5359.java
@@ -16,6 +16,7 @@
 
 package net.fabricmc.fabric.mixin.resource.loader;
 
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -28,9 +29,12 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import net.minecraft.class_5359;
+import net.minecraft.resource.ResourcePack;
+import net.minecraft.resource.ResourceType;
 
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
+import net.fabricmc.fabric.impl.resource.loader.ModNioResourcePack;
 
 @Mixin(class_5359.class)
 public class MixinClass_5359 {
@@ -50,8 +54,16 @@ public class MixinClass_5359 {
 			List<String> newEnabled = new ArrayList<>(enabled);
 
 			for (ModContainer container : FabricLoader.getInstance().getAllMods()) {
-				if (!container.getMetadata().getType().equals("builtin")) {
-					newEnabled.add("fabric/" + container.getMetadata().getId());
+				if (container.getMetadata().getType().equals("builtin")) {
+					continue;
+				}
+
+				Path path = container.getRootPath();
+
+				try (ResourcePack pack = new ModNioResourcePack(container.getMetadata(), path, null)) {
+					if (!pack.getNamespaces(ResourceType.SERVER_DATA).isEmpty()) {
+						newEnabled.add("fabric/" + container.getMetadata().getId());
+					}
 				}
 			}