From 11e2326caebaa9957e87762b61d4a63ee4982faa Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 19 Nov 2015 16:39:09 +0100 Subject: [PATCH] Made ActAdd Fluid Names not clash with other mods' ones --- src/main/java/ellpeck/actuallyadditions/blocks/FluidAA.java | 6 ++++++ src/main/resources/assets/actuallyadditions/lang/en_US.lang | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/FluidAA.java b/src/main/java/ellpeck/actuallyadditions/blocks/FluidAA.java index e31ac0dbb..26bbb64e7 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/FluidAA.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/FluidAA.java @@ -10,6 +10,7 @@ package ellpeck.actuallyadditions.blocks; +import ellpeck.actuallyadditions.util.ModUtil; import net.minecraftforge.fluids.Fluid; public class FluidAA extends Fluid{ @@ -17,4 +18,9 @@ public class FluidAA extends Fluid{ public FluidAA(String fluidName){ super(fluidName); } + + @Override + public String getUnlocalizedName(){ + return "fluid."+ModUtil.MOD_ID_LOWER+"."+this.unlocalizedName; + } } diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 79b6a524a..97d3c3728 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -3,8 +3,8 @@ itemGroup.actuallyadditions=Actually Additions achievement.page.actuallyadditions=Actually Additions #Fluids -fluid.oil=Oil -fluid.canolaoil=Canola Oil +fluid.actuallyadditions.oil=Oil +fluid.actuallyadditions.canolaoil=Canola Oil #NEI Integration container.nei.actuallyadditions.crushing.name=Crusher