Fixed #328 - Bucket fluid name NPE
This commit is contained in:
parent
900b244aa6
commit
bebde23242
1 changed files with 7 additions and 4 deletions
|
@ -47,15 +47,18 @@ public class ItemOreResourceBucket extends Item
|
||||||
@Override
|
@Override
|
||||||
public String getItemDisplayName(ItemStack is)
|
public String getItemDisplayName(ItemStack is)
|
||||||
{
|
{
|
||||||
if (getMaterialFromStack(is) != null)
|
String material = getMaterialFromStack(is);
|
||||||
|
if (material != null)
|
||||||
{
|
{
|
||||||
String fluidID = isMolten ? ResourceGenerator.materialNameToMolten(getMaterialFromStack(is)) : ResourceGenerator.materialNameToMixture(getMaterialFromStack(is));
|
String fluidID = isMolten ? ResourceGenerator.materialNameToMolten(material) : ResourceGenerator.materialNameToMixture(material);
|
||||||
|
|
||||||
if (fluidID != null)
|
if (fluidID != null && FluidRegistry.getFluid(fluidID) != null)
|
||||||
{
|
{
|
||||||
String fluidName = FluidRegistry.getFluid(fluidID).getLocalizedName();
|
String fluidName = FluidRegistry.getFluid(fluidID).getLocalizedName();
|
||||||
return (LanguageUtility.getLocal(this.getUnlocalizedName() + ".name")).replace("%v", fluidName).replace(" ", " ");
|
return (LanguageUtility.getLocal(this.getUnlocalizedName() + ".name")).replace("%v", fluidName).replace(" ", " ");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return material;
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
|
|
Loading…
Reference in a new issue