diff options
| author | shedaniel <daniel@shedaniel.me> | 2023-06-01 16:56:31 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2023-06-01 16:57:01 +0800 |
| commit | 31d1e1935eae254ba2ff18df57dcd8ad9d9b0fa5 (patch) | |
| tree | 87cc6f7167d2b329b497c1fc4456d7dedf2e5c0d /forge/src | |
| parent | e7b215a7da342a18b0c0cd297cd847eda11c65e8 (diff) | |
| download | RoughlyEnoughItems-31d1e1935eae254ba2ff18df57dcd8ad9d9b0fa5.tar.gz RoughlyEnoughItems-31d1e1935eae254ba2ff18df57dcd8ad9d9b0fa5.tar.bz2 RoughlyEnoughItems-31d1e1935eae254ba2ff18df57dcd8ad9d9b0fa5.zip | |
Fix merge conflicts
Diffstat (limited to 'forge/src')
| -rw-r--r-- | forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinInputConstantsKey.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinInputConstantsKey.java b/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinInputConstantsKey.java index b6e815267..df0348de1 100644 --- a/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinInputConstantsKey.java +++ b/forge/src/main/java/me/shedaniel/rei/mixin/forge/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<Component> cir) { if (isPatchingAsyncThreadCrash() && !RenderSystem.isOnRenderThread()) { - cir.setReturnValue(new TranslatableComponent(getName())); + cir.setReturnValue(Component.translatable(getName())); } } |