From 077ba95f74ed716412b2e8b07a6607a8ac92e8a1 Mon Sep 17 00:00:00 2001 From: Su5eD Date: Sat, 2 Nov 2024 21:00:37 +0100 Subject: [PATCH] Turn exception into warning in ColorProviderRegistryImpl --- .../impl/client/rendering/ColorProviderRegistryImpl.java | 9 ++++++++- ffapi.gradle.properties | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/ColorProviderRegistryImpl.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/ColorProviderRegistryImpl.java index b1b9d641d..5a7273e66 100644 --- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/ColorProviderRegistryImpl.java +++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/ColorProviderRegistryImpl.java @@ -18,6 +18,8 @@ import java.util.IdentityHashMap; import java.util.Map; + +import com.mojang.logging.LogUtils; import net.minecraft.client.color.block.BlockColor; import net.minecraft.client.color.block.BlockColors; import net.minecraft.client.color.item.ItemColor; @@ -25,8 +27,11 @@ import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.Block; import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry; +import org.slf4j.Logger; public abstract class ColorProviderRegistryImpl implements ColorProviderRegistry { + private static final Logger LOGGER = LogUtils.getLogger(); + public static final ColorProviderRegistryImpl BLOCK = new ColorProviderRegistryImpl() { @Override void registerUnderlying(BlockColors map, BlockColor mapper, Block block) { @@ -48,7 +53,9 @@ void registerUnderlying(ItemColors map, ItemColor mapper, ItemLike block) { public void initialize(Underlying colorMap) { if (this.colorMap != null) { - if (this.colorMap != colorMap) throw new IllegalStateException("Cannot set colorMap twice"); + if (this.colorMap != colorMap) { + LOGGER.warn("Tried to set colorMap twice in {}", getClass().getName()); + } return; } diff --git a/ffapi.gradle.properties b/ffapi.gradle.properties index e684e86bd..c60f762a8 100644 --- a/ffapi.gradle.properties +++ b/ffapi.gradle.properties @@ -1,7 +1,7 @@ loom.platform=neoforge fabric.loom.dontRemap=true -implementationVersion=2.0.15 +implementationVersion=2.0.16 versionMc=1.21.1 versionForge=21.1.57