Fixed fluid names with other mods

electrical/src/main/java/resonantinduction/electrical/generator/TileGenerator.java

@@ -92,6 +92,8 @@ public class TileGenerator extends TileElectrical implements IRotatable
 				{
 					long torqueRatio = (long) ((gearRatio + 1) / 4d * (extract));
 
+					if (torqueRatio > 0)
+					{
 						final float maxAngularVelocity = extract / (float) torqueRatio;
 
 						final long maxTorque = (long) (((double) extract) / maxAngularVelocity);
@@ -115,6 +117,7 @@ public class TileGenerator extends TileElectrical implements IRotatable
 				}
 			}
 		}
+	}
 
 	@Override
 	public EnumSet<ForgeDirection> getInputDirections()

electrical/src/main/java/resonantinduction/electrical/wire/PartConductor.java

@@ -181,13 +181,13 @@ public abstract class PartConductor extends PartAdvanced implements IConductor
 	public void save(NBTTagCompound nbt)
 	{
 		super.save(nbt);
-		nbt.setLong("savedBuffer", this.getNetwork().getBufferOf(this));
+		nbt.setLong("savedBuffer", getNetwork().getBufferOf(this));
 	}
 
 	@Override
 	public void load(NBTTagCompound nbt)
 	{
 		super.load(nbt);
-		this.getNetwork().setBufferFor(this, nbt.getLong("savedBuffer"));
+		getNetwork().setBufferFor(this, nbt.getLong("savedBuffer"));
 	}
 }

src/main/java/resonantinduction/core/resource/ResourceGenerator.java

@@ -45,6 +45,7 @@ import calclavia.lib.utility.nbt.SaveManager;
 import com.google.common.collect.HashBiMap;
 
 import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -120,6 +121,15 @@ public class ResourceGenerator implements IVirtualObject
 		{
 			// Caps version of the name
 			String nameCaps = LanguageUtility.capitalizeFirst(materialName);
+			String localizedName = materialName;
+
+			List<ItemStack> list = OreDictionary.getOres("ingot" + materialName.substring(0, 1).toUpperCase() + materialName.substring(1));
+
+			if (list.size() > 0)
+			{
+				ItemStack type = list.get(0);
+				localizedName = type.getDisplayName().replace(LanguageUtility.getLocal("misc.resonantinduction.ingot"), "").replaceAll("^ ", "").replaceAll(" $", "");
+			}
 
 			/** Generate molten fluids */
 			FluidColored fluidMolten = new FluidColored(materialNameToMolten(materialName));
@@ -127,6 +137,7 @@ public class ResourceGenerator implements IVirtualObject
 			fluidMolten.setViscosity(5000);
 			fluidMolten.setTemperature(273 + 1538);
 			FluidRegistry.registerFluid(fluidMolten);
+			LanguageRegistry.instance().addStringLocalization(fluidMolten.getUnlocalizedName(), "Molten " + localizedName);
 			BlockFluidMaterial blockFluidMaterial = new BlockFluidMaterial(fluidMolten);
 			GameRegistry.registerBlock(blockFluidMaterial, "molten" + nameCaps);
 			ResonantInduction.blockMoltenFluid.put(getID(materialName), blockFluidMaterial);
@@ -136,6 +147,7 @@ public class ResourceGenerator implements IVirtualObject
 			FluidColored fluidMixture = new FluidColored(materialNameToMixture(materialName));
 			FluidRegistry.registerFluid(fluidMixture);
 			BlockFluidMixture blockFluidMixture = new BlockFluidMixture(fluidMixture);
+			LanguageRegistry.instance().addStringLocalization(fluidMixture.getUnlocalizedName(), localizedName + " Mixture");
 			GameRegistry.registerBlock(blockFluidMixture, "mixture" + nameCaps);
 			ResonantInduction.blockMixtureFluids.put(getID(materialName), blockFluidMixture);
 			FluidContainerRegistry.registerFluidContainer(fluidMixture, ResonantInduction.itemBucketMixture.getStackFromMaterial(materialName));

src/main/java/resonantinduction/core/resource/fluid/ItemOreResourceBucket.java

@@ -49,22 +49,8 @@ public class ItemOreResourceBucket extends Item
 	{
 		if (getMaterialFromStack(is) != null)
 		{
-			String dustName = getMaterialFromStack(is);
+			String fluidName = FluidRegistry.getFluid(isMolten ? ResourceGenerator.materialNameToMolten(getMaterialFromStack(is)) : ResourceGenerator.materialNameToMixture(getMaterialFromStack(is))).getLocalizedName();
-
+			return (LanguageUtility.getLocal(this.getUnlocalizedName() + ".name")).replace("%v", fluidName).replace("  ", " ");
-			if (dustName != null)
-			{
-				List<ItemStack> list = OreDictionary.getOres("ingot" + dustName.substring(0, 1).toUpperCase() + dustName.substring(1));
-
-				if (list.size() > 0)
-				{
-					ItemStack type = list.get(0);
-
-					String name = type.getDisplayName().replace(LanguageUtility.getLocal("misc.resonantinduction.ingot"), "").replaceAll("^ ", "").replaceAll(" $", "");
-					return (LanguageUtility.getLocal(this.getUnlocalizedName() + ".name")).replace("%v", name).replace("  ", " ");
-				}
-			}
-
-			return (FluidRegistry.getFluid(isMolten ? ResourceGenerator.materialNameToMolten(getMaterialFromStack(is)) : ResourceGenerator.materialNameToMixture(getMaterialFromStack(is))).getLocalizedName() + " Bucket");
 		}
 		return null;
 	}

src/main/resources/assets/resonantinduction/languages/en_US.properties

@@ -22,8 +22,8 @@ item.resonantinduction\:oreDust.name=%v Dust
 item.resonantinduction\:oreDust.tooltip=Shift-right click on a cauldron to refine.
 item.resonantinduction\:oreRefinedDust.name=%v Refined Dust
 item.resonantinduction\:oreRubble.name=%v Rubble
-item.resonantinduction\:bucketMixture.name=%v Mixture Bucket
+item.resonantinduction\:bucketMixture.name=%v Bucket
-item.resonantinduction\:bucketMolten.name=Molten %v Bucket
+item.resonantinduction\:bucketMolten.name=%v Bucket
 
 ### Archaic Module
 ## machineMaterials