Skip to content

Fix Item/Block color API #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Su5eD merged 1 commit into from
Jun 11, 2025
Merged

Fix Item/Block color API #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions ...ering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/BlockColorsMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,25 @@
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

import java.util.Map;

@Mixin(BlockColors.class)
public class BlockColorsMixin implements ColorProviderRegistryImpl.ColorMapperHolder<Block, BlockColor> {
@Shadow
@Final
private IdMapper<BlockColor> blockColors;
private Map<Block, BlockColor> blockColors;

@Inject(method = "createDefault", at = @At("RETURN"))
private static void createDefault(CallbackInfoReturnable<BlockColors> info) {
ColorProviderRegistryImpl.BLOCK.initialize(info.getReturnValue());
}

@Override
public BlockColor get(Block block) {
return blockColors.byId(BuiltInRegistries.BLOCK.getId(block));
return blockColors.get(block);
}
}
16 changes: 14 additions & 2 deletions ...dering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/ItemColorsMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,35 @@
package net.fabricmc.fabric.mixin.client.rendering;

import net.fabricmc.fabric.impl.client.rendering.ColorProviderRegistryImpl;
import net.minecraft.client.color.block.BlockColors;
import net.minecraft.client.color.item.ItemColor;
import net.minecraft.client.color.item.ItemColors;
import net.minecraft.core.IdMapper;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.ItemLike;
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 java.util.Map;

@Mixin(ItemColors.class)
public class ItemColorsMixin implements ColorProviderRegistryImpl.ColorMapperHolder<ItemLike, ItemColor> {
@Shadow
@Final
private IdMapper<ItemColor> itemColors;
private Map<Item, ItemColor> itemColors;

@Inject(method = "createDefault", at = @At("RETURN"))
private static void createDefault(BlockColors blockMap, CallbackInfoReturnable<ItemColors> info) {
ColorProviderRegistryImpl.ITEM.initialize(info.getReturnValue());
}

@Override
public ItemColor get(ItemLike item) {
return itemColors.byId(BuiltInRegistries.ITEM.getId(item.asItem()));
return itemColors.get(item.asItem());
}
}
2 changes: 2 additions & 0 deletions fabric-rendering-v1/src/client/resources/fabric-rendering-v1.mixins.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@
"client": [
"ArmorFeatureRendererMixin",
"AtlasSourceManagerAccessor",
"BlockColorsMixin",
"BuiltinModelItemRendererMixin",
"CapeFeatureRendererMixin",
"DimensionEffectsAccessor",
"EntityModelLayersAccessor",
"EntityRenderersMixin",
"ItemColorsMixin",
"LivingEntityRendererAccessor",
"TooltipComponentMixin",
"WorldRendererMixin",
Expand Down
Loading