Quiltify 1.21.1

fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricDynamicRegistryProvider.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
+ * Copyright 2022 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,7 +56,6 @@
 import net.fabricmc.fabric.api.event.registry.DynamicRegistries;
 import net.fabricmc.fabric.api.resource.conditions.v1.ResourceCondition;
 import net.fabricmc.fabric.impl.datagen.FabricDataGenHelper;
-import net.fabricmc.fabric.impl.registry.sync.DynamicRegistriesImpl;
 
 /**
  * A provider to help with data-generation of dynamic registry objects,
@@ -269,7 +269,7 @@ public CompletableFuture<?> run(DataWriter writer) {
 
 	private <T> CompletableFuture<?> writeRegistryEntries(DataWriter writer, RegistryOps<JsonElement> ops, RegistryEntries<T> entries) {
 		final RegistryKey<? extends Registry<T>> registry = entries.registry;
-		final boolean shouldOmitNamespace = registry.getValue().getNamespace().equals(Identifier.DEFAULT_NAMESPACE) || !DynamicRegistriesImpl.FABRIC_DYNAMIC_REGISTRY_KEYS.contains(registry);
+		final boolean shouldOmitNamespace = registry.getValue().getNamespace().equals(Identifier.DEFAULT_NAMESPACE);
 		final String directoryName = shouldOmitNamespace ? registry.getValue().getPath() : registry.getValue().getNamespace() + "/" + registry.getValue().getPath();
 		final DataOutput.PathResolver pathResolver = output.getResolver(DataOutput.OutputType.DATA_PACK, directoryName);
 		final List<CompletableFuture<?>> futures = new ArrayList<>();

fabric-registry-sync-v0/build.gradle

@@ -13,3 +13,7 @@ testDependencies(project, [
 	':fabric-lifecycle-events-v1',
 	':fabric-command-api-v2',
 ])
+
+dependencies {
+	modApi getQslModule("core", "registry")
+}

fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/mixin/registry/sync/client/MinecraftClientMixin.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
+ * Copyright 2022 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,36 +26,23 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.item.ItemGroups;
 import net.minecraft.registry.Registries;
 
-import net.fabricmc.fabric.impl.registry.sync.RegistrySyncManager;
-import net.fabricmc.fabric.impl.registry.sync.RemapException;
-import net.fabricmc.fabric.impl.registry.sync.trackers.vanilla.BlockInitTracker;
+import net.fabricmc.fabric.mixin.registry.sync.RegistriesAccessor;
 
 @Mixin(MinecraftClient.class)
 public class MinecraftClientMixin {
 	@Shadow
 	@Final
 	private static Logger LOGGER;
 
-	// Unmap the registry before loading a new SP/MP setup.
-	@Inject(at = @At("RETURN"), method = "disconnect(Lnet/minecraft/client/gui/screen/Screen;Z)V")
-	public void disconnectAfter(Screen disconnectionScreen, boolean bl, CallbackInfo ci) {
-		try {
-			RegistrySyncManager.unmap();
-		} catch (RemapException e) {
-			LOGGER.warn("Failed to unmap Fabric registries!", e);
-		}
-	}
-
 	@Inject(method = "<init>", at = @At(value = "INVOKE", target = "Ljava/lang/Thread;currentThread()Ljava/lang/Thread;"))
 	private void afterModInit(CallbackInfo ci) {
 		// Freeze the registries on the client
 		LOGGER.debug("Freezing registries");
-		Registries.bootstrap();
-		BlockInitTracker.postFreeze();
+		RegistriesAccessor.invokeFreezeRegistries();
+		RegistriesAccessor.invokeValidate(Registries.REGISTRIES);
 		ItemGroups.collect();
 	}
 }

fabric-registry-sync-v0/src/client/resources/fabric-registry-sync-v0.client.mixins.json

@@ -3,12 +3,7 @@
   "package": "net.fabricmc.fabric.mixin.registry.sync.client",
   "compatibilityLevel": "JAVA_17",
   "client": [
-    "BlockColorsMixin",
-    "ClientRegistriesDynamicRegistriesMixin",
-    "ItemColorsMixin",
-    "ItemModelsMixin",
-    "MinecraftClientMixin",
-    "ParticleManagerMixin"
+    "MinecraftClientMixin"
   ],
   "injectors": {
     "defaultRequire": 1

fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/DynamicRegistries.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
+ * Copyright 2022 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +26,6 @@
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryLoader;
 
-import net.fabricmc.fabric.impl.registry.sync.DynamicRegistriesImpl;
-
 /**
  * Contains methods for registering and accessing dynamic {@linkplain Registry registries}.
  *
@@ -73,7 +72,10 @@
  * // @link substring=registerSynced target="#registerSynced(RegistryKey, Codec, Codec, SyncOption...)":
  * DynamicRegistries.registerSynced(MY_DATA_KEY, MyData.CODEC, MyData.NETWORK_CODEC);
  * }
+ *
+ * @deprecated see {@link org.quiltmc.qsl.registry.api.dynamic.DynamicMetaRegistry}
  */
+@Deprecated
 public final class DynamicRegistries {
 	private DynamicRegistries() {
 	}
@@ -86,7 +88,7 @@ private DynamicRegistries() {
 	 * @return an unmodifiable list of all dynamic registries
 	 */
 	public static @Unmodifiable List<RegistryLoader.Entry<?>> getDynamicRegistries() {
-		return DynamicRegistriesImpl.getDynamicRegistries();
+		return List.copyOf(RegistryLoader.DYNAMIC_REGISTRIES);
 	}
 
 	/**
@@ -100,7 +102,7 @@ private DynamicRegistries() {
 	 * @param <T>   the entry type of the registry
 	 */
 	public static <T> void register(RegistryKey<? extends Registry<T>> key, Codec<T> codec) {
-		DynamicRegistriesImpl.register(key, codec);
+		org.quiltmc.qsl.registry.api.dynamic.DynamicMetaRegistry.register(key, codec);
 	}
 
 	/**
@@ -140,8 +142,7 @@ public static <T> void registerSynced(RegistryKey<? extends Registry<T>> key, Co
 	 * @param <T>          the entry type of the registry
 	 */
 	public static <T> void registerSynced(RegistryKey<? extends Registry<T>> key, Codec<T> dataCodec, Codec<T> networkCodec, SyncOption... options) {
-		DynamicRegistriesImpl.register(key, dataCodec);
-		DynamicRegistriesImpl.addSyncedRegistry(key, networkCodec, options);
+		org.quiltmc.qsl.registry.api.dynamic.DynamicMetaRegistry.registerSynced(key, dataCodec, networkCodec);
 	}
 
 	/**