From 4d70b015a53c9427935382b690246f2cdb9f5932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Vo=C3=9F?= Date: Sat, 12 Jun 2021 07:22:21 +0200 Subject: [PATCH] backport: using the translation key of the fluid attributes (instead of building it) to support Create mod #49 --- gradle.properties | 2 +- .../ceramicbucket/item/FilledCeramicBucketItem.java | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1b6936f..22fa2dd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -mod_version=2.6.1 +mod_version=2.6.2 minecraft_version=1.15.2 forge_version=1.15.2-31.1.75 diff --git a/src/main/java/cech12/ceramicbucket/item/FilledCeramicBucketItem.java b/src/main/java/cech12/ceramicbucket/item/FilledCeramicBucketItem.java index 8c0711d..3e34f96 100644 --- a/src/main/java/cech12/ceramicbucket/item/FilledCeramicBucketItem.java +++ b/src/main/java/cech12/ceramicbucket/item/FilledCeramicBucketItem.java @@ -89,15 +89,8 @@ public ITextComponent getDisplayName(@Nonnull ItemStack stack) { if (getFluid(stack) == Fluids.EMPTY) { return new TranslationTextComponent("item.ceramicbucket.ceramic_bucket"); } else { - ITextComponent fluidText; - if (getFluid(stack) == Fluids.WATER || getFluid(stack) == Fluids.LAVA) { - //vanilla fluids - fluidText = new TranslationTextComponent(getFluid(stack).getDefaultState().getBlockState().getBlock().getTranslationKey()); - } else { - //fluids registered by mods - fluidText = new TranslationTextComponent(Util.makeTranslationKey("fluid", ForgeRegistries.FLUIDS.getKey(getFluid(stack)))); - } - return new TranslationTextComponent("item.ceramicbucket.filled_ceramic_bucket", fluidText); + ITextComponent fluidText = new TranslationTextComponent(getFluid(stack).getAttributes().getTranslationKey()); + return new TranslationTextComponent("item.ceramicbucket.filled_ceramic_bucket", fluidText); } }