Update to 24w45a (#4213)

* Update to 24w45a

* Fix model provider and build

* Remove old mixin file

* Bump versions

deprecated/fabric-rendering-v0/build.gradle

@@ -1,6 +0,0 @@
-version = getSubprojectVersion(project)
-
-moduleDependencies(project, [
-	'fabric-api-base',
-	'fabric-rendering-v1'
-])

deprecated/fabric-rendering-v0/src/client/java/net/fabricmc/fabric/api/client/render/ColorProviderRegistry.java

@@ -1,74 +0,0 @@
-/*
- * 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.api.client.render;
-
-import org.jetbrains.annotations.Nullable;
-
-import net.minecraft.block.Block;
-import net.minecraft.client.color.block.BlockColorProvider;
-import net.minecraft.client.color.item.ItemColorProvider;
-import net.minecraft.item.ItemConvertible;
-
-/**
- * @deprecated Replaced by {@link net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry}
- */
-@Deprecated
-public interface ColorProviderRegistry<T, Provider> {
-	ColorProviderRegistry<ItemConvertible, ItemColorProvider> ITEM = new ColorProviderRegistry<ItemConvertible, ItemColorProvider>() {
-		@Override
-		public void register(ItemColorProvider itemColorProvider, ItemConvertible... objects) {
-			net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry.ITEM.register(itemColorProvider, objects);
-		}
-
-		@Override
-		public ItemColorProvider get(ItemConvertible object) {
-			return net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry.ITEM.get(object);
-		}
-	};
-
-	ColorProviderRegistry<Block, BlockColorProvider> BLOCK = new ColorProviderRegistry<Block, BlockColorProvider>() {
-		@Override
-		public void register(BlockColorProvider blockColorProvider, Block... objects) {
-			net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry.BLOCK.register(blockColorProvider, objects);
-		}
-
-		@Override
-		public BlockColorProvider get(Block object) {
-			return net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry.BLOCK.get(object);
-		}
-	};
-
-	/**
-	 * Register a color provider for one or more objects.
-	 *
-	 * @param provider The color provider to register.
-	 * @param objects  The objects which should be colored using this provider.
-	 */
-	void register(Provider provider, T... objects);
-
-	/**
-	 * Get a color provider for the given object.
-	 *
-	 * <p>Please note that the underlying registry may not be fully populated or stable until the game has started,
-	 * as other mods may overwrite the registry.
-	 *
-	 * @param object The object to acquire the provide for.
-	 * @return The registered mapper for this provider, or {@code null} if none is registered or available.
-	 */
-	@Nullable
-	Provider get(T object);
-}

deprecated/fabric-rendering-v0/src/client/java/net/fabricmc/fabric/api/client/render/InvalidateRenderStateCallback.java

@@ -1,44 +0,0 @@
-/*
- * 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.api.client.render;
-
-import net.fabricmc.fabric.api.event.Event;
-import net.fabricmc.fabric.api.event.EventFactory;
-
-/**
- * Called when the world renderer reloads, usually as result of changing resource pack
- * or video configuration, or when the player types F3+A in the debug screen.
- * Afterwards all render chunks will be reset and reloaded.
- *
- * <p>Render chunks and other render-related object instances will be made null
- * or invalid after this event so do not use it to capture dependent state.
- * Instead, use it to invalidate state and reinitialize lazily.
- *
- * @deprecated Replaced by {@link net.fabricmc.fabric.api.client.rendering.v1.InvalidateRenderStateCallback}
- */
-@Deprecated
-public interface InvalidateRenderStateCallback {
-	Event<InvalidateRenderStateCallback> EVENT = EventFactory.createArrayBacked(InvalidateRenderStateCallback.class,
-			(listeners) -> () -> {
-				for (InvalidateRenderStateCallback event : listeners) {
-					event.onInvalidate();
-				}
-			}
-	);
-
-	void onInvalidate();
-}

deprecated/fabric-rendering-v0/src/client/resources/fabric.mod.json

@@ -1,33 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "fabric-rendering-v0",
-  "name": "Fabric Rendering (v0)",
-  "version": "${version}",
-  "environment": "client",
-  "license": "Apache-2.0",
-  "icon": "assets/fabric-rendering-v0/icon.png",
-  "contact": {
-    "homepage": "https://fabricmc.net",
-    "irc": "irc://irc.esper.net:6667/fabric",
-    "issues": "https://github.com/FabricMC/fabric/issues",
-    "sources": "https://github.com/FabricMC/fabric"
-  },
-  "authors": [
-    "FabricMC"
-  ],
-  "entrypoints": {
-    "client": [
-      "net.fabricmc.fabric.impl.client.rendering.v0.RenderingCallbackInvoker"
-    ]
-  },
-  "depends": {
-    "fabricloader": ">=0.16.9",
-    "minecraft": ">=1.15-alpha.19.39.a",
-    "fabric-api-base": "*",
-    "fabric-rendering-v1": "*"
-  },
-  "description": "Hooks and registries for rendering-related things.",
-  "custom": {
-    "fabric-api:module-lifecycle": "deprecated"
-  }
-}

fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/modification/BiomeModificationContextImpl.java

@@ -195,7 +195,7 @@ public class BiomeModificationContextImpl implements BiomeModificationContext {
 
 		@Override
 		public void setMusicVolume(float volume) {
-			effects.field_55050 = volume;
+			effects.musicVolume = volume;
 		}
 	}
 

fabric-biome-api-v1/src/main/resources/fabric-biome-api-v1.accesswidener

@@ -35,8 +35,8 @@ accessible field net/minecraft/world/biome/BiomeEffects additionsSound Ljava/uti
 mutable field net/minecraft/world/biome/BiomeEffects additionsSound Ljava/util/Optional;
 accessible field net/minecraft/world/biome/BiomeEffects music Ljava/util/Optional;
 mutable field net/minecraft/world/biome/BiomeEffects music Ljava/util/Optional;
-accessible field net/minecraft/world/biome/BiomeEffects field_55050 F
-mutable field net/minecraft/world/biome/BiomeEffects field_55050 F
+accessible field net/minecraft/world/biome/BiomeEffects musicVolume F
+mutable field net/minecraft/world/biome/BiomeEffects musicVolume F
 
 # Spawn Settings / Density
 accessible field net/minecraft/world/biome/SpawnSettings creatureSpawnProbability F

fabric-data-generation-api-v1/build.gradle

@@ -51,9 +51,10 @@ loom {
 	}
 }
 
-test.dependsOn runDatagen
+test.dependsOn runDatagenClient
 
-task datapackZip(type: Zip, dependsOn: runDatagen) {
+tasks.register('datapackZip', Zip) {
+	dependsOn runDatagen
 	archiveFileName = "${base.archivesName.get()}-${project.version}-test-datapack.zip"
 	destinationDirectory = layout.buildDirectory.dir('libs')
 
@@ -71,9 +72,16 @@ import java.lang.reflect.Modifier
 import java.util.zip.ZipEntry
 import java.util.zip.ZipFile
 
-task generateAccessWidener() {
+tasks.register('generateAccessWidener') {
+	inputs.files(loom.getNamedMinecraftJars())
+
 	doLast {
-		File inputJar = loom.namedMinecraftProvider.parentMinecraftProvider.commonJar.path.toFile()
+		// Use parent provider to get the jar before the AWs are applied
+		def minecraftProvider = loom.namedMinecraftProvider.parentMinecraftProvider
+		def commonJar = minecraftProvider.commonJar.path.toFile()
+		def clientJar = minecraftProvider.clientOnlyJar.path.toFile()
+		def classes = getClasses([commonJar, clientJar])
+
 		String accessWidener = "accessWidener\tv2\tnamed\n"
 		accessWidener += "\n"
 		accessWidener += "# DO NOT EDIT BY HAND! This file is generated automatically.\n"
@@ -81,8 +89,6 @@ task generateAccessWidener() {
 		accessWidener += "\n"
 		accessWidener += file("template.accesswidener").text + "\n"
 
-		def classes = getClasses(inputJar)
-
 		visitMethods(classes["net/minecraft/data/server/recipe/RecipeGenerator"]) { name, desc, owner ->
 			if (it.name == "generate")
 				return
@@ -126,7 +132,7 @@ task generateAccessWidener() {
 	}
 }
 
-def visitMethods(ClassNode classNode, closure) {
+static def visitMethods(ClassNode classNode, closure) {
 	classNode.methods.forEach {
 		if ((it.access & Opcodes.ACC_SYNTHETIC) != 0 || (it.access & Opcodes.ACC_PUBLIC) != 0)
 			return
@@ -138,7 +144,7 @@ def visitMethods(ClassNode classNode, closure) {
 	}
 }
 
-def visitFinalMethods(ClassNode classNode, closure) {
+static def visitFinalMethods(ClassNode classNode, closure) {
 	classNode.methods.forEach {
 		if (!Modifier.isFinal(it.access))
 			return
@@ -151,21 +157,23 @@ def visitFinalMethods(ClassNode classNode, closure) {
 }
 
 // Return a map of all class names to classNodes
-def getClasses(File input) {
+static def getClasses(List<File> inputs) {
 	Map<String, ClassNode> classes = new TreeMap<>()
 
-	new ZipFile(input).withCloseable { ZipFile zip  ->
-		zip.entries().toList().forEach { ZipEntry entry ->
-			if (!entry.name.endsWith(".class")) {
-				return
-			}
+	for (File input : inputs) {
+		new ZipFile(input).withCloseable { ZipFile zip  ->
+			zip.entries().toList().forEach { ZipEntry entry ->
+				if (!entry.name.endsWith(".class")) {
+					return
+				}
 
-			zip.getInputStream(entry).withCloseable { is ->
-				ClassReader reader = new ClassReader(is)
-				ClassNode classNode = new ClassNode()
-				reader.accept(classNode, ClassReader.SKIP_CODE)
+				zip.getInputStream(entry).withCloseable { is ->
+					ClassReader reader = new ClassReader(is)
+					ClassNode classNode = new ClassNode()
+					reader.accept(classNode, ClassReader.SKIP_CODE)
 
-				classes.put(classNode.name, classNode)
+					classes.put(classNode.name, classNode)
+				}
 			}
 		}
 	}
@@ -197,4 +205,4 @@ def hasAncestor(ClassNode classNode, Map<String, ClassNode> classes, String ance
 }
 
 generateResources.dependsOn generateAccessWidener
-generateResources.dependsOn runDatagen
+generateResources.dependsOn runDatagenClient

fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/api/client/datagen/v1/provider/FabricModelProvider.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.api.datagen.v1.provider;
+package net.fabricmc.fabric.api.client.datagen.v1.provider;
 
 import net.minecraft.data.client.BlockStateModelGenerator;
 import net.minecraft.data.client.ItemModelGenerator;

fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/impl/datagen/client/FabricModelProviderDefinitions.java

@@ -14,14 +14,10 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.client.rendering.v0;
+package net.fabricmc.fabric.impl.datagen.client;
 
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.rendering.v1.InvalidateRenderStateCallback;
+import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 
-public class RenderingCallbackInvoker implements ClientModInitializer {
-	@Override
-	public void onInitializeClient() {
-		InvalidateRenderStateCallback.EVENT.register(() -> net.fabricmc.fabric.api.client.render.InvalidateRenderStateCallback.EVENT.invoker().onInvalidate());
-	}
+public interface FabricModelProviderDefinitions {
+	void setFabricDataOutput(FabricDataOutput fabricDataOutput);
 }

fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderBlockDefinitionsMixin.java

@@ -0,0 +1,62 @@
+/*
+ * 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.datagen.client;
+
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+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.Redirect;
+
+import net.minecraft.block.Block;
+import net.minecraft.data.client.ModelProvider;
+import net.minecraft.registry.entry.RegistryEntry;
+
+import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
+import net.fabricmc.fabric.impl.datagen.client.FabricModelProviderDefinitions;
+
+@Mixin(ModelProvider.class_10406.class)
+public class ModelProviderBlockDefinitionsMixin implements FabricModelProviderDefinitions {
+	@Unique
+	private FabricDataOutput fabricDataOutput;
+
+	@Override
+	public void setFabricDataOutput(FabricDataOutput fabricDataOutput) {
+		this.fabricDataOutput = fabricDataOutput;
+	}
+
+	// Target the first .filter() call, to filter out blocks that are not from the mod we are processing.
+	@Redirect(method = "method_65462", at = @At(value = "INVOKE", target = "Ljava/util/stream/Stream;filter(Ljava/util/function/Predicate;)Ljava/util/stream/Stream;", ordinal = 0, remap = false))
+	private Stream<RegistryEntry.Reference<Block>> filterBlocksForProcessingMod(Stream<RegistryEntry.Reference<Block>> instance, Predicate<RegistryEntry.Reference<Block>> predicate) {
+		return instance.filter((block) -> {
+			if (fabricDataOutput != null) {
+				if (!fabricDataOutput.isStrictValidationEnabled()) {
+					return false;
+				}
+
+				if (!block.registryKey().getValue().getNamespace().equals(fabricDataOutput.getModId())) {
+					// Skip over blocks that are not from the mod we are processing.
+					return false;
+				}
+			}
+
+			return predicate.test(block);
+		});
+	}
+}

fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderItemDefinitionsMixin.java

@@ -0,0 +1,91 @@
+/*
+ * 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.datagen.client;
+
+import java.util.Map;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import net.minecraft.class_10434;
+import net.minecraft.data.client.ModelProvider;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.Item;
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.entry.RegistryEntry;
+
+import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
+import net.fabricmc.fabric.impl.datagen.client.FabricModelProviderDefinitions;
+
+@Mixin(ModelProvider.class_10407.class)
+public class ModelProviderItemDefinitionsMixin implements FabricModelProviderDefinitions {
+	@Shadow
+	@Final
+	private Map<Item, class_10434> field_55249;
+	@Unique
+	private FabricDataOutput fabricDataOutput;
+
+	@Override
+	public void setFabricDataOutput(FabricDataOutput fabricDataOutput) {
+		this.fabricDataOutput = fabricDataOutput;
+	}
+
+	@WrapOperation(method = "method_65470", at = @At(value = "INVOKE", target = "Ljava/util/Map;containsKey(Ljava/lang/Object;)Z", ordinal = 1, remap = false))
+	private boolean filterItemsForProcessingMod(Map<Item, class_10434> map, Object o, Operation<Boolean> original) {
+		BlockItem blockItem = (BlockItem) o;
+
+		if (fabricDataOutput != null) {
+			// Only generate the item model if the block state json was registered
+			if (field_55249.containsKey(blockItem)) {
+				return false;
+			}
+
+			if (!Registries.ITEM.getId(blockItem).getNamespace().equals(fabricDataOutput.getModId())) {
+				// Skip over items that are not from the mod we are processing.
+				return true;
+			}
+		}
+
+		return original.call(map, blockItem);
+	}
+
+	@Redirect(method = "method_65469", at = @At(value = "INVOKE", target = "Ljava/util/stream/Stream;filter(Ljava/util/function/Predicate;)Ljava/util/stream/Stream;", ordinal = 0, remap = false))
+	private Stream<RegistryEntry.Reference<Item>> filterItemsForProcessingMod(Stream<RegistryEntry.Reference<Item>> instance, Predicate<RegistryEntry.Reference<Item>> predicate) {
+		return instance.filter((item) -> {
+			if (fabricDataOutput != null) {
+				if (!fabricDataOutput.isStrictValidationEnabled()) {
+					return false;
+				}
+
+				if (!item.registryKey().getValue().getNamespace().equals(fabricDataOutput.getModId())) {
+					// Skip over items that are not from the mod we are processing.
+					return false;
+				}
+			}
+
+			return predicate.test(item);
+		});
+	}
+}

fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderMixin.java

@@ -0,0 +1,79 @@
+/*
+ * 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.datagen.client;
+
+import java.util.concurrent.CompletableFuture;
+
+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.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import net.minecraft.data.DataOutput;
+import net.minecraft.data.DataWriter;
+import net.minecraft.data.client.BlockStateModelGenerator;
+import net.minecraft.data.client.ItemModelGenerator;
+import net.minecraft.data.client.ModelProvider;
+
+import net.fabricmc.fabric.api.client.datagen.v1.provider.FabricModelProvider;
+import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
+import net.fabricmc.fabric.impl.datagen.client.FabricModelProviderDefinitions;
+
+@Mixin(ModelProvider.class)
+public class ModelProviderMixin {
+	@Unique
+	private FabricDataOutput fabricDataOutput;
+
+	@Inject(method = "<init>", at = @At("RETURN"))
+	public void init(DataOutput output, CallbackInfo ci) {
+		if (output instanceof FabricDataOutput fabricDataOutput) {
+			this.fabricDataOutput = fabricDataOutput;
+		}
+	}
+
+	@Redirect(method = "run", at = @At(value = "INVOKE", target = "Lnet/minecraft/data/client/BlockStateModelGenerator;register()V"))
+	private void registerBlockStateModels(BlockStateModelGenerator instance) {
+		if (((Object) this) instanceof FabricModelProvider fabricModelProvider) {
+			fabricModelProvider.generateBlockStateModels(instance);
+		} else {
+			// Fallback to the vanilla registration when not a fabric provider
+			instance.register();
+		}
+	}
+
+	@Redirect(method = "run", at = @At(value = "INVOKE", target = "Lnet/minecraft/data/client/ItemModelGenerator;register()V"))
+	private void registerItemModels(ItemModelGenerator instance) {
+		if (((Object) this) instanceof FabricModelProvider fabricModelProvider) {
+			fabricModelProvider.generateItemModels(instance);
+		} else {
+			// Fallback to the vanilla registration when not a fabric provider
+			instance.register();
+		}
+	}
+
+	@Inject(method = "run", at = @At(value = "INVOKE", target = "Lnet/minecraft/data/client/BlockStateModelGenerator;register()V"))
+	private void setFabricDataOutput(DataWriter writer, CallbackInfoReturnable<CompletableFuture<?>> cir,
+							@Local ModelProvider.class_10406 blockDefinitions,
+							@Local ModelProvider.class_10407 itemDefinitions) {
+		((FabricModelProviderDefinitions) blockDefinitions).setFabricDataOutput(fabricDataOutput);
+		((FabricModelProviderDefinitions) itemDefinitions).setFabricDataOutput(fabricDataOutput);
+	}
+}

fabric-data-generation-api-v1/src/client/resources/fabric-data-generation-api-v1.client.mixins.json

@@ -3,7 +3,10 @@
   "package": "net.fabricmc.fabric.mixin.datagen.client",
   "compatibilityLevel": "JAVA_21",
   "client": [
-    "MinecraftClientMixin"
+    "MinecraftClientMixin",
+    "ModelProviderBlockDefinitionsMixin",
+    "ModelProviderItemDefinitionsMixin",
+    "ModelProviderMixin"
   ],
   "injectors": {
     "defaultRequire": 1

fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/ModelProviderMixin.java

@@ -1,132 +0,0 @@
-/*
- * 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.datagen;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Supplier;
-
-import com.google.gson.JsonElement;
-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.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
-
-import net.minecraft.block.Block;
-import net.minecraft.data.DataOutput;
-import net.minecraft.data.DataWriter;
-import net.minecraft.data.client.BlockStateModelGenerator;
-import net.minecraft.data.client.BlockStateSupplier;
-import net.minecraft.data.client.ItemModelGenerator;
-import net.minecraft.data.client.ModelProvider;
-import net.minecraft.item.Item;
-import net.minecraft.registry.Registries;
-import net.minecraft.util.Identifier;
-
-import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider;
-
-@Mixin(ModelProvider.class)
-public class ModelProviderMixin {
-	@Unique
-	private FabricDataOutput fabricDataOutput;
-
-	@Unique
-	private static final ThreadLocal<FabricDataOutput> fabricDataOutputThreadLocal = new ThreadLocal<>();
-
-	@Inject(method = "<init>", at = @At("RETURN"))
-	public void init(DataOutput output, CallbackInfo ci) {
-		if (output instanceof FabricDataOutput fabricDataOutput) {
-			this.fabricDataOutput = fabricDataOutput;
-		}
-	}
-
-	@Unique
-	private static ThreadLocal<Map<Block, BlockStateSupplier>> blockStateMapThreadLocal = new ThreadLocal<>();
-
-	@Redirect(method = "run", at = @At(value = "INVOKE", target = "Lnet/minecraft/data/client/BlockStateModelGenerator;register()V"))
-	private void registerBlockStateModels(BlockStateModelGenerator instance) {
-		if (((Object) this) instanceof FabricModelProvider fabricModelProvider) {
-			fabricModelProvider.generateBlockStateModels(instance);
-		} else {
-			// Fallback to the vanilla registration when not a fabric provider
-			instance.register();
-		}
-	}
-
-	@Redirect(method = "run", at = @At(value = "INVOKE", target = "Lnet/minecraft/data/client/ItemModelGenerator;register()V"))
-	private void registerItemModels(ItemModelGenerator instance) {
-		if (((Object) this) instanceof FabricModelProvider fabricModelProvider) {
-			fabricModelProvider.generateItemModels(instance);
-		} else {
-			// Fallback to the vanilla registration when not a fabric provider
-			instance.register();
-		}
-	}
-
-	@Inject(method = "run", at = @At(value = "INVOKE_ASSIGN", target = "com/google/common/collect/Maps.newHashMap()Ljava/util/HashMap;", ordinal = 0, remap = false), locals = LocalCapture.CAPTURE_FAILHARD)
-	private void runHead(DataWriter writer, CallbackInfoReturnable<CompletableFuture<?>> cir, Map<Block, BlockStateSupplier> map) {
-		fabricDataOutputThreadLocal.set(fabricDataOutput);
-		blockStateMapThreadLocal.set(map);
-	}
-
-	@Inject(method = "run", at = @At("TAIL"))
-	private void runTail(DataWriter writer, CallbackInfoReturnable<CompletableFuture<?>> cir) {
-		fabricDataOutputThreadLocal.remove();
-		blockStateMapThreadLocal.remove();
-	}
-
-	@Inject(method = "method_25738", at = @At("HEAD"), cancellable = true)
-	private static void filterBlocksForProcessingMod(Map<Block, BlockStateSupplier> map, Block block, CallbackInfoReturnable<Boolean> cir) {
-		FabricDataOutput dataOutput = fabricDataOutputThreadLocal.get();
-
-		if (dataOutput != null) {
-			if (!dataOutput.isStrictValidationEnabled()) {
-				cir.setReturnValue(false);
-				return;
-			}
-
-			if (!Registries.BLOCK.getId(block).getNamespace().equals(dataOutput.getModId())) {
-				// Skip over blocks that are not from the mod we are processing.
-				cir.setReturnValue(false);
-			}
-		}
-	}
-
-	@Inject(method = "method_25741", at = @At(value = "INVOKE", target = "Lnet/minecraft/data/client/ModelIds;getItemModelId(Lnet/minecraft/item/Item;)Lnet/minecraft/util/Identifier;"), cancellable = true, locals = LocalCapture.CAPTURE_FAILHARD)
-	private static void filterItemsForProcessingMod(Set<Item> set, Map<Identifier, Supplier<JsonElement>> map, Block block, CallbackInfo ci, Item item) {
-		FabricDataOutput dataOutput = fabricDataOutputThreadLocal.get();
-
-		if (dataOutput != null) {
-			// Only generate the item model if the block state json was registered
-			if (!blockStateMapThreadLocal.get().containsKey(block)) {
-				ci.cancel();
-				return;
-			}
-
-			if (!Registries.ITEM.getId(item).getNamespace().equals(dataOutput.getModId())) {
-				// Skip over any items from other mods.
-				ci.cancel();
-			}
-		}
-	}
-}

fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.accesswidener

@@ -40,8 +40,6 @@ transitive-accessible method net/minecraft/data/family/BlockFamilies register (L
 transitive-accessible field net/minecraft/data/client/BlockStateModelGenerator blockStateCollector Ljava/util/function/Consumer;
 transitive-accessible field net/minecraft/data/client/BlockStateModelGenerator modelCollector Ljava/util/function/BiConsumer;
 
-transitive-accessible field net/minecraft/data/client/ItemModelGenerator writer Ljava/util/function/BiConsumer;
-
 transitive-accessible method net/minecraft/data/client/TextureKey of (Ljava/lang/String;)Lnet/minecraft/data/client/TextureKey;
 transitive-accessible method net/minecraft/data/client/TextureKey of (Ljava/lang/String;Lnet/minecraft/data/client/TextureKey;)Lnet/minecraft/data/client/TextureKey;
 
@@ -49,10 +47,11 @@ transitive-extendable method net/minecraft/data/server/tag/TagProvider$ProvidedT
 
 transitive-accessible method net/minecraft/data/client/TexturedModel makeFactory (Ljava/util/function/Function;Lnet/minecraft/data/client/Model;)Lnet/minecraft/data/client/TexturedModel$Factory;
 
-transitive-accessible class net/minecraft/data/client/BlockStateModelGenerator$TintType
 transitive-accessible class net/minecraft/data/client/BlockStateModelGenerator$BlockTexturePool
 transitive-accessible class net/minecraft/data/client/BlockStateModelGenerator$LogTexturePool
-transitive-accessible class net/minecraft/data/client/BlockStateModelGenerator$BuiltinModelPool
+
+accessible class net/minecraft/data/client/ModelProvider$class_10406
+accessible class net/minecraft/data/client/ModelProvider$class_10407
 
 ### Generated access wideners below
 
@@ -143,13 +142,17 @@ transitive-accessible	method	net/minecraft/data/server/recipe/RecipeGenerator	cr
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	createStoneState	(Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/data/client/TextureMap;Ljava/util/function/BiConsumer;)Lnet/minecraft/data/client/BlockStateSupplier;
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	createMudBrickState	(Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/data/client/TextureMap;Ljava/util/function/BiConsumer;)Lnet/minecraft/data/client/BlockStateSupplier;
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	createDeepslateState	(Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/data/client/TextureMap;Ljava/util/function/BiConsumer;)Lnet/minecraft/data/client/BlockStateSupplier;
-transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	excludeFromSimpleItemModelGeneration	(Lnet/minecraft/block/Block;)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	method_65399	(Lnet/minecraft/item/Item;Lnet/minecraft/util/Identifier;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerParentedItemModel	(Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;)V
-transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerParentedItemModel	(Lnet/minecraft/item/Item;Lnet/minecraft/util/Identifier;)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	method_65402	(Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/class_10401;)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	method_65398	(Lnet/minecraft/item/Item;)Lnet/minecraft/util/Identifier;
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	method_65400	(Lnet/minecraft/item/Item;Lnet/minecraft/block/Block;)Lnet/minecraft/util/Identifier;
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	method_65401	(Lnet/minecraft/item/Item;Lnet/minecraft/block/Block;Ljava/lang/String;)Lnet/minecraft/util/Identifier;
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	method_65414	(Lnet/minecraft/item/Item;Lnet/minecraft/block/Block;Ljava/lang/String;)Lnet/minecraft/util/Identifier;
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerItemModel	(Lnet/minecraft/item/Item;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerItemModel	(Lnet/minecraft/block/Block;)V
-transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	method_65292	(Lnet/minecraft/block/Block;Ljava/lang/String;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerItemModel	(Lnet/minecraft/block/Block;Ljava/lang/String;)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	method_65416	(Lnet/minecraft/block/Block;Ljava/lang/String;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	createNorthDefaultHorizontalRotationStates	()Lnet/minecraft/data/client/BlockStateVariantMap;
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	createSouthDefaultHorizontalRotationStates	()Lnet/minecraft/data/client/BlockStateVariantMap;
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	createEastDefaultHorizontalRotationStates	()Lnet/minecraft/data/client/BlockStateVariantMap;
@@ -183,7 +186,7 @@ transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	createSubModel	(Lnet/minecraft/block/Block;Ljava/lang/String;Lnet/minecraft/data/client/Model;Ljava/util/function/Function;)Lnet/minecraft/util/Identifier;
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	createPressurePlateBlockState	(Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateSupplier;
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	createSlabBlockState	(Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateSupplier;
-transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerSingleton	(Lnet/minecraft/block/Block;Lnet/minecraft/data/client/TextureMap;Lnet/minecraft/data/client/Model;)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	method_65420	(Lnet/minecraft/block/Block;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerCubeAllModelTexturePool	(Lnet/minecraft/block/Block;)Lnet/minecraft/data/client/BlockStateModelGenerator$BlockTexturePool;
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerDoor	(Lnet/minecraft/block/Block;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerParentedDoor	(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
@@ -193,23 +196,26 @@ transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerLog	(Lnet/minecraft/block/Block;)Lnet/minecraft/data/client/BlockStateModelGenerator$LogTexturePool;
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerSimpleState	(Lnet/minecraft/block/Block;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerStateWithModelReference	(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
-transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerTintableCross	(Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$TintType;)V
-transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerTintableCross	(Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$TintType;Lnet/minecraft/data/client/TextureMap;)V
-transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerTintableCrossBlockState	(Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$TintType;)V
-transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerTintableCrossBlockState	(Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$TintType;Lnet/minecraft/data/client/TextureMap;)V
-transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerTintableCrossBlockStateWithStages	(Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$TintType;Lnet/minecraft/state/property/Property;[I)V
-transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerFlowerPotPlant	(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$TintType;)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerTintableCross	(Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$CrossType;)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerTintableCross	(Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$CrossType;Lnet/minecraft/data/client/TextureMap;)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerTintableCrossBlockState	(Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$CrossType;)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerTintableCrossBlockState	(Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$CrossType;Lnet/minecraft/data/client/TextureMap;)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerTintableCrossBlockStateWithStages	(Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$CrossType;Lnet/minecraft/state/property/Property;[I)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	method_65407	(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$CrossType;)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerFlowerPotPlant	(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$CrossType;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerCoralFan	(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerGourd	(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerCoral	(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
-transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerDoubleBlock	(Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$TintType;)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerDoubleBlock	(Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$CrossType;)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	method_65417	(Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$CrossType;)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	method_65421	(Lnet/minecraft/block/Block;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerDoubleBlock	(Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerTurnableRail	(Lnet/minecraft/block/Block;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerStraightRail	(Lnet/minecraft/block/Block;)V
-transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerBuiltin	(Lnet/minecraft/util/Identifier;Lnet/minecraft/block/Block;)Lnet/minecraft/data/client/BlockStateModelGenerator$BuiltinModelPool;
-transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerBuiltin	(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)Lnet/minecraft/data/client/BlockStateModelGenerator$BuiltinModelPool;
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerBuiltinWithParticle	(Lnet/minecraft/block/Block;Lnet/minecraft/item/Item;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerBuiltinWithParticle	(Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	method_65419	(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)Lnet/minecraft/util/Identifier;
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	method_65422	(Lnet/minecraft/block/Block;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerWoolAndCarpet	(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerFlowerbed	(Lnet/minecraft/block/Block;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerRandomHorizontalRotations	(Lnet/minecraft/data/client/TexturedModel$Factory;[Lnet/minecraft/block/Block;)V
@@ -250,18 +256,22 @@ transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerTorch	(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	getTurtleEggModel	(ILjava/lang/String;Lnet/minecraft/data/client/TextureMap;)Lnet/minecraft/util/Identifier;
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	getTurtleEggModel	(Ljava/lang/Integer;Ljava/lang/Integer;)Lnet/minecraft/util/Identifier;
-transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerWallPlant	(Lnet/minecraft/block/Block;)V
-transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	method_65295	(Lnet/minecraft/block/Block;Lnet/minecraft/item/Item;)V
-transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	method_65291	(Lnet/minecraft/block/Block;)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerMultifaceBlock	(Lnet/minecraft/block/Block;)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerMultifaceBlock	(Lnet/minecraft/block/Block;Lnet/minecraft/item/Item;)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerMultifaceBlockModel	(Lnet/minecraft/block/Block;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerPaleMossCarpet	(Lnet/minecraft/block/Block;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerHangingMoss	(Lnet/minecraft/block/Block;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	supplyChiseledBookshelfModels	(Lnet/minecraft/data/client/MultipartBlockStateSupplier;Lnet/minecraft/data/client/When$PropertyCondition;Lnet/minecraft/data/client/VariantSettings$Rotation;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	supplyChiseledBookshelfModel	(Lnet/minecraft/data/client/MultipartBlockStateSupplier;Lnet/minecraft/data/client/When$PropertyCondition;Lnet/minecraft/data/client/VariantSettings$Rotation;Lnet/minecraft/state/property/BooleanProperty;Lnet/minecraft/data/client/Model;Z)V
-transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerShulkerBox	(Lnet/minecraft/block/Block;)V
-transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerPlantPart	(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$TintType;)V
-transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerBed	(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerShulkerBox	(Lnet/minecraft/block/Block;Lnet/minecraft/util/DyeColor;)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerPlantPart	(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$CrossType;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerRoots	(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	addJigsawOrientationToVariant	(Lnet/minecraft/block/enums/Orientation;Lnet/minecraft/data/client/BlockStateVariant;)Lnet/minecraft/data/client/BlockStateVariant;
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	method_65406	(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/SkullBlock$SkullType;Lnet/minecraft/util/Identifier;)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	method_65405	(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/util/DyeColor;)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	method_65404	(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Z)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	method_65415	(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/util/DyeColor;)V
+transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	method_65409	(Lnet/minecraft/block/Block;Lnet/minecraft/class_10515$class_10516;)V
 transitive-accessible	method	net/minecraft/data/client/BlockStateModelGenerator	registerCandle	(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
 transitive-accessible	method	net/minecraft/data/server/loottable/BlockLootTableGenerator	createSilkTouchCondition	()Lnet/minecraft/loot/condition/LootCondition$Builder;
 transitive-accessible	method	net/minecraft/data/server/loottable/BlockLootTableGenerator	createWithoutSilkTouchCondition	()Lnet/minecraft/loot/condition/LootCondition$Builder;
@@ -296,7 +306,7 @@ transitive-accessible	method	net/minecraft/data/server/loottable/BlockLootTableG
 transitive-accessible	method	net/minecraft/data/server/loottable/BlockLootTableGenerator	dropsWithShears	(Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/loot/LootTable$Builder;
 transitive-accessible	method	net/minecraft/data/server/loottable/BlockLootTableGenerator	dropsWithSilkTouchOrShears	(Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/loot/LootTable$Builder;
 transitive-accessible	method	net/minecraft/data/server/loottable/BlockLootTableGenerator	multifaceGrowthDrops	(Lnet/minecraft/block/Block;Lnet/minecraft/loot/condition/LootCondition$Builder;)Lnet/minecraft/loot/LootTable$Builder;
-transitive-accessible	method	net/minecraft/data/server/loottable/BlockLootTableGenerator	method_65261	(Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder;
+transitive-accessible	method	net/minecraft/data/server/loottable/BlockLootTableGenerator	multifaceGrowthDrops	(Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder;
 transitive-accessible	method	net/minecraft/data/server/loottable/BlockLootTableGenerator	paleMossCarpetDrops	(Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder;
 transitive-accessible	method	net/minecraft/data/server/loottable/BlockLootTableGenerator	leavesDrops	(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;[F)Lnet/minecraft/loot/LootTable$Builder;
 transitive-accessible	method	net/minecraft/data/server/loottable/BlockLootTableGenerator	oakLeavesDrops	(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;[F)Lnet/minecraft/loot/LootTable$Builder;
@@ -317,17 +327,41 @@ transitive-accessible	method	net/minecraft/data/server/loottable/BlockLootTableG
 transitive-accessible	method	net/minecraft/data/server/loottable/BlockLootTableGenerator	addDrop	(Lnet/minecraft/block/Block;)V
 transitive-accessible	method	net/minecraft/data/server/loottable/BlockLootTableGenerator	addDrop	(Lnet/minecraft/block/Block;Ljava/util/function/Function;)V
 transitive-accessible	method	net/minecraft/data/server/loottable/BlockLootTableGenerator	addDrop	(Lnet/minecraft/block/Block;Lnet/minecraft/loot/LootTable$Builder;)V
-transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	register	(Lnet/minecraft/item/Item;Lnet/minecraft/data/client/Model;)V
-transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	register	(Lnet/minecraft/item/Item;Ljava/lang/String;Lnet/minecraft/data/client/Model;)V
-transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	register	(Lnet/minecraft/item/Item;Lnet/minecraft/item/Item;Lnet/minecraft/data/client/Model;)V
-transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	registerWolfArmor	(Lnet/minecraft/item/Item;)V
-transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	registerCompass	(Lnet/minecraft/item/Item;)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65426	(Lnet/minecraft/item/Item;)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65434	(Lnet/minecraft/item/Item;Lnet/minecraft/data/client/Model;)Lnet/minecraft/util/Identifier;
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65442	(Lnet/minecraft/item/Item;Lnet/minecraft/data/client/Model;)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65438	(Lnet/minecraft/item/Item;Ljava/lang/String;Lnet/minecraft/data/client/Model;)Lnet/minecraft/util/Identifier;
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65432	(Lnet/minecraft/item/Item;Lnet/minecraft/item/Item;Lnet/minecraft/data/client/Model;)Lnet/minecraft/util/Identifier;
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65441	(Lnet/minecraft/item/Item;Lnet/minecraft/item/Item;Lnet/minecraft/data/client/Model;)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65433	(Lnet/minecraft/item/Item;Lnet/minecraft/class_10401;)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65437	(Lnet/minecraft/item/Item;Ljava/lang/String;Lnet/minecraft/class_10401;)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65440	(Lnet/minecraft/item/Item;)Ljava/util/List;
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65443	(Lnet/minecraft/item/Item;)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65444	(Lnet/minecraft/item/Item;)V
 transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	registerClock	(Lnet/minecraft/item/Item;)V
-transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	uploadArmor	(Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65431	(Lnet/minecraft/item/Item;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/util/Identifier;
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	uploadArmor	(Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/util/Identifier;
 transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	uploadArmor	(Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)V
-transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	suffixTrim	(Lnet/minecraft/util/Identifier;Ljava/lang/String;)Lnet/minecraft/util/Identifier;
-transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	createArmorJson	(Lnet/minecraft/util/Identifier;Ljava/util/Map;Lnet/minecraft/util/Identifier;)Lcom/google/gson/JsonObject;
-transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	registerArmor	(Lnet/minecraft/item/Item;Lnet/minecraft/util/Identifier;Lnet/minecraft/item/equipment/EquipmentModel;Lnet/minecraft/entity/EquipmentSlot;)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65429	(Lnet/minecraft/item/Item;Lnet/minecraft/registry/RegistryKey;Ljava/lang/String;Z)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65445	(Lnet/minecraft/item/Item;)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65435	(Lnet/minecraft/item/Item;Lnet/minecraft/data/client/Model;Ljava/lang/String;)Lnet/minecraft/util/Identifier;
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65446	(Lnet/minecraft/item/Item;)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65447	(Lnet/minecraft/item/Item;)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65436	(Lnet/minecraft/item/Item;Lnet/minecraft/class_10460;Lnet/minecraft/class_10439$class_10441;Lnet/minecraft/class_10439$class_10441;)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65448	(Lnet/minecraft/item/Item;)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65449	(Lnet/minecraft/item/Item;)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65450	(Lnet/minecraft/item/Item;)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65451	(Lnet/minecraft/item/Item;)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65452	(Lnet/minecraft/item/Item;)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65439	(Lnet/minecraft/class_10439$class_10441;Lnet/minecraft/class_10439$class_10441;)Lnet/minecraft/class_10439$class_10441;
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65453	(Lnet/minecraft/item/Item;)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65454	(Lnet/minecraft/item/Item;)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65430	(Lnet/minecraft/item/Item;Lnet/minecraft/util/Identifier;)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65455	(Lnet/minecraft/item/Item;)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65456	(Lnet/minecraft/item/Item;)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65427	(Lnet/minecraft/item/Item;I)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65428	(Lnet/minecraft/item/Item;II)V
+transitive-accessible	method	net/minecraft/data/client/ItemModelGenerator	method_65457	(Lnet/minecraft/item/Item;)V
 transitive-extendable	method	net/minecraft/data/MetadataProvider	getName	()Ljava/lang/String;
 transitive-extendable	method	net/minecraft/data/SnbtProvider	getName	()Ljava/lang/String;
 transitive-extendable	method	net/minecraft/data/client/ModelProvider	getName	()Ljava/lang/String;

fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.mixins.json

@@ -4,7 +4,6 @@
   "compatibilityLevel": "JAVA_21",
   "mixins": [
     "DataProviderMixin",
-    "ModelProviderMixin",
     "TagBuilderMixin",
     "TagProviderMixin",
     "loot.BlockLootTableGeneratorAccessor",

fabric-data-generation-api-v1/src/testmod/generated/assets/fabric-data-gen-api-v1-testmod/models/item/simple_block.json

@@ -1,3 +0,0 @@
-{
-  "parent": "fabric-data-gen-api-v1-testmod:block/simple_block"
-}

fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/atlases/atlas_source_test.json

@@ -0,0 +1,9 @@
+{
+  "sources": [
+    {
+      "type": "minecraft:directory",
+      "prefix": "example/",
+      "source": "example"
+    }
+  ]
+}

fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/items/simple_block.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "fabric-data-gen-api-v1-testmod:block/simple_block"
+  }
+}

fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestEntrypoint.java

@@ -16,10 +16,8 @@
 
 package net.fabricmc.fabric.test.datagen;
 
-import static net.fabricmc.fabric.test.datagen.DataGeneratorTestContent.BLOCK_THAT_DROPS_NOTHING;
 import static net.fabricmc.fabric.test.datagen.DataGeneratorTestContent.BLOCK_WITHOUT_ITEM;
 import static net.fabricmc.fabric.test.datagen.DataGeneratorTestContent.BLOCK_WITHOUT_LOOT_TABLE;
-import static net.fabricmc.fabric.test.datagen.DataGeneratorTestContent.BLOCK_WITH_VANILLA_LOOT_TABLE;
 import static net.fabricmc.fabric.test.datagen.DataGeneratorTestContent.MOD_ID;
 import static net.fabricmc.fabric.test.datagen.DataGeneratorTestContent.SIMPLE_BLOCK;
 import static net.fabricmc.fabric.test.datagen.DataGeneratorTestContent.SIMPLE_ITEM_GROUP;
@@ -47,8 +45,6 @@ import net.minecraft.block.BlockKeys;
 import net.minecraft.component.ComponentChanges;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.data.DataOutput;
-import net.minecraft.data.client.BlockStateModelGenerator;
-import net.minecraft.data.client.ItemModelGenerator;
 import net.minecraft.data.server.recipe.RecipeExporter;
 import net.minecraft.data.server.recipe.RecipeGenerator;
 import net.minecraft.entity.EntityType;
@@ -93,7 +89,6 @@ import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricCodecDataProvider;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricDynamicRegistryProvider;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricLanguageProvider;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
 import net.fabricmc.fabric.api.datagen.v1.provider.SimpleFabricLootTableProvider;
@@ -116,7 +111,6 @@ public class DataGeneratorTestEntrypoint implements DataGeneratorEntrypoint {
 		final FabricDataGenerator.Pack pack = dataGenerator.createPack();
 
 		pack.addProvider(TestRecipeProvider::new);
-		pack.addProvider(TestModelProvider::new);
 		pack.addProvider(TestAdvancementProvider::new);
 		pack.addProvider(TestBlockLootTableProvider::new);
 		pack.addProvider(TestBarterLootTableProvider::new);
@@ -302,26 +296,6 @@ public class DataGeneratorTestEntrypoint implements DataGeneratorEntrypoint {
 		}
 	}
 
-	private static class TestModelProvider extends FabricModelProvider {
-		private TestModelProvider(FabricDataOutput output) {
-			super(output);
-		}
-
-		@Override
-		public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGenerator) {
-			blockStateModelGenerator.registerSimpleCubeAll(SIMPLE_BLOCK);
-			blockStateModelGenerator.registerSimpleCubeAll(BLOCK_WITHOUT_ITEM);
-			blockStateModelGenerator.registerSimpleCubeAll(BLOCK_WITHOUT_LOOT_TABLE);
-			blockStateModelGenerator.registerSimpleCubeAll(BLOCK_WITH_VANILLA_LOOT_TABLE);
-			blockStateModelGenerator.registerSimpleCubeAll(BLOCK_THAT_DROPS_NOTHING);
-		}
-
-		@Override
-		public void generateItemModels(ItemModelGenerator itemModelGenerator) {
-			//itemModelGenerator.register(item, Models.SLAB);
-		}
-	}
-
 	private static class TestBlockTagProvider extends FabricTagProvider.BlockTagProvider {
 		TestBlockTagProvider(FabricDataOutput output, CompletableFuture<RegistryWrapper.WrapperLookup> registriesFuture) {
 			super(output, registriesFuture);

fabric-data-generation-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/datagen/client/DataGeneratorClientTestEntrypoint.java

@@ -26,14 +26,18 @@ import net.minecraft.client.texture.atlas.AtlasSource;
 import net.minecraft.client.texture.atlas.AtlasSourceManager;
 import net.minecraft.client.texture.atlas.DirectoryAtlasSource;
 import net.minecraft.data.DataOutput;
+import net.minecraft.data.client.BlockStateModelGenerator;
+import net.minecraft.data.client.ItemModelGenerator;
 import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.util.Identifier;
 
+import net.fabricmc.fabric.api.client.datagen.v1.provider.FabricModelProvider;
 import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.JsonKeySortOrderCallback;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricCodecDataProvider;
+import net.fabricmc.fabric.test.datagen.DataGeneratorTestContent;
 
 @SuppressWarnings("unused")
 public class DataGeneratorClientTestEntrypoint implements DataGeneratorEntrypoint {
@@ -46,6 +50,7 @@ public class DataGeneratorClientTestEntrypoint implements DataGeneratorEntrypoin
 	public void onInitializeDataGenerator(FabricDataGenerator dataGenerator) {
 		final FabricDataGenerator.Pack pack = dataGenerator.createBuiltinResourcePack(Identifier.of(MOD_ID, "example_builtin"));
 		pack.addProvider(TestAtlasSourceProvider::new);
+		pack.addProvider(TestModelProvider::new);
 	}
 
 	private static class TestAtlasSourceProvider extends FabricCodecDataProvider<List<AtlasSource>> {
@@ -63,4 +68,24 @@ public class DataGeneratorClientTestEntrypoint implements DataGeneratorEntrypoin
 			return "Atlas Sources";
 		}
 	}
+
+	private static class TestModelProvider extends FabricModelProvider {
+		private TestModelProvider(FabricDataOutput output) {
+			super(output);
+		}
+
+		@Override
+		public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGenerator) {
+			blockStateModelGenerator.registerSimpleCubeAll(DataGeneratorTestContent.SIMPLE_BLOCK);
+			blockStateModelGenerator.registerSimpleCubeAll(DataGeneratorTestContent.BLOCK_WITHOUT_ITEM);
+			blockStateModelGenerator.registerSimpleCubeAll(DataGeneratorTestContent.BLOCK_WITHOUT_LOOT_TABLE);
+			blockStateModelGenerator.registerSimpleCubeAll(DataGeneratorTestContent.BLOCK_WITH_VANILLA_LOOT_TABLE);
+			blockStateModelGenerator.registerSimpleCubeAll(DataGeneratorTestContent.BLOCK_THAT_DROPS_NOTHING);
+		}
+
+		@Override
+		public void generateItemModels(ItemModelGenerator itemModelGenerator) {
+			//itemModelGenerator.register(item, Models.SLAB);
+		}
+	}
 }

fabric-data-generation-api-v1/template.accesswidener

@@ -35,8 +35,6 @@ transitive-accessible method net/minecraft/data/family/BlockFamilies register (L
 transitive-accessible field net/minecraft/data/client/BlockStateModelGenerator blockStateCollector Ljava/util/function/Consumer;
 transitive-accessible field net/minecraft/data/client/BlockStateModelGenerator modelCollector Ljava/util/function/BiConsumer;
 
-transitive-accessible field net/minecraft/data/client/ItemModelGenerator writer Ljava/util/function/BiConsumer;
-
 transitive-accessible method net/minecraft/data/client/TextureKey of (Ljava/lang/String;)Lnet/minecraft/data/client/TextureKey;
 transitive-accessible method net/minecraft/data/client/TextureKey of (Ljava/lang/String;Lnet/minecraft/data/client/TextureKey;)Lnet/minecraft/data/client/TextureKey;
 
@@ -44,9 +42,10 @@ transitive-extendable method net/minecraft/data/server/tag/TagProvider$ProvidedT
 
 transitive-accessible method net/minecraft/data/client/TexturedModel makeFactory (Ljava/util/function/Function;Lnet/minecraft/data/client/Model;)Lnet/minecraft/data/client/TexturedModel$Factory;
 
-transitive-accessible class net/minecraft/data/client/BlockStateModelGenerator$TintType
 transitive-accessible class net/minecraft/data/client/BlockStateModelGenerator$BlockTexturePool
 transitive-accessible class net/minecraft/data/client/BlockStateModelGenerator$LogTexturePool
-transitive-accessible class net/minecraft/data/client/BlockStateModelGenerator$BuiltinModelPool
+
+accessible class net/minecraft/data/client/ModelProvider$class_10406
+accessible class net/minecraft/data/client/ModelProvider$class_10407
 
 ### Generated access wideners below

fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerPlayNetworkHandlerMixin.java

@@ -25,10 +25,10 @@ import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 
 import net.minecraft.block.BlockState;
-import net.minecraft.class_10370;
-import net.minecraft.class_10371;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.ItemStack;
+import net.minecraft.network.packet.c2s.play.PickItemFromBlockC2SPacket;
+import net.minecraft.network.packet.c2s.play.PickItemFromEntityC2SPacket;
 import net.minecraft.server.network.ServerPlayNetworkHandler;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.math.BlockPos;
@@ -43,32 +43,32 @@ public abstract class ServerPlayNetworkHandlerMixin {
 	private ServerPlayerEntity player;
 
 	@Shadow
-	private void method_65098(ItemStack stack) {
+	private void onPickItem(ItemStack stack) {
 		throw new AssertionError();
 	}
 
-	@WrapOperation(method = "method_65085", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;method_65171(Lnet/minecraft/world/WorldView;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/item/ItemStack;"))
-	public ItemStack onPickItemFromBlock(BlockState state, WorldView world, BlockPos pos, Operation<ItemStack> operation, @Local class_10370 packet) {
+	@WrapOperation(method = "onPickItemFromBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;getPickStack(Lnet/minecraft/world/WorldView;Lnet/minecraft/util/math/BlockPos;Z)Lnet/minecraft/item/ItemStack;"))
+	public ItemStack onPickItemFromBlock(BlockState state, WorldView world, BlockPos pos, boolean bl, Operation<ItemStack> operation, @Local PickItemFromBlockC2SPacket packet) {
 		ItemStack stack = PlayerPickItemEvents.BLOCK.invoker().onPickItemFromBlock(player, pos, state, packet.includeData());
 
 		if (stack == null) {
-			return operation.call(state, world, pos);
+			return operation.call(state, world, pos, bl);
 		} else if (!stack.isEmpty()) {
-			this.method_65098(stack);
+			this.onPickItem(stack);
 		}
 
 		// Prevent vanilla data-inclusion behavior
 		return ItemStack.EMPTY;
 	}
 
-	@WrapOperation(method = "onPickFromInventory", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;getPickBlockStack()Lnet/minecraft/item/ItemStack;"))
-	public ItemStack onPickItemFromEntity(Entity entity, Operation<ItemStack> operation, @Local class_10371 packet) {
+	@WrapOperation(method = "onPickItemFromEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;getPickBlockStack()Lnet/minecraft/item/ItemStack;"))
+	public ItemStack onPickItemFromEntity(Entity entity, Operation<ItemStack> operation, @Local PickItemFromEntityC2SPacket packet) {
 		ItemStack stack = PlayerPickItemEvents.ENTITY.invoker().onPickItemFromEntity(player, entity, packet.includeData());
 
 		if (stack == null) {
 			return operation.call(entity);
 		} else if (!stack.isEmpty()) {
-			this.method_65098(stack);
+			this.onPickItem(stack);
 		}
 
 		// Prevent vanilla data-inclusion behavior

fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/ArmorKnockbackResistanceTest.java

@@ -21,6 +21,7 @@ import java.util.Map;
 import net.minecraft.item.ArmorItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.equipment.ArmorMaterial;
+import net.minecraft.item.equipment.EquipmentModels;
 import net.minecraft.item.equipment.EquipmentType;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
@@ -56,7 +57,7 @@ public class ArmorKnockbackResistanceTest implements ModInitializer {
 			0,
 			0.5F,
 			ItemTags.REPAIRS_LEATHER_ARMOR,
-			Identifier.of("fabric-item-api-v1-testmod", "wood")
+			EquipmentModels.IRON
 		);
 	}
 }

fabric-loot-api-v3/src/main/java/net/fabricmc/fabric/mixin/loot/JsonDataLoaderMixin.java

@@ -30,6 +30,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import net.minecraft.loot.LootDataType;
 import net.minecraft.resource.JsonDataLoader;
 import net.minecraft.resource.Resource;
+import net.minecraft.resource.ResourceFinder;
 import net.minecraft.resource.ResourceManager;
 import net.minecraft.util.Identifier;
 
@@ -38,8 +39,9 @@ import net.fabricmc.fabric.impl.loot.LootUtil;
 @Mixin(JsonDataLoader.class)
 public class JsonDataLoaderMixin {
 	@Inject(method = "load", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/resource/ResourceFinder;toResourceId(Lnet/minecraft/util/Identifier;)Lnet/minecraft/util/Identifier;", shift = At.Shift.AFTER))
-	private static <T> void fillSourceMap(ResourceManager manager, String dataType, DynamicOps<JsonElement> dynamicOps, Codec<T> codec, Map<Identifier, T> results, CallbackInfo ci, @Local Map.Entry<Identifier, Resource> entry, @Local(ordinal = 1) Identifier id) {
-		if (!LootDataType.LOOT_TABLES.registryKey().getValue().getPath().equals(dataType)) return;
+	private static <T> void fillSourceMap(ResourceManager manager, ResourceFinder resourceFinder, DynamicOps<JsonElement> ops, Codec<T> codec, Map<Identifier, T> result, CallbackInfo ci, @Local Map.Entry<Identifier, Resource> entry, @Local(ordinal = 1) Identifier id) {
+		final String dirName = ((ResourceFinderAccessor) resourceFinder).getDirectoryName();
+		if (!LootDataType.LOOT_TABLES.registryKey().getValue().getPath().equals(dirName)) return;
 
 		LootUtil.SOURCES.get().put(id, LootUtil.determineSource(entry.getValue()));
 	}

fabric-loot-api-v3/src/main/java/net/fabricmc/fabric/mixin/loot/ResourceFinderAccessor.java

@@ -14,19 +14,15 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.object.builder.client;
+package net.fabricmc.fabric.mixin.loot;
 
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
+import org.spongepowered.asm.mixin.gen.Accessor;
 
-import net.minecraft.client.item.ClampedModelPredicateProvider;
-import net.minecraft.client.item.ModelPredicateProviderRegistry;
-import net.minecraft.util.Identifier;
+import net.minecraft.resource.ResourceFinder;
 
-@Mixin(ModelPredicateProviderRegistry.class)
-public interface ModelPredicateProviderRegistryAccessor {
-	@Invoker
-	static ClampedModelPredicateProvider callRegister(Identifier id, ClampedModelPredicateProvider provider) {
-		throw new AssertionError("mixin dummy");
-	}
+@Mixin(ResourceFinder.class)
+public interface ResourceFinderAccessor {
+	@Accessor
+	String getDirectoryName();
 }

fabric-loot-api-v3/src/main/resources/fabric-loot-api-v3.mixins.json

@@ -8,7 +8,8 @@
     "LootPoolAccessor",
     "LootPoolBuilderMixin",
     "LootTableAccessor",
-    "LootTableBuilderMixin"
+    "LootTableBuilderMixin",
+    "ResourceFinderAccessor"
   ],
   "injectors": {
     "defaultRequire": 1

fabric-object-builder-api-v1/build.gradle

@@ -13,7 +13,3 @@ testDependencies(project, [
 loom {
 	accessWidenerPath = file("src/main/resources/fabric-object-builder-api-v1.accesswidener")
 }
-
-validateMixinNames {
-	exclude "**/ModelPredicateProviderRegistrySpecificAccessor.class"
-}

fabric-object-builder-api-v1/src/client/java/net/fabricmc/fabric/api/object/builder/v1/client/model/FabricModelPredicateProviderRegistry.java

@@ -1,58 +0,0 @@
-/*
- * 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.api.object.builder.v1.client.model;
-
-import net.minecraft.client.item.ClampedModelPredicateProvider;
-import net.minecraft.item.Item;
-import net.minecraft.util.Identifier;
-
-import net.fabricmc.fabric.mixin.object.builder.client.ModelPredicateProviderRegistryAccessor;
-import net.fabricmc.fabric.mixin.object.builder.client.ModelPredicateProviderRegistrySpecificAccessor;
-
-/**
- * Allows registering model predicate providers for item models.
- *
- * <p>A registered model predicate providers for an item can be retrieved through
- * {@link net.minecraft.client.item.ModelPredicateProviderRegistry#get(net.minecraft.item.ItemStack, Identifier)}.</p>
- *
- * @see net.minecraft.client.item.ModelPredicateProviderRegistry
- * @deprecated Replaced by access wideners for {@link net.minecraft.client.item.ModelPredicateProviderRegistry}
- * registration methods in Fabric Transitive Access Wideners (v1).
- */
-@Deprecated
-public final class FabricModelPredicateProviderRegistry {
-	/**
-	 * Registers a model predicate provider that is applicable for any item.
-	 *
-	 * @param id       the identifier of the provider
-	 * @param provider the provider
-	 */
-	public static void register(Identifier id, ClampedModelPredicateProvider provider) {
-		ModelPredicateProviderRegistryAccessor.callRegister(id, provider);
-	}
-
-	/**
-	 * Registers a model predicate provider to a specific item.
-	 *
-	 * @param item     the item the provider is associated to
-	 * @param id       the identifier of the provider
-	 * @param provider the provider
-	 */
-	public static void register(Item item, Identifier id, ClampedModelPredicateProvider provider) {
-		ModelPredicateProviderRegistrySpecificAccessor.callRegister(item, id, provider);
-	}
-}

fabric-object-builder-api-v1/src/client/java/net/fabricmc/fabric/mixin/object/builder/client/EntityModelLayersMixin.java

@@ -46,7 +46,7 @@ public class EntityModelLayersMixin {
 	}
 
 	@Inject(method = "createHangingSign", at = @At("HEAD"), cancellable = true)
-	private static void createHangingSign(WoodType type, HangingSignBlockEntityRenderer.class_10381 attachmentType, CallbackInfoReturnable<EntityModelLayer> cir) {
+	private static void createHangingSign(WoodType type, HangingSignBlockEntityRenderer.AttachmentType attachmentType, CallbackInfoReturnable<EntityModelLayer> cir) {
 		if (type.name().indexOf(Identifier.NAMESPACE_SEPARATOR) != -1) {
 			Identifier identifier = Identifier.of(type.name());
 			cir.setReturnValue(new EntityModelLayer(identifier.withPath(path -> {

fabric-object-builder-api-v1/src/client/resources/fabric-object-builder-v1.client.mixins.json

@@ -5,8 +5,6 @@
   "client": [
     "EntityModelLayersMixin",
     "HangingSignEditScreenMixin",
-    "ModelPredicateProviderRegistryAccessor",
-    "ModelPredicateProviderRegistrySpecificAccessor",
     "TexturedRenderLayersMixin"
   ],
   "injectors": {

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

@@ -1,43 +0,0 @@
-/*
- * 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.registry.sync.client;
-
-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.color.item.ItemColorProvider;
-import net.minecraft.client.color.item.ItemColors;
-import net.minecraft.registry.Registries;
-import net.minecraft.util.collection.IdList;
-
-import net.fabricmc.fabric.impl.registry.sync.trackers.IdListTracker;
-
-@Mixin(ItemColors.class)
-public class ItemColorsMixin {
-	@Final
-	@Shadow
-	private IdList<ItemColorProvider> providers;
-
-	@Inject(method = "<init>", at = @At("RETURN"))
-	private void create(CallbackInfo info) {
-		IdListTracker.register(Registries.ITEM, "ItemColors.providers", providers);
-	}
-}

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

@@ -6,7 +6,6 @@
     "BlockColorsMixin",
     "ClientRegistriesMixin",
     "ClientRegistriesDynamicRegistriesAccessor",
-    "ItemColorsMixin",
     "MinecraftClientMixin",
     "ParticleManagerMixin"
   ],

fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistryLoaderMixin.java

@@ -33,8 +33,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKey;
+import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.RegistryLoader;
 import net.minecraft.registry.RegistryWrapper;
+import net.minecraft.resource.ResourceFinder;
 import net.minecraft.util.Identifier;
 
 import net.fabricmc.fabric.api.event.registry.DynamicRegistrySetupCallback;
@@ -89,17 +91,17 @@ public class RegistryLoaderMixin {
 			},
 			at = @At(
 					value = "INVOKE",
-					target = "Lnet/minecraft/registry/RegistryKeys;getPath(Lnet/minecraft/registry/RegistryKey;)Ljava/lang/String;"
+					target = "Lnet/minecraft/resource/ResourceFinder;method_65309(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/resource/ResourceFinder;"
 			)
 	)
-	private static String prependDirectoryWithNamespace(RegistryKey<? extends Registry<?>> registryKey, Operation<String> original) {
-		String originalDirectory = original.call(registryKey);
+	private static ResourceFinder prependDirectoryWithNamespace(RegistryKey<? extends Registry<?>> registryKey, Operation<ResourceFinder> original) {
+		String originalDirectory = RegistryKeys.getPath(registryKey);
 		Identifier id = registryKey.getValue();
 		if (!id.getNamespace().equals(Identifier.DEFAULT_NAMESPACE)
 				&& DynamicRegistriesImpl.FABRIC_DYNAMIC_REGISTRY_KEYS.contains(registryKey)) {
-			return id.getNamespace() + "/" + originalDirectory;
+			return ResourceFinder.json(id.getNamespace() + "/" + originalDirectory);
 		}
 
-		return originalDirectory;
+		return original.call(registryKey);
 	}
 }

fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/BuiltinItemRendererRegistry.java

@@ -30,6 +30,7 @@ import net.fabricmc.fabric.impl.client.rendering.BuiltinItemRendererRegistryImpl
 /**
  * This registry holds {@linkplain DynamicItemRenderer builtin item renderers} for items.
  */
+// TODO 1.21.4, class_10444/class_10515
 public interface BuiltinItemRendererRegistry {
 	/**
 	 * The singleton instance of the renderer registry.

fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/ColorProviderRegistry.java

@@ -20,14 +20,10 @@ import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.color.block.BlockColorProvider;
-import net.minecraft.client.color.item.ItemColorProvider;
-import net.minecraft.item.ItemConvertible;
 
 import net.fabricmc.fabric.impl.client.rendering.ColorProviderRegistryImpl;
 
 public interface ColorProviderRegistry<T, Provider> {
-	ColorProviderRegistry<ItemConvertible, ItemColorProvider> ITEM = ColorProviderRegistryImpl.ITEM;
-
 	ColorProviderRegistry<Block, BlockColorProvider> BLOCK = ColorProviderRegistryImpl.BLOCK;
 
 	/**

fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/ColorProviderRegistryImpl.java

@@ -22,9 +22,6 @@ import java.util.Map;
 import net.minecraft.block.Block;
 import net.minecraft.client.color.block.BlockColorProvider;
 import net.minecraft.client.color.block.BlockColors;
-import net.minecraft.client.color.item.ItemColorProvider;
-import net.minecraft.client.color.item.ItemColors;
-import net.minecraft.item.ItemConvertible;
 
 import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
 
@@ -36,13 +33,6 @@ public abstract class ColorProviderRegistryImpl<T, Provider, Underlying> impleme
 		}
 	};
 
-	public static final ColorProviderRegistryImpl<ItemConvertible, ItemColorProvider, ItemColors> ITEM = new ColorProviderRegistryImpl<ItemConvertible, ItemColorProvider, ItemColors>() {
-		@Override
-		void registerUnderlying(ItemColors map, ItemColorProvider mapper, ItemConvertible block) {
-			map.register(mapper, block);
-		}
-	};
-
 	private Underlying colorMap;
 	private Map<T, Provider> tempMappers = new IdentityHashMap<>();
 

fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/BuiltinModelItemRendererMixin.java

@@ -1,45 +0,0 @@
-/*
- * 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.client.rendering;
-
-import org.jetbrains.annotations.Nullable;
-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 net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.item.BuiltinModelItemRenderer;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.ModelTransformationMode;
-
-import net.fabricmc.fabric.api.client.rendering.v1.BuiltinItemRendererRegistry;
-
-@Mixin(BuiltinModelItemRenderer.class)
-abstract class BuiltinModelItemRendererMixin {
-	@Inject(method = "render", at = @At("HEAD"), cancellable = true)
-	private void fabric_onRender(ItemStack stack, ModelTransformationMode mode, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay, CallbackInfo info) {
-		@Nullable
-		BuiltinItemRendererRegistry.DynamicItemRenderer renderer = BuiltinItemRendererRegistry.INSTANCE.get(stack.getItem());
-
-		if (renderer != null) {
-			renderer.render(stack, mode, matrices, vertexConsumers, light, overlay);
-			info.cancel();
-		}
-	}
-}

fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/ItemColorsMixin.java

@@ -1,50 +0,0 @@
-/*
- * 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.client.rendering;
-
-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.CallbackInfoReturnable;
-
-import net.minecraft.client.color.block.BlockColors;
-import net.minecraft.client.color.item.ItemColorProvider;
-import net.minecraft.client.color.item.ItemColors;
-import net.minecraft.item.ItemConvertible;
-import net.minecraft.registry.Registries;
-import net.minecraft.util.collection.IdList;
-
-import net.fabricmc.fabric.impl.client.rendering.ColorProviderRegistryImpl;
-
-@Mixin(ItemColors.class)
-public class ItemColorsMixin implements ColorProviderRegistryImpl.ColorMapperHolder<ItemConvertible, ItemColorProvider> {
-	@Shadow
-	@Final
-	private IdList<ItemColorProvider> providers;
-
-	@Inject(method = "create", at = @At("RETURN"))
-	private static void create(BlockColors blockMap, CallbackInfoReturnable<ItemColors> info) {
-		ColorProviderRegistryImpl.ITEM.initialize(info.getReturnValue());
-	}
-
-	@Override
-	public ItemColorProvider get(ItemConvertible item) {
-		return providers.get(Registries.ITEM.getRawId(item.asItem()));
-	}
-}

fabric-rendering-v1/src/client/resources/fabric-rendering-v1.mixins.json

@@ -7,7 +7,6 @@
     "AtlasSourceManagerAccessor",
     "BlockColorsMixin",
     "BlockEntityRendererFactoriesMixin",
-    "BuiltinModelItemRendererMixin",
     "CapeFeatureRendererMixin",
     "ClientWorldMixin",
     "DimensionEffectsAccessor",
@@ -15,7 +14,6 @@
     "EntityModelsMixin",
     "EntityRenderersMixin",
     "InGameHudMixin",
-    "ItemColorsMixin",
     "LivingEntityRendererAccessor",
     "TooltipComponentMixin",
     "WorldRendererMixin"

fabric-rendering-v1/src/testmod/java/net/fabricmc/fabric/test/rendering/TooltipComponentTestInit.java

@@ -23,6 +23,7 @@ import net.minecraft.item.ArmorItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.equipment.ArmorMaterial;
+import net.minecraft.item.equipment.EquipmentModels;
 import net.minecraft.item.equipment.EquipmentType;
 import net.minecraft.item.tooltip.TooltipData;
 import net.minecraft.registry.Registries;
@@ -78,7 +79,7 @@ public class TooltipComponentTestInit implements ModInitializer {
 				0,
 				0.5F,
 				ItemTags.REPAIRS_LEATHER_ARMOR,
-				Identifier.of("fabric-rendering-v1-testmod", "test_material")
+				EquipmentModels.IRON
 		);
 	}
 }

fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/FeatureRendererGenericTests.java

@@ -62,7 +62,7 @@ public class FeatureRendererGenericTests implements ClientModInitializer {
 
 			if (entityRenderer instanceof BipedEntityRenderer) {
 				// It works, method ref is encouraged
-				registrationHelper.register(new HeldItemFeatureRenderer<>((BipedEntityRenderer<?, ?, ?>) entityRenderer, context.getItemRenderer()));
+				registrationHelper.register(new HeldItemFeatureRenderer<>((BipedEntityRenderer<?, ?, ?>) entityRenderer));
 			}
 		});
 
@@ -87,7 +87,7 @@ public class FeatureRendererGenericTests implements ClientModInitializer {
 
 		if (entityRenderer instanceof BipedEntityRenderer<?, ?, ?> bipedEntityRenderer) {
 			// It works, method ref is encouraged
-			registrationHelper.register(new HeldItemFeatureRenderer<>(bipedEntityRenderer, context.getItemRenderer()));
+			registrationHelper.register(new HeldItemFeatureRenderer<>(bipedEntityRenderer));
 		}
 	}
 

fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/JsonDataLoaderMixin.java

@@ -36,6 +36,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import net.minecraft.registry.RegistryOps;
 import net.minecraft.resource.JsonDataLoader;
 import net.minecraft.resource.Resource;
+import net.minecraft.resource.ResourceFinder;
 import net.minecraft.util.Identifier;
 
 import net.fabricmc.fabric.impl.resource.conditions.ResourceConditionsImpl;
@@ -47,7 +48,7 @@ public class JsonDataLoaderMixin {
 
 	@WrapOperation(method = "load", at = @At(value = "INVOKE", target = "Lcom/mojang/serialization/Codec;parse(Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;", remap = false))
 	private static DataResult<?> applyResourceConditions(Codec<?> instance, DynamicOps<JsonElement> dynamicOps, Object object, Operation<DataResult<?>> original,
-														@Local(argsOnly = true) String dataType,
+														@Local(argsOnly = true) ResourceFinder resourceFinder,
 														@Local Map.Entry<Identifier, Resource> entry) {
 		final JsonElement resourceData = (JsonElement) object;
 		@Nullable RegistryOps.RegistryInfoGetter registryInfo = null;
@@ -59,6 +60,8 @@ public class JsonDataLoaderMixin {
 		if (resourceData.isJsonObject()) {
 			JsonObject obj = resourceData.getAsJsonObject();
 
+			final String dataType = ((ResourceFinderAccessor) resourceFinder).getDirectoryName();
+
 			if (!ResourceConditionsImpl.applyResourceConditions(obj, dataType, entry.getKey(), registryInfo)) {
 				return DataResult.success(SKIP_DATA_MARKER);
 			}

fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/ResourceFinderAccessor.java

@@ -14,21 +14,15 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.object.builder.client;
+package net.fabricmc.fabric.mixin.resource.conditions;
 
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
+import org.spongepowered.asm.mixin.gen.Accessor;
 
-import net.minecraft.client.item.ClampedModelPredicateProvider;
-import net.minecraft.client.item.ModelPredicateProviderRegistry;
-import net.minecraft.item.Item;
-import net.minecraft.util.Identifier;
+import net.minecraft.resource.ResourceFinder;
 
-// mixin doesn't care about descriptor, must put two "register" accessors in different places
-@Mixin(ModelPredicateProviderRegistry.class)
-public interface ModelPredicateProviderRegistrySpecificAccessor {
-	@Invoker
-	static void callRegister(Item item, Identifier id, ClampedModelPredicateProvider provider) {
-		throw new AssertionError("mixin dummy");
-	}
+@Mixin(ResourceFinder.class)
+public interface ResourceFinderAccessor {
+	@Accessor
+	String getDirectoryName();
 }

fabric-resource-conditions-api-v1/src/main/resources/fabric-resource-conditions-api-v1.mixins.json

@@ -9,6 +9,7 @@
     "RegistryLoaderMixin",
     "RegistryOpsAccessor",
     "ReloadableRegistriesMixin",
+    "ResourceFinderAccessor",
     "ResourcePackProfileMixin"
   ],
   "injectors": {

fabric-transitive-access-wideners-v1/build.gradle

@@ -21,7 +21,7 @@ import java.nio.file.Files
 import java.nio.file.Path
 import java.util.stream.Collectors
 
-task generateAccessWidener {
+tasks.register('generateAccessWidener') {
 	doLast {
 		List<String> lines = new ArrayList<>();
 		lines.add("accessWidener v2 named")

fabric-transitive-access-wideners-v1/src/main/resources/fabric-transitive-access-wideners-v1.accesswidener

@@ -3,11 +3,6 @@ accessWidener v2 named
 # DO NOT EDIT BY HAND! This file is generated automatically.
 # Edit "template.accesswidener" instead then run "gradlew generateAccessWidener".
 
-# Registering custom model predicate providers for item models
-transitive-accessible method net/minecraft/client/item/ModelPredicateProviderRegistry register (Lnet/minecraft/item/Item;Lnet/minecraft/util/Identifier;Lnet/minecraft/client/item/ClampedModelPredicateProvider;)V
-transitive-accessible method net/minecraft/client/item/ModelPredicateProviderRegistry register (Lnet/minecraft/util/Identifier;Lnet/minecraft/client/item/ClampedModelPredicateProvider;)Lnet/minecraft/client/item/ClampedModelPredicateProvider;
-transitive-accessible method net/minecraft/client/item/ModelPredicateProviderRegistry registerCustomModelData (Lnet/minecraft/client/item/ModelPredicateProvider;)V
-
 # Registering custom advancement criteria
 transitive-accessible method net/minecraft/advancement/criterion/Criteria register (Ljava/lang/String;Lnet/minecraft/advancement/criterion/Criterion;)Lnet/minecraft/advancement/criterion/Criterion;
 
@@ -248,7 +243,7 @@ transitive-accessible field net/minecraft/client/render/RenderPhase ADDITIVE_TRA
 transitive-accessible field net/minecraft/client/render/RenderPhase LIGHTNING_TRANSPARENCY Lnet/minecraft/client/render/RenderPhase$Transparency;
 transitive-accessible field net/minecraft/client/render/RenderPhase GLINT_TRANSPARENCY Lnet/minecraft/client/render/RenderPhase$Transparency;
 transitive-accessible field net/minecraft/client/render/RenderPhase CRUMBLING_TRANSPARENCY Lnet/minecraft/client/render/RenderPhase$Transparency;
-transitive-accessible field net/minecraft/client/render/RenderPhase field_55137 Lnet/minecraft/client/render/RenderPhase$Transparency;
+transitive-accessible field net/minecraft/client/render/RenderPhase OVERLAY_TRANSPARENCY Lnet/minecraft/client/render/RenderPhase$Transparency;
 transitive-accessible field net/minecraft/client/render/RenderPhase TRANSLUCENT_TRANSPARENCY Lnet/minecraft/client/render/RenderPhase$Transparency;
 transitive-accessible field net/minecraft/client/render/RenderPhase VIGNETTE_TRANSPARENCY Lnet/minecraft/client/render/RenderPhase$Transparency;
 transitive-accessible field net/minecraft/client/render/RenderPhase CROSSHAIR_TRANSPARENCY Lnet/minecraft/client/render/RenderPhase$Transparency;
@@ -261,7 +256,7 @@ transitive-accessible field net/minecraft/client/render/RenderPhase POSITION_TEX
 transitive-accessible field net/minecraft/client/render/RenderPhase POSITION_COLOR_TEXTURE_LIGHTMAP_PROGRAM Lnet/minecraft/client/render/RenderPhase$ShaderProgram;
 transitive-accessible field net/minecraft/client/render/RenderPhase POSITION_COLOR_PROGRAM Lnet/minecraft/client/render/RenderPhase$ShaderProgram;
 transitive-accessible field net/minecraft/client/render/RenderPhase POSITION_TEXTURE_COLOR_PROGRAM Lnet/minecraft/client/render/RenderPhase$ShaderProgram;
-transitive-accessible field net/minecraft/client/render/RenderPhase field_55138 Lnet/minecraft/client/render/RenderPhase$ShaderProgram;
+transitive-accessible field net/minecraft/client/render/RenderPhase PARTICLE Lnet/minecraft/client/render/RenderPhase$ShaderProgram;
 transitive-accessible field net/minecraft/client/render/RenderPhase SOLID_PROGRAM Lnet/minecraft/client/render/RenderPhase$ShaderProgram;
 transitive-accessible field net/minecraft/client/render/RenderPhase CUTOUT_MIPPED_PROGRAM Lnet/minecraft/client/render/RenderPhase$ShaderProgram;
 transitive-accessible field net/minecraft/client/render/RenderPhase CUTOUT_PROGRAM Lnet/minecraft/client/render/RenderPhase$ShaderProgram;
@@ -332,7 +327,7 @@ transitive-accessible field net/minecraft/client/render/RenderPhase NO_LAYERING
 transitive-accessible field net/minecraft/client/render/RenderPhase POLYGON_OFFSET_LAYERING Lnet/minecraft/client/render/RenderPhase$Layering;
 transitive-accessible field net/minecraft/client/render/RenderPhase VIEW_OFFSET_Z_LAYERING Lnet/minecraft/client/render/RenderPhase$Layering;
 transitive-accessible field net/minecraft/client/render/RenderPhase VIEW_OFFSET_Z_LAYERING_FORWARD Lnet/minecraft/client/render/RenderPhase$Layering;
-transitive-accessible field net/minecraft/client/render/RenderPhase field_55136 Lnet/minecraft/client/render/RenderPhase$Layering;
+transitive-accessible field net/minecraft/client/render/RenderPhase WORLD_BORDER_LAYERING Lnet/minecraft/client/render/RenderPhase$Layering;
 transitive-accessible field net/minecraft/client/render/RenderPhase MAIN_TARGET Lnet/minecraft/client/render/RenderPhase$Target;
 transitive-accessible field net/minecraft/client/render/RenderPhase OUTLINE_TARGET Lnet/minecraft/client/render/RenderPhase$Target;
 transitive-accessible field net/minecraft/client/render/RenderPhase TRANSLUCENT_TARGET Lnet/minecraft/client/render/RenderPhase$Target;

fabric-transitive-access-wideners-v1/template.accesswidener

@@ -1,8 +1,3 @@
-# Registering custom model predicate providers for item models
-transitive-accessible method net/minecraft/client/item/ModelPredicateProviderRegistry register (Lnet/minecraft/item/Item;Lnet/minecraft/util/Identifier;Lnet/minecraft/client/item/ClampedModelPredicateProvider;)V
-transitive-accessible method net/minecraft/client/item/ModelPredicateProviderRegistry register (Lnet/minecraft/util/Identifier;Lnet/minecraft/client/item/ClampedModelPredicateProvider;)Lnet/minecraft/client/item/ClampedModelPredicateProvider;
-transitive-accessible method net/minecraft/client/item/ModelPredicateProviderRegistry registerCustomModelData (Lnet/minecraft/client/item/ModelPredicateProvider;)V
-
 # Registering custom advancement criteria
 transitive-accessible method net/minecraft/advancement/criterion/Criteria register (Ljava/lang/String;Lnet/minecraft/advancement/criterion/Criterion;)Lnet/minecraft/advancement/criterion/Criterion;
 

gradle.properties

@@ -1,19 +1,19 @@
 org.gradle.jvmargs=-Xmx2560M
 org.gradle.parallel=true
 
-version=0.107.0
-minecraft_version=24w44a
+version=0.107.1
+minecraft_version=24w45a
 yarn_version=+build.1
 loader_version=0.16.9
 installer_version=1.0.1
 
 prerelease=true
-curseforge_minecraft_version=1.21.2-Snapshot
+curseforge_minecraft_version=1.21.4-Snapshot
 
 # Do not manually update, use the bumpversions task:
 fabric-api-base-version=0.4.50
 fabric-api-lookup-api-v1-version=1.6.80
-fabric-biome-api-v1-version=15.0.0
+fabric-biome-api-v1-version=15.0.1
 fabric-block-api-v1-version=1.0.29
 fabric-block-view-api-v2-version=1.0.17
 fabric-blockrenderlayer-v1-version=2.0.4
@@ -22,40 +22,39 @@ fabric-command-api-v2-version=2.2.37
 fabric-commands-v0-version=0.2.75
 fabric-content-registries-v0-version=9.1.7
 fabric-crash-report-info-v1-version=0.3.4
-fabric-data-attachment-api-v1-version=1.2.1
-fabric-data-generation-api-v1-version=21.0.16
+fabric-data-attachment-api-v1-version=1.2.2
+fabric-data-generation-api-v1-version=22.0.0
 fabric-dimensions-v1-version=4.0.8
 fabric-entity-events-v1-version=2.0.7
-fabric-events-interaction-v0-version=3.0.0
+fabric-events-interaction-v0-version=3.0.1
 fabric-game-rule-api-v1-version=1.0.60
 fabric-gametest-api-v1-version=2.0.15
-fabric-item-api-v1-version=11.1.7
+fabric-item-api-v1-version=11.1.8
 fabric-item-group-api-v1-version=4.1.17
 fabric-key-binding-api-v1-version=1.0.54
 fabric-keybindings-v0-version=0.2.52
 fabric-lifecycle-events-v1-version=2.4.1
-fabric-loot-api-v2-version=3.0.26
-fabric-loot-api-v3-version=1.0.14
+fabric-loot-api-v2-version=3.0.27
+fabric-loot-api-v3-version=1.0.15
 fabric-message-api-v1-version=6.0.21
 fabric-model-loading-api-v1-version=3.0.9
 fabric-networking-api-v1-version=4.3.5
-fabric-object-builder-api-v1-version=17.0.9
+fabric-object-builder-api-v1-version=18.0.0
 fabric-particles-v1-version=4.0.10
 fabric-recipe-api-v1-version=7.0.4
-fabric-registry-sync-v0-version=5.2.2
+fabric-registry-sync-v0-version=5.2.3
 fabric-renderer-api-v1-version=4.0.5
 fabric-renderer-indigo-version=1.9.5
 fabric-rendering-data-attachment-v1-version=0.3.55
 fabric-rendering-fluids-v1-version=3.1.15
-fabric-rendering-v0-version=1.1.83
-fabric-rendering-v1-version=8.0.7
-fabric-resource-conditions-api-v1-version=5.0.9
+fabric-rendering-v1-version=9.0.0
+fabric-resource-conditions-api-v1-version=5.0.10
 fabric-resource-loader-v0-version=3.0.7
 fabric-screen-api-v1-version=2.0.34
-fabric-screen-handler-api-v1-version=1.3.100
+fabric-screen-handler-api-v1-version=1.3.101
 fabric-sound-api-v1-version=1.0.30
 fabric-transfer-api-v1-version=5.4.2
-fabric-transitive-access-wideners-v1-version=6.1.9
+fabric-transitive-access-wideners-v1-version=6.1.10
 fabric-convention-tags-v1-version=2.1.2
 fabric-convention-tags-v2-version=2.9.2
 fabric-client-tags-api-v1-version=1.1.24

settings.gradle

@@ -48,14 +48,14 @@ include 'fabric-key-binding-api-v1'
 include 'fabric-lifecycle-events-v1'
 include 'fabric-loot-api-v3'
 include 'fabric-message-api-v1'
-include 'fabric-model-loading-api-v1'
+//include 'fabric-model-loading-api-v1'
 include 'fabric-networking-api-v1'
 include 'fabric-object-builder-api-v1'
 include 'fabric-particles-v1'
 include 'fabric-recipe-api-v1'
 include 'fabric-registry-sync-v0'
-include 'fabric-renderer-api-v1'
-include 'fabric-renderer-indigo'
+//include 'fabric-renderer-api-v1'
+//include 'fabric-renderer-indigo'
 include 'fabric-rendering-fluids-v1'
 include 'fabric-rendering-v1'
 include 'fabric-resource-conditions-api-v1'
@@ -73,4 +73,3 @@ include 'deprecated:fabric-convention-tags-v1'
 include 'deprecated:fabric-keybindings-v0'
 include 'deprecated:fabric-loot-api-v2'
 include 'deprecated:fabric-rendering-data-attachment-v1'
-include 'deprecated:fabric-rendering-v0'