Refactor resource loader internals

fabric-resource-loader-v0/src/client/java/net/fabricmc/fabric/mixin/resource/loader/client/GameOptionsWriteVisitorMixin.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.fabricmc.fabric.mixin.resource.loader.client;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.llamalad7.mixinextras.sugar.Local;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.resource.ResourcePackManager;
+import net.minecraft.resource.ResourcePackProfile;
+
+/**
+ * Mixins to the anonymous class in #write method.
+ */
+@Mixin(targets = "net/minecraft/client/option/GameOptions$3")
+public class GameOptionsWriteVisitorMixin {
+	@Unique
+	private static List<String> toPackListString(List<String> packs) {
+		List<String> copy = new ArrayList<>(packs.size());
+		ResourcePackManager manager = MinecraftClient.getInstance().getResourcePackManager();
+
+		for (String pack : packs) {
+			ResourcePackProfile profile = manager.getProfile(pack);
+
+			// Nonexistent pack profiles should be handled in the same way as vanilla
+			if (profile == null || !profile.isHidden()) copy.add(pack);
+		}
+
+		return copy;
+	}
+
+	@SuppressWarnings("unchecked")
+	@ModifyArg(method = "visitObject", at = @At(value = "INVOKE", target = "Ljava/util/function/Function;apply(Ljava/lang/Object;)Ljava/lang/Object;"))
+	private <T> T skipHiddenPacks(T value, @Local String key) {
+		if ("resourcePacks".equals(key) && value instanceof List) {
+			return (T) toPackListString((List<String>) value);
+		}
+
+		return value;
+	}
+}

fabric-resource-loader-v0/src/client/java/net/fabricmc/fabric/mixin/resource/loader/client/ResourcePackOrganizerMixin.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.fabricmc.fabric.mixin.resource.loader.client;
+
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import net.minecraft.client.gui.screen.pack.ResourcePackOrganizer;
+import net.minecraft.resource.ResourcePackManager;
+import net.minecraft.resource.ResourcePackProfile;
+
+@Mixin(ResourcePackOrganizer.class)
+public class ResourcePackOrganizerMixin {
+	@Shadow
+	@Final
+	List<ResourcePackProfile> enabledPacks;
+
+	@Shadow
+	@Final
+	List<ResourcePackProfile> disabledPacks;
+
+	/**
+	 * Do not list hidden packs in either enabledPacks or disabledPacks.
+	 * They are managed entirely by ResourcePackManager on save, and are invisible to client.
+	 */
+	@Inject(method = "<init>", at = @At("TAIL"))
+	private void removeHiddenPacksInit(Runnable updateCallback, Function iconIdSupplier, ResourcePackManager resourcePackManager, Consumer applier, CallbackInfo ci) {
+		this.enabledPacks.removeIf(ResourcePackProfile::isHidden);
+		this.disabledPacks.removeIf(ResourcePackProfile::isHidden);
+	}
+
+	@Inject(method = "refresh", at = @At("TAIL"))
+	private void removeHiddenPacksRefresh(CallbackInfo ci) {
+		this.enabledPacks.removeIf(ResourcePackProfile::isHidden);
+		this.disabledPacks.removeIf(ResourcePackProfile::isHidden);
+	}
+}

fabric-resource-loader-v0/src/client/resources/fabric-resource-loader-v0.client.mixins.json

@@ -3,12 +3,13 @@
   "package": "net.fabricmc.fabric.mixin.resource.loader.client",
   "compatibilityLevel": "JAVA_17",
   "client": [
-    "VanillaResourcePackProviderMixin",
-    "DefaultClientResourcePackProviderMixin",
     "CreateWorldScreenMixin",
     "FontManagerMixin",
     "GameOptionsMixin",
-    "KeyedResourceReloadListenerClientMixin"
+    "KeyedResourceReloadListenerClientMixin",
+    "ResourcePackOrganizerMixin",
+    "VanillaResourcePackProviderMixin",
+    "GameOptionsWriteVisitorMixin"
   ],
   "injectors": {
     "defaultRequire": 1

fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/api/resource/ModResourcePack.java

@@ -29,4 +29,6 @@ public interface ModResourcePack extends ResourcePack {
 	 * resource pack.
 	 */
 	ModMetadata getFabricModMetadata();
+
+	ModResourcePack createOverlay(String overlay);
 }