From 4ce4d6c361ff859bc93b9b4dac1b914eea05284a Mon Sep 17 00:00:00 2001 From: Tryank <49746336+Maz-T@users.noreply.github.com> Date: Sat, 26 Feb 2022 19:10:43 +0800 Subject: [PATCH] Use translation keys on RebornCore and CellItem. Thanks to Maz-T --- .../src/main/java/reborncore/common/fluid/FluidUtils.java | 3 ++- src/main/java/techreborn/items/DynamicCellItem.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/RebornCore/src/main/java/reborncore/common/fluid/FluidUtils.java b/RebornCore/src/main/java/reborncore/common/fluid/FluidUtils.java index 2318c10f3..8020fa7f4 100644 --- a/RebornCore/src/main/java/reborncore/common/fluid/FluidUtils.java +++ b/RebornCore/src/main/java/reborncore/common/fluid/FluidUtils.java @@ -41,6 +41,7 @@ import net.minecraft.fluid.Fluid; import net.minecraft.fluid.Fluids; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; +import net.minecraft.text.TranslatableText; import net.minecraft.util.Hand; import net.minecraft.util.registry.Registry; import org.apache.commons.lang3.StringUtils; @@ -183,6 +184,6 @@ public class FluidUtils { } public static String getFluidName(@NotNull Fluid fluid) { - return StringUtils.capitalize(Registry.FLUID.getId(fluid).getPath()); + return new TranslatableText(fluid.getDefaultState().getBlockState().getBlock().getTranslationKey()).getString(); } } diff --git a/src/main/java/techreborn/items/DynamicCellItem.java b/src/main/java/techreborn/items/DynamicCellItem.java index 2c65eea94..b9123e3d2 100644 --- a/src/main/java/techreborn/items/DynamicCellItem.java +++ b/src/main/java/techreborn/items/DynamicCellItem.java @@ -51,6 +51,7 @@ import net.minecraft.sound.SoundEvents; import net.minecraft.tag.FluidTags; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; +import net.minecraft.text.TranslatableText; import net.minecraft.util.Hand; import net.minecraft.util.Identifier; import net.minecraft.util.TypedActionResult; @@ -166,7 +167,7 @@ public class DynamicCellItem extends Item implements ItemFluidInfo { Fluid fluid = getFluid(itemStack); if (fluid != Fluids.EMPTY) { // TODO use translation keys for fluid and the cell https://fabric.asie.pl/wiki/tutorial:lang?s[]=translation might be useful - return new LiteralText(WordUtils.capitalizeFully(FluidUtils.getFluidName(fluid).replaceAll("_", " ")) + " Cell"); + return new LiteralText(new TranslatableText("item.techreborn.cell.fluid").getString().replace("$fluid$", FluidUtils.getFluidName(fluid))); } return super.getName(itemStack); }