Quiltify 1.21.1

fabric-item-api-v1/src/main/java/net/fabricmc/fabric/impl/item/EnchantmentUtil.java

@@ -26,11 +26,11 @@
 
 import net.fabricmc.fabric.api.item.v1.EnchantmentEvents;
 import net.fabricmc.fabric.api.item.v1.EnchantmentSource;
-import net.fabricmc.fabric.impl.resource.loader.BuiltinModResourcePackSource;
 import net.fabricmc.fabric.impl.resource.loader.FabricResource;
-import net.fabricmc.fabric.impl.resource.loader.ModResourcePackCreator;
 import net.fabricmc.fabric.mixin.item.EnchantmentBuilderAccessor;
 
+import org.quiltmc.qsl.resource.loader.impl.QuiltBuiltinPackProfile;
+
 public class EnchantmentUtil {
 	@SuppressWarnings("unchecked")
 	public static Enchantment modify(RegistryKey<Enchantment> key, Enchantment originalEnchantment, EnchantmentSource source) {
@@ -65,7 +65,7 @@ public static EnchantmentSource determineSource(Resource resource) {
 
 			if (packSource == ResourcePackSource.BUILTIN) {
 				return EnchantmentSource.VANILLA;
-			} else if (packSource == ModResourcePackCreator.RESOURCE_PACK_SOURCE || packSource instanceof BuiltinModResourcePackSource) {
+			} else if (packSource instanceof QuiltBuiltinPackProfile.BuiltinPackSource) {
 				return EnchantmentSource.MOD;
 			}
 		}

fabric-lifecycle-events-v1/build.gradle

@@ -8,4 +8,5 @@ moduleDependencies(project, ['fabric-api-base'])
 
 dependencies {
 	modApi getQslModule("core", "lifecycle_events")
+	modApi getQslModule("core", "resource_loader")
 }

fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/api/event/lifecycle/v1/ServerLifecycleEvents.java

@@ -17,6 +17,8 @@
 
 package net.fabricmc.fabric.api.event.lifecycle.v1;
 
+import java.util.Optional;
+
 import net.minecraft.resource.LifecycledResourceManager;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.PlayerManager;
@@ -104,22 +106,40 @@ private ServerLifecycleEvents() {
 	/**
 	 * Called before a Minecraft server reloads data packs.
 	 */
-	public static final Event<StartDataPackReload> START_DATA_PACK_RELOAD = EventFactory.createArrayBacked(StartDataPackReload.class, callbacks -> (server, serverResourceManager) -> {
-		for (StartDataPackReload callback : callbacks) {
-			callback.startDataPackReload(server, serverResourceManager);
-		}
-	});
+	public static final Event<StartDataPackReload> START_DATA_PACK_RELOAD = QuiltCompatEvent.fromQuilt(
+			org.quiltmc.qsl.resource.loader.api.ResourceLoaderEvents.START_DATA_PACK_RELOAD,
+			startDataPackReload -> context -> {
+				// Fabric only triggers it at reloads, not startup.
+				if (!context.isFirst()) {
+					startDataPackReload.startDataPackReload(context.server(), (LifecycledResourceManager) context.resourceManager());
+				}
+			},
+			invokerGetter -> (server, resourceManager) -> invokerGetter.get().onStartDataPackReload(new org.quiltmc.qsl.resource.loader.impl.ResourceLoaderEventContextsImpl.ReloadStartContext(
+					() -> resourceManager, null
+			))
+	);
 
 	/**
 	 * Called after a Minecraft server has reloaded data packs.
 	 *
 	 * <p>If reloading data packs was unsuccessful, the current data packs will be kept.
 	 */
-	public static final Event<EndDataPackReload> END_DATA_PACK_RELOAD = EventFactory.createArrayBacked(EndDataPackReload.class, callbacks -> (server, serverResourceManager, success) -> {
-		for (EndDataPackReload callback : callbacks) {
-			callback.endDataPackReload(server, serverResourceManager, success);
-		}
-	});
+	public static final Event<EndDataPackReload> END_DATA_PACK_RELOAD = QuiltCompatEvent.fromQuilt(
+			org.quiltmc.qsl.resource.loader.api.ResourceLoaderEvents.END_DATA_PACK_RELOAD,
+			endDataPackReload -> context -> {
+				// Fabric only triggers it at reloads, not startup.
+				// Also using an actual cast, unlike Fabric.
+				if (!context.isFirst()) {
+					endDataPackReload.endDataPackReload(context.server(), (LifecycledResourceManager) context.resourceManager(), context.error().isEmpty());
+				}
+			},
+			invokerGetter -> (server, resourceManager, success) -> {
+				invokerGetter.get().onEndDataPackReload(new org.quiltmc.qsl.resource.loader.impl.ResourceLoaderEventContextsImpl.ReloadEndContext(
+						resourceManager, server.getRegistryManager(), Optional.ofNullable(
+						success ? null : new RuntimeException("Unknown error")
+				)));
+			}
+	);
 
 	/**
 	 * Called before a Minecraft server begins saving data.

fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/MinecraftServerMixin.java

@@ -27,23 +27,6 @@
 
 @Mixin(MinecraftServer.class)
 public abstract class MinecraftServerMixin {
-	@Shadow
-	private MinecraftServer.ResourceManagerHolder resourceManagerHolder;
-
-	@Inject(method = "reloadResources", at = @At("HEAD"))
-	private void startResourceReload(Collection<String> collection, CallbackInfoReturnable<CompletableFuture<Void>> cir) {
-		ServerLifecycleEvents.START_DATA_PACK_RELOAD.invoker().startDataPackReload((MinecraftServer) (Object) this, this.resourceManagerHolder.resourceManager());
-	}
-
-	@Inject(method = "reloadResources", at = @At("TAIL"))
-	private void endResourceReload(Collection<String> collection, CallbackInfoReturnable<CompletableFuture<Void>> cir) {
-		cir.getReturnValue().handleAsync((value, throwable) -> {
-			// Hook into fail
-			ServerLifecycleEvents.END_DATA_PACK_RELOAD.invoker().endDataPackReload((MinecraftServer) (Object) this, this.resourceManagerHolder.resourceManager(), throwable == null);
-			return value;
-		}, (MinecraftServer) (Object) this);
-	}
-
 	@Inject(method = "save", at = @At("HEAD"))
 	private void startSave(boolean suppressLogs, boolean flush, boolean force, CallbackInfoReturnable<Boolean> cir) {
 		ServerLifecycleEvents.BEFORE_SAVE.invoker().onBeforeSave((MinecraftServer) (Object) this, flush, force);

fabric-loot-api-v3/build.gradle

@@ -4,3 +4,7 @@ moduleDependencies(project, [
 	'fabric-api-base',
 	'fabric-resource-loader-v0'
 ])
+
+dependencies {
+	modImplementation getQslModule("core", "resource_loader")
+}

fabric-loot-api-v3/src/main/java/net/fabricmc/fabric/impl/loot/LootUtil.java

@@ -24,9 +24,9 @@
 import net.minecraft.util.Identifier;
 
 import net.fabricmc.fabric.api.loot.v3.LootTableSource;
-import net.fabricmc.fabric.impl.resource.loader.BuiltinModResourcePackSource;
 import net.fabricmc.fabric.impl.resource.loader.FabricResource;
-import net.fabricmc.fabric.impl.resource.loader.ModResourcePackCreator;
+
+import org.quiltmc.qsl.resource.loader.impl.QuiltBuiltinPackProfile;
 
 public final class LootUtil {
 	public static final ThreadLocal<Map<Identifier, LootTableSource>> SOURCES = ThreadLocal.withInitial(HashMap::new);
@@ -37,7 +37,7 @@ public static LootTableSource determineSource(Resource resource) {
 
 			if (packSource == ResourcePackSource.BUILTIN) {
 				return LootTableSource.VANILLA;
-			} else if (packSource == ModResourcePackCreator.RESOURCE_PACK_SOURCE || packSource instanceof BuiltinModResourcePackSource) {
+			} else if (packSource instanceof QuiltBuiltinPackProfile.BuiltinPackSource) {
 				return LootTableSource.MOD;
 			}
 		}

fabric-resource-loader-v0/build.gradle

@@ -9,3 +9,7 @@ testDependencies(project, [
 	':fabric-api-base',
 	':fabric-resource-loader-v0'
 ])
+
+dependencies {
+	modApi getQslModule("core", "resource_loader")
+}