From 31d1e1935eae254ba2ff18df57dcd8ad9d9b0fa5 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Thu, 1 Jun 2023 16:56:31 +0800 Subject: Fix merge conflicts --- .../java/me/shedaniel/rei/mixin/fabric/MixinInputConstantsKey.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'fabric/src') diff --git a/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinInputConstantsKey.java b/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinInputConstantsKey.java index 99a4b3ee1..a74c12d31 100644 --- a/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinInputConstantsKey.java +++ b/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinInputConstantsKey.java @@ -27,7 +27,6 @@ import com.mojang.blaze3d.platform.InputConstants; import com.mojang.blaze3d.systems.RenderSystem; import me.shedaniel.rei.api.client.config.ConfigObject; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TranslatableComponent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; @@ -43,7 +42,7 @@ public abstract class MixinInputConstantsKey { @Inject(method = "getDisplayName", at = @At("HEAD"), cancellable = true) private void getDisplayName(CallbackInfoReturnable cir) { if (isPatchingAsyncThreadCrash() && !RenderSystem.isOnRenderThread()) { - cir.setReturnValue(new TranslatableComponent(getName())); + cir.setReturnValue(Component.translatable(getName())); } } -- cgit