Replace ColorProviderRegistry with BlockColorRegistry (#5140)

* Replace ColorProviderRegistry with BlockColorRegistry

ColorProviderRegistry was designed to provide a common interface over both block colors and item colors, but since item colors were refactored completely in 1.21.4, this design is unnecessarily complicated. The new class is as simple as possible.

* Pass the block array directly

Author: PepperCode1

fabric-particles-v1/src/testmodClient/java/net/fabricmc/fabric/test/particle/client/ParticleRenderEventTests.java

@@ -20,14 +20,14 @@
 
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.particle.v1.ParticleRenderEvents;
-import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
+import net.fabricmc.fabric.api.client.rendering.v1.BlockColorRegistry;
 import net.fabricmc.fabric.test.particle.ParticleTestSetup;
 import net.fabricmc.fabric.test.particle.ParticleTintTestBlock;
 
 public final class ParticleRenderEventTests implements ClientModInitializer {
 	@Override
 	public void onInitializeClient() {
-		ColorProviderRegistry.BLOCK.register((state, level, pos, tintIndex) -> {
+		BlockColorRegistry.register((state, level, pos, tintIndex) -> {
 			if (tintIndex == 0) {
 				return ((ParticleTintTestBlock) state.getBlock()).color;
 			}

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

@@ -0,0 +1,45 @@
+/*
+ * 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.rendering.v1;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.color.block.BlockColor;
+import net.minecraft.client.color.block.BlockColors;
+import net.minecraft.world.level.block.Block;
+
+import net.fabricmc.fabric.impl.client.rendering.BlockColorRegistryImpl;
+
+/**
+ * The registry for {@link BlockColor}s.
+ */
+public final class BlockColorRegistry {
+	private BlockColorRegistry() {
+	}
+
+	/**
+	 * Register a block color for one or more blocks. Overriding existing registrations is allowed.
+	 *
+	 * <p>Mods must use this method instead of {@link BlockColors#register(BlockColor, Block...)} during mod
+	 * initialization as it runs before {@link Minecraft#getBlockColors()} is available.
+	 *
+	 * @param color The block color.
+	 * @param blocks The blocks which should be colored using the given color.
+	 */
+	public static void register(BlockColor color, Block... blocks) {
+		BlockColorRegistryImpl.register(color, blocks);
+	}
+}

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

@@ -0,0 +1,54 @@
+/*
+ * 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.impl.client.rendering;
+
+import java.util.IdentityHashMap;
+import java.util.Map;
+
+import org.jspecify.annotations.Nullable;
+
+import net.minecraft.client.color.block.BlockColor;
+import net.minecraft.client.color.block.BlockColors;
+import net.minecraft.world.level.block.Block;
+
+public final class BlockColorRegistryImpl {
+	@Nullable
+	private static BlockColors blockColors;
+	@Nullable
+	private static Map<Block, BlockColor> map = new IdentityHashMap<>();
+
+	public static void initialize(BlockColors blockColors) {
+		if (BlockColorRegistryImpl.blockColors != null) {
+			return;
+		}
+
+		BlockColorRegistryImpl.blockColors = blockColors;
+
+		map.forEach((block, color) -> blockColors.register(color, block));
+		map = null;
+	}
+
+	public static void register(BlockColor color, Block... blocks) {
+		if (blockColors != null) {
+			blockColors.register(color, blocks);
+		} else {
+			for (Block block : blocks) {
+				map.put(block, color);
+			}
+		}
+	}
+}

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

@@ -16,34 +16,19 @@
 
 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.BlockColor;
 import net.minecraft.client.color.block.BlockColors;
-import net.minecraft.core.IdMapper;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.world.level.block.Block;
 
-import net.fabricmc.fabric.impl.client.rendering.ColorProviderRegistryImpl;
+import net.fabricmc.fabric.impl.client.rendering.BlockColorRegistryImpl;
 
 @Mixin(BlockColors.class)
-public class BlockColorsMixin implements ColorProviderRegistryImpl.ColorMapperHolder<Block, BlockColor> {
-	@Shadow
-	@Final
-	private IdMapper<BlockColor> blockColors;
-
+abstract class BlockColorsMixin {
 	@Inject(method = "createDefault", at = @At("RETURN"))
-	private static void create(CallbackInfoReturnable<BlockColors> info) {
-		ColorProviderRegistryImpl.BLOCK.initialize(info.getReturnValue());
-	}
-
-	@Override
-	public BlockColor get(Block block) {
-		return blockColors.byId(BuiltInRegistries.BLOCK.getId(block));
+	private static void create(CallbackInfoReturnable<BlockColors> ci) {
+		BlockColorRegistryImpl.initialize(ci.getReturnValue());
 	}
 }

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

@@ -19,7 +19,7 @@
 import net.minecraft.world.level.ColorResolver;
 
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
+import net.fabricmc.fabric.api.client.rendering.v1.BlockColorRegistry;
 import net.fabricmc.fabric.api.client.rendering.v1.ColorResolverRegistry;
 import net.fabricmc.fabric.test.rendering.CustomColorResolverTestInit;
 
@@ -36,7 +36,7 @@ public class CustomColorResolverTest implements ClientModInitializer {
 	public void onInitializeClient() {
 		ColorResolverRegistry.register(TEST_COLOR_RESOLVER);
 
-		ColorProviderRegistry.BLOCK.register((state, level, pos, tintIndex) -> {
+		BlockColorRegistry.register((state, level, pos, tintIndex) -> {
 			if (level != null && pos != null) {
 				return level.getBlockTint(pos, TEST_COLOR_RESOLVER);
 			} else {