backport: using the translation key of the fluid attributes (instead …

…of building it) to support Create mod #49
cech12 · Jun 12, 2021 · 4d70b01 · 4d70b01
1 parent a42c29d
commit 4d70b01
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git 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
@@ -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);
         }
     }